diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-10-31 16:14:12 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-10-31 16:14:12 -0400 |
| commit | e7b70553d40a8bb2f894ce311cf618826095c294 (patch) | |
| tree | 93b53503895fe726b9187e33cef50681c06828d4 /Utility/UserInfo.hs | |
| parent | 90d840d64e9e94d5cd8c1c1fa2fa74855217e83d (diff) | |
Windows: Fix crash when user.name is not set in git config.
Diffstat (limited to 'Utility/UserInfo.hs')
| -rw-r--r-- | Utility/UserInfo.hs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Utility/UserInfo.hs b/Utility/UserInfo.hs index b3e191bbf..1a557c9a5 100644 --- a/Utility/UserInfo.hs +++ b/Utility/UserInfo.hs @@ -40,11 +40,12 @@ myUserName = myVal env userName env = ["USERNAME", "USER", "LOGNAME"] #endif -myUserGecos :: IO String -#ifdef __ANDROID__ -myUserGecos = return "" -- userGecos crashes on Android +myUserGecos :: IO (Maybe String) +-- userGecos crashes on Android and is not available on Windows. +#if defined(__ANDROID__) || defined(mingw32_HOST_OS) +myUserGecos = return Nothing #else -myUserGecos = myVal [] userGecos +myUserGecos = Just <$> myVal [] userGecos #endif myVal :: [String] -> (UserEntry -> String) -> IO String |