Merge pull request #1431 from pvieito/master

Author: swift-ci

CoreFoundation/Base.subproj/CFPlatform.c

@@ -284,8 +284,29 @@ CF_EXPORT CFStringRef CFCopyUserName(void) {
 #else
 #error Dont know how to compute user name on this platform
 #endif
-    if (!result)
+    if (!result) {
         result = (CFStringRef)CFRetain(CFSTR(""));
+    }
+    
+    return result;
+}
+
+CF_EXPORT CFStringRef CFCopyFullUserName(void) {
+    CFStringRef result = NULL;
+#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD
+    uid_t euid;
+    __CFGetUGIDs(&euid, NULL);
+    struct passwd *upwd = getpwuid(euid ? euid : getuid());
+    if (upwd && upwd->pw_gecos) {
+        result = CFStringCreateWithCString(kCFAllocatorSystemDefault, upwd->pw_gecos, kCFPlatformInterfaceStringEncoding);
+    }
+#else
+#error Don't know how to compute full user name on this platform
+#endif
+    if (!result) {
+        result = (CFStringRef)CFRetain(CFSTR(""));
+    }
+    
     return result;
 }
 

CoreFoundation/Base.subproj/CFPriv.h

@@ -159,6 +159,9 @@ CFStringRef CFGetUserName(void);
 CF_EXPORT
 CFStringRef CFCopyUserName(void);
 
+CF_EXPORT
+CFStringRef CFCopyFullUserName(void);
+
 CF_EXPORT
 CFURLRef CFCopyHomeDirectoryURLForUser(CFStringRef uName);	/* Pass NULL for the current user's home directory */
 

Foundation/FileManager.swift

@@ -746,7 +746,7 @@ extension FileManager {
 
 extension FileManager {
     open var homeDirectoryForCurrentUser: URL {
-        return homeDirectory(forUser: CFCopyUserName().takeRetainedValue()._swiftObject)!
+        return homeDirectory(forUser: NSUserName())!
     }
 
     open var temporaryDirectory: URL {

Foundation/NSPathUtilities.swift

@@ -588,6 +588,11 @@ public func NSUserName() -> String {
     return userName._swiftObject
 }
 
+public func NSFullUserName() -> String {
+    let userName = CFCopyFullUserName().takeRetainedValue()
+    return userName._swiftObject
+}
+
 internal func _NSCreateTemporaryFile(_ filePath: String) throws -> (Int32, String) {
     let template = "." + filePath + ".tmp.XXXXXX"
     let maxLength = Int(PATH_MAX) + 1

Foundation/ProcessInfo.swift

@@ -140,4 +140,12 @@ open class ProcessInfo: NSObject {
     open var systemUptime: TimeInterval {
         return CFGetSystemUptime()
     }
+    
+    open var userName: String {
+        return NSUserName()
+    }
+    
+    open var fullUserName: String {
+        return NSFullUserName()
+    }
 }