Make createDir return discardable bool

This commit is contained in:
Dmitry Polienko 2016-10-22 12:29:03 +07:00
commit 48ef6761d8
2 changed files with 54 additions and 11 deletions

View file

@ -1009,29 +1009,51 @@ proc removeDir*(dir: string) {.rtl, extern: "nos$1", tags: [
of pcDir: removeDir(path) of pcDir: removeDir(path)
rawRemoveDir(dir) rawRemoveDir(dir)
proc rawCreateDir(dir: string) = proc rawCreateDir(dir: string): bool =
# Create directory.
# Does not create parent directories (fails if parent does not exist).
# Returns `true` if the directory was created, `false` if it already exists.
when defined(solaris): when defined(solaris):
if mkdir(dir, 0o777) != 0'i32 and errno != EEXIST and errno != ENOSYS: let res = mkdir(dir, 0o777)
case res
of 0'i32:
result = true
of EEXIST, ENOSYS:
result = false
else:
raiseOSError(osLastError()) raiseOSError(osLastError())
elif defined(unix): elif defined(unix):
if mkdir(dir, 0o777) != 0'i32 and errno != EEXIST: let res = mkdir(dir, 0o777)
case res
of 0'i32:
result = true
of EEXIST:
result = false
else:
raiseOSError(osLastError()) raiseOSError(osLastError())
else: else:
when useWinUnicode: when useWinUnicode:
wrapUnary(res, createDirectoryW, dir) wrapUnary(res, createDirectoryW, dir)
else: else:
var res = createDirectoryA(dir) let res = createDirectoryA(dir)
if res == 0'i32 and getLastError() != 183'i32:
if res != 0'i32:
result = true
elif getLastError() == 183'i32:
result = false
else:
raiseOSError(osLastError()) raiseOSError(osLastError())
proc createDir*(dir: string) {.rtl, extern: "nos$1", tags: [WriteDirEffect].} = proc createDir*(dir: string): bool {.discardable, rtl,
extern: "nos$1", tags: [WriteDirEffect].} =
## Creates the `directory`:idx: `dir`. ## Creates the `directory`:idx: `dir`.
## ##
## The directory may contain several subdirectories that do not exist yet. ## The directory may contain several subdirectories that do not exist yet.
## The full path is created. If this fails, `OSError` is raised. It does **not** ## The full path is created. If this fails, `OSError` is raised.
## fail if the path already exists because for most usages this does not ##
## indicate an error. ## Returns `true` if the directory did not previously exist
var omitNext = false var omitNext = false
result = false
when doslike: when doslike:
omitNext = isAbsolute(dir) omitNext = isAbsolute(dir)
for i in 1.. dir.len-1: for i in 1.. dir.len-1:
@ -1039,8 +1061,10 @@ proc createDir*(dir: string) {.rtl, extern: "nos$1", tags: [WriteDirEffect].} =
if omitNext: if omitNext:
omitNext = false omitNext = false
else: else:
rawCreateDir(substr(dir, 0, i-1)) result = rawCreateDir(substr(dir, 0, i-1))
rawCreateDir(dir) # The loop does not create the dir itself if it doesn't end in separator
if dir[^1] notin {DirSep, AltSep}:
result = rawCreateDir(dir)
proc copyDir*(source, dest: string) {.rtl, extern: "nos$1", proc copyDir*(source, dest: string) {.rtl, extern: "nos$1",
tags: [WriteIOEffect, ReadIOEffect], benign.} = tags: [WriteIOEffect, ReadIOEffect], benign.} =

View file

@ -36,6 +36,10 @@ false
false false
false false
false false
true
true
true
false
''' '''
""" """
# test os path creation, iteration, and deletion # test os path creation, iteration, and deletion
@ -86,3 +90,18 @@ for file in files:
removeDir(dname) removeDir(dname)
echo dirExists(dname) echo dirExists(dname)
# createDir should create recursive directories
createDir(dirs[0] / dirs[1])
echo dirExists(dirs[0] / dirs[1]) # true
removeDir(dirs[0])
# createDir should properly handle trailing separator
createDir(dname / "")
echo dirExists(dname) # true
removeDir(dname)
# Check createDir return value
echo createDir(dname) # true
echo createDir(dname) # false
removeDir(dname)