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

added a variant of quoteShellCommand that takes an openArray of arguments (#8272)

Browse source
This commit is contained in:
Timothee Cour 2018-08-16 05:10:16 -07:00 • committed by Andreas Rumpf
commit 87b2d2aad6
1 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/pure/ospaths.nim
View file

@ -570,6 +570,8 @@ proc expandTilde*(path: string): string {.
# TODO: handle `~bob` and `~bob/` which means home of bob # TODO: handle `~bob` and `~bob/` which means home of bob
result = path result = path
# TODO: consider whether quoteShellPosix, quoteShellWindows, quoteShell, quoteShellCommand
# belong in `strutils` instead; they are not specific to paths
proc quoteShellWindows*(s: string): string {.noSideEffect, rtl, extern: "nosp$1".} = proc quoteShellWindows*(s: string): string {.noSideEffect, rtl, extern: "nosp$1".} =
## Quote s, so it can be safely passed to Windows API. ## Quote s, so it can be safely passed to Windows API.
## Based on Python's subprocess.list2cmdline ## Based on Python's subprocess.list2cmdline
@ -621,6 +623,18 @@ when defined(windows) or defined(posix) or defined(nintendoswitch):
else: else:
return quoteShellPosix(s) return quoteShellPosix(s)
proc quoteShellCommand*(args: openArray[string]): string =
## Concatenates and quotes shell arguments `args`
runnableExamples:
when defined(posix):
assert quoteShellCommand(["aaa", "", "c d"]) == "aaa '' 'c d'"
when defined(windows):
assert quoteShellCommand(["aaa", "", "c d"]) == "aaa \"\" \"c d\""
# can't use `map` pending https://github.com/nim-lang/Nim/issues/8303
for i in 0..<args.len:
if i > 0: result.add " "
result.add quoteShell(args[i])
when isMainModule: when isMainModule:
assert quoteShellWindows("aaa") == "aaa" assert quoteShellWindows("aaa") == "aaa"
assert quoteShellWindows("aaa\"") == "aaa\\\"" assert quoteShellWindows("aaa\"") == "aaa\\\""