jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove private checkSymlink (redundant with symlinkExists) (#16785)

Browse source
This commit is contained in:
Timothee Cour 2021-01-22 11:03:33 -08:00 • committed by GitHub
commit aca97250ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

28
lib/pure/os.nim
View file

@ -1151,26 +1151,13 @@ proc symlinkExists*(link: string): bool {.rtl, extern: "nos$1",
else: else:
var a = getFileAttributesA(link) var a = getFileAttributesA(link)
if a != -1'i32: if a != -1'i32:
# xxx see: bug #16784 (bug9); checking `IO_REPARSE_TAG_SYMLINK`
# may also be needed.
result = (a and FILE_ATTRIBUTE_REPARSE_POINT) != 0'i32 result = (a and FILE_ATTRIBUTE_REPARSE_POINT) != 0'i32
else: else:
var res: Stat var res: Stat
return lstat(link, res) >= 0'i32 and S_ISLNK(res.st_mode) return lstat(link, res) >= 0'i32 and S_ISLNK(res.st_mode)
when not defined(nimscript):
when not defined(js): # `noNimJs` doesn't work with templates, this should improve.
template existsFile*(args: varargs[untyped]): untyped {.deprecated: "use fileExists".} =
fileExists(args)
template existsDir*(args: varargs[untyped]): untyped {.deprecated: "use dirExists".} =
dirExists(args)
# {.deprecated: [existsFile: fileExists].} # pending bug #14819; this would avoid above mentioned issue
when not defined(windows) and not weirdTarget:
proc checkSymlink(path: string): bool =
var rawInfo: Stat
if lstat(path, rawInfo) < 0'i32: result = false
else: result = S_ISLNK(rawInfo.st_mode)
const const
maxSymlinkLen = 1024 maxSymlinkLen = 1024
ExeExts* = ## Platform specific file extension for executables. ExeExts* = ## Platform specific file extension for executables.
@ -1213,7 +1200,7 @@ proc findExe*(exe: string, followSymlinks: bool = true;
if fileExists(x): if fileExists(x):
when not defined(windows): when not defined(windows):
while followSymlinks: # doubles as if here while followSymlinks: # doubles as if here
if x.checkSymlink: if x.symlinkExists:
var r = newString(maxSymlinkLen) var r = newString(maxSymlinkLen)
var len = readlink(x, r, maxSymlinkLen) var len = readlink(x, r, maxSymlinkLen)
if len < 0: if len < 0:
@ -3310,3 +3297,12 @@ func isValidFilename*(filename: string, maxLen = 259.Positive): bool {.since: (1
find(f.name, invalidFilenameChars) != -1): return false find(f.name, invalidFilenameChars) != -1): return false
for invalid in invalidFilenames: for invalid in invalidFilenames:
if cmpIgnoreCase(f.name, invalid) == 0: return false if cmpIgnoreCase(f.name, invalid) == 0: return false
# deprecated declarations
when not defined(nimscript):
when not defined(js): # `noNimJs` doesn't work with templates, this should improve.
template existsFile*(args: varargs[untyped]): untyped {.deprecated: "use fileExists".} =
fileExists(args)
template existsDir*(args: varargs[untyped]): untyped {.deprecated: "use dirExists".} =
dirExists(args)
# {.deprecated: [existsFile: fileExists].} # pending bug #14819; this would avoid above mentioned issue