]> Cypherpunks repositories - gostls13.git/commitdiff
os: make UserHomeDir specialize behavior for GOOS=android
authorBrad Fitzpatrick <bradfitz@golang.org>
Thu, 4 Oct 2018 15:26:04 +0000 (15:26 +0000)
committerBrad Fitzpatrick <bradfitz@golang.org>
Thu, 4 Oct 2018 16:32:56 +0000 (16:32 +0000)
Change-Id: I69582662aeee7344226856c24907516ddfc92f60
Reviewed-on: https://go-review.googlesource.com/c/139717
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Elias Naur <elias.naur@gmail.com>
src/os/file.go

index eb2277dece3407e6a2556ee45793e2e561d76eda..61f37f248925bbd7648ee5ae751349ef7869157a 100644 (file)
@@ -387,16 +387,16 @@ func UserCacheDir() (string, error) {
 // On Windows, it returns the concatenation of %HOMEDRIVE% and %HOMEPATH%.
 // On Plan 9, it returns the $home environment variable.
 func UserHomeDir() string {
-       if runtime.GOOS == "windows" {
+       switch runtime.GOOS {
+       case "windows":
                return Getenv("HOMEDRIVE") + Getenv("HOMEPATH")
-       }
-       if runtime.GOOS == "plan9" {
+       case "plan9":
                return Getenv("home")
-       }
-       if runtime.GOOS == "nacl" {
+       case "nacl", "android":
                return "/"
+       default:
+               return Getenv("HOME")
        }
-       return Getenv("HOME")
 }
 
 // Chmod changes the mode of the named file to mode.