From 80fab1d861f7801b9ccaac6ef4d7ff38defa207b Mon Sep 17 00:00:00 2001 From: Andreas Rumpf Date: Wed, 30 Aug 2017 11:08:49 +0200 Subject: make ospaths compile for Android again, simplify its implementation, added a disclaimer --- lib/pure/ospaths.nim | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'lib/pure/ospaths.nim') diff --git a/lib/pure/ospaths.nim b/lib/pure/ospaths.nim index 3cd90056a..4e76e4e18 100644 --- a/lib/pure/ospaths.nim +++ b/lib/pure/ospaths.nim @@ -528,28 +528,20 @@ when declared(getEnv) or defined(nimscript): elif getEnv("XDG_CONFIG_DIR"): return string(getEnv("XDG_CONFIG_DIR")) & "/" else: return string(getEnv("HOME")) & "/.config/" - when defined(android): - when declared(os): - {.pragma: getTempDirEffects, tags: [ReadEnvEffect, ReadIOEffect, WriteDirEffect].} - else: - {.pragma: getTempDirEffects, tags: [ReadEnvEffect, ReadIOEffect].} - elif defined(windows): - {.pragma: getTempDirEffects, tags: [ReadEnvEffect, ReadIOEffect].} - else: - {.pragma: getTempDirEffects, tags: [ReadIOEffect].} - proc getTempDir*(): string {.rtl, extern: "nos$1", - getTempDirEffects.} = + tags: [ReadEnvEffect, ReadIOEffect].} = ## Returns the temporary directory of the current user for applications to ## save temporary files in. + ## + ## **Please do not use this**: On Android, it currently + ## returns ``getHomeDir()``, and on other Unix based systems it can cause + ## security problems too. That said, you can override this implementation + ## by adding ``-d:tempDir=mytempname`` to your compiler invokation. when defined(tempDir): const tempDir {.strdefine.}: string = nil return tempDir elif defined(windows): return string(getEnv("TEMP")) & "\\" - elif defined(android): - let tempDir = getHomeDir() / "nimtempfs" - createDir(tempDir) - return tempDir + elif defined(android): return getHomeDir() else: return "/tmp/" proc expandTilde*(path: string): string {. -- cgit 1.4.1-2-gfad0