]> Cypherpunks repositories - gostls13.git/commitdiff
os: return proper user directories on iOS
authorChris Waldon <christopher.waldon.dev@gmail.com>
Sun, 29 Nov 2020 23:58:29 +0000 (23:58 +0000)
committerCherry Zhang <cherryyz@google.com>
Mon, 30 Nov 2020 17:45:06 +0000 (17:45 +0000)
Separating iOS into its own runtime constant broke the logic
here to derive the correct home, cache, and config directories
on iOS devices.

Fixes #42878

Change-Id: Ie4ff57895fcc34b0a9af45554ea3a346447d2e7a
GitHub-Last-Rev: 5e74e64917fa46e9c6e0d963cab5194ab89e2f64
GitHub-Pull-Request: golang/go#42879
Reviewed-on: https://go-review.googlesource.com/c/go/+/273947
Reviewed-by: Cherry Zhang <cherryyz@google.com>
Trust: Emmanuel Odeke <emmanuel@orijtech.com>

src/os/file.go

index 835d44ab8c42f3d5ce92f5161fc3b658fa1115ed..420e62ef2cb383d2928abb2eaf2ac619f650a38c 100644 (file)
@@ -406,7 +406,7 @@ func UserCacheDir() (string, error) {
                        return "", errors.New("%LocalAppData% is not defined")
                }
 
-       case "darwin":
+       case "darwin", "ios":
                dir = Getenv("HOME")
                if dir == "" {
                        return "", errors.New("$HOME is not defined")
@@ -457,7 +457,7 @@ func UserConfigDir() (string, error) {
                        return "", errors.New("%AppData% is not defined")
                }
 
-       case "darwin":
+       case "darwin", "ios":
                dir = Getenv("HOME")
                if dir == "" {
                        return "", errors.New("$HOME is not defined")
@@ -505,10 +505,8 @@ func UserHomeDir() (string, error) {
        switch runtime.GOOS {
        case "android":
                return "/sdcard", nil
-       case "darwin":
-               if runtime.GOARCH == "arm64" {
-                       return "/", nil
-               }
+       case "ios":
+               return "/", nil
        }
        return "", errors.New(enverr + " is not defined")
 }