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

make parsopt compile under --taintMode:on

Browse source
This commit is contained in:
Araq 2018-08-28 11:47:26 +02:00
commit e02e057a70
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/pure/parseopt.nim
View file

@ -137,7 +137,7 @@ when declared(os.paramCount):
if cmdline.len != 0: if cmdline.len != 0:
result.cmds = newSeq[string](cmdline.len) result.cmds = newSeq[string](cmdline.len)
for i in 0..<cmdline.len: for i in 0..<cmdline.len:
result.cmds[i] = cmdline[i] result.cmds[i] = cmdline[i].string
result.cmd.add quote(cmdline[i].string) result.cmd.add quote(cmdline[i].string)
result.cmd.add ' ' result.cmd.add ' '
else: else:
@ -165,7 +165,7 @@ proc handleShortOption(p: var OptParser; cmd: string) =
inc(i) inc(i)
p.inShortState = false p.inShortState = false
while i < cmd.len and cmd[i] in {'\t', ' '}: inc(i) while i < cmd.len and cmd[i] in {'\t', ' '}: inc(i)
p.val = substr(cmd, i) p.val = TaintedString substr(cmd, i)
p.pos = 0 p.pos = 0
inc p.idx inc p.idx
else: else:
@ -210,12 +210,12 @@ proc next*(p: var OptParser) {.rtl, extern: "npo$1".} =
if i < p.cmds[p.idx].len and p.cmds[p.idx][i] in {':', '='}: if i < p.cmds[p.idx].len and p.cmds[p.idx][i] in {':', '='}:
inc(i) inc(i)
while i < p.cmds[p.idx].len and p.cmds[p.idx][i] in {'\t', ' '}: inc(i) while i < p.cmds[p.idx].len and p.cmds[p.idx][i] in {'\t', ' '}: inc(i)
p.val = p.cmds[p.idx].substr(i) p.val = TaintedString p.cmds[p.idx].substr(i)
elif len(p.longNoVal) > 0 and p.key.string notin p.longNoVal and p.idx+1 < p.cmds.len: elif len(p.longNoVal) > 0 and p.key.string notin p.longNoVal and p.idx+1 < p.cmds.len:
p.val = p.cmds[p.idx+1] p.val = TaintedString p.cmds[p.idx+1]
inc p.idx inc p.idx
else: else:
p.val = "" p.val = TaintedString""
inc p.idx inc p.idx
p.pos = 0 p.pos = 0
else: else:
@ -223,7 +223,7 @@ proc next*(p: var OptParser) {.rtl, extern: "npo$1".} =
handleShortOption(p, p.cmds[p.idx]) handleShortOption(p, p.cmds[p.idx])
else: else:
p.kind = cmdArgument p.kind = cmdArgument
p.key = p.cmds[p.idx] p.key = TaintedString p.cmds[p.idx]
inc p.idx inc p.idx
p.pos = 0 p.pos = 0