Revert createDir signature, expose rawCreateDir

This commit is contained in:
Dmitry Polienko 2016-10-22 17:17:06 +07:00
commit 45b432b901
2 changed files with 15 additions and 19 deletions

View file

@ -1009,10 +1009,15 @@ 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): bool = proc tryCreateDir*(dir: string): bool =
# Create directory. ## Try to create a `directory`:idx: `dir`.
# Does not create parent directories (fails if parent does not exist). ##
# Returns `true` if the directory was created, `false` if it already exists. ## Does not create parent directories (fails if parent does not exist).
## Returns `true` if a new directory was created, `false` if *path*
## (not necessarily a directory) `dir` already exists.
# This is a thin wrapper over mkDir (or alternatives on other systems),
# so in case of a pre-existing path we don't check that it is a directory.
when defined(solaris): when defined(solaris):
let res = mkdir(dir, 0o777) let res = mkdir(dir, 0o777)
if res == 0'i32: if res == 0'i32:
@ -1043,16 +1048,14 @@ proc rawCreateDir(dir: string): bool =
else: else:
raiseOSError(osLastError()) raiseOSError(osLastError())
proc createDir*(dir: string): bool {.discardable, rtl, proc createDir*(dir: string) {.rtl, extern: "nos$1", tags: [WriteDirEffect].} =
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. ## The full path is created. If this fails, `OSError` is raised. It does **not**
## ## fail if the path already exists because for most usages this does not
## Returns `true` if the directory did not previously exist ## indicate an error.
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:
@ -1060,10 +1063,10 @@ proc createDir*(dir: string): bool {.discardable, rtl,
if omitNext: if omitNext:
omitNext = false omitNext = false
else: else:
result = rawCreateDir(substr(dir, 0, i-1)) discard tryCreateDir(substr(dir, 0, i-1))
# The loop does not create the dir itself if it doesn't end in separator # The loop does not create the dir itself if it doesn't end in separator
if dir[^1] notin {DirSep, AltSep}: if dir[^1] notin {DirSep, AltSep}:
result = rawCreateDir(dir) discard tryCreateDir(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

@ -38,8 +38,6 @@ false
false false
true true
true true
true
false
''' '''
""" """
# test os path creation, iteration, and deletion # test os path creation, iteration, and deletion
@ -100,8 +98,3 @@ removeDir(dirs[0])
createDir(dname / "") createDir(dname / "")
echo dirExists(dname) # true echo dirExists(dname) # true
removeDir(dname) removeDir(dname)
# Check createDir return value
echo createDir(dname) # true
echo createDir(dname) # false
removeDir(dname)