From 795e5e11ef53260a0a15e25eba36dddbd83900c1 Mon Sep 17 00:00:00 2001
From: Timothee Cour <timothee.cour2@gmail.com>
Date: Tue, 15 Jan 2019 12:51:02 -0800
Subject: [PATCH] parseopt2.cmdLineRest is now correct too (#10304)

---
 lib/pure/parseopt2.nim   |  8 ++++----
 tests/misc/tparseopt.nim | 35 +++++++++++++++++++----------------
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/lib/pure/parseopt2.nim b/lib/pure/parseopt2.nim
index 51a70b6d1d..a84943cf95 100644
--- a/lib/pure/parseopt2.nim
+++ b/lib/pure/parseopt2.nim
@@ -112,10 +112,10 @@ proc next(p: var OptParser) =
     p.key = token
     p.val = ""
 
-proc cmdLineRest*(p: OptParser): TaintedString {.rtl, extern: "npo2$1", deprecated.} =
-  ## Returns part of command line string that has not been parsed yet.
-  ## Do not use - does not correctly handle whitespace.
-  return p.cmd[p.pos..p.cmd.len-1].join(" ")
+proc cmdLineRest*(p: OptParser): TaintedString {.rtl, extern: "npo2$1".} =
+  ## Returns the part of command line string that has not been parsed yet,
+  ## properly quoted.
+  return p.cmd[p.pos..p.cmd.len-1].quoteShellCommand
 
 type
   GetoptResult* = tuple[kind: CmdLineKind, key, val: TaintedString]
diff --git a/tests/misc/tparseopt.nim b/tests/misc/tparseopt.nim
index 57253389da..d8824e5220 100644
--- a/tests/misc/tparseopt.nim
+++ b/tests/misc/tparseopt.nim
@@ -97,24 +97,27 @@ else:
   from stdtest/specialpaths import buildDir
   import "../.." / compiler/unittest_light
 
-  block: # fix #9951
-    var p = parseopt.initOptParser(@["echo \"quoted\""])
-    let expected = when defined(windows):
-      """"echo \"quoted\"""""
-    else:
-      """'echo "quoted"'"""
-    assertEquals parseopt.cmdLineRest(p), expected
+  block: # fix #9951 (and make it work for parseopt and parseopt2)
+    template runTest(parseoptCustom) =
+      var p = parseoptCustom.initOptParser(@["echo \"quoted\""])
+      let expected = when defined(windows):
+        """"echo \"quoted\"""""
+      else:
+        """'echo "quoted"'"""
+      assertEquals parseoptCustom.cmdLineRest(p), expected
 
-    doAssert "a5'b" == "a5\'b"
+      doAssert "a5'b" == "a5\'b"
 
-    let args = @["a1b", "a2 b", "", "a4\"b", "a5'b", r"a6\b", "a7\'b"]
-    var p2 = parseopt.initOptParser(args)
-    let expected2 = when defined(windows):
-      """a1b "a2 b" "" a4\"b a5'b a6\b a7'b"""
-    else:
-      """a1b 'a2 b' '' 'a4"b' 'a5'"'"'b' 'a6\b' 'a7'"'"'b'"""
-    doAssert "a5'b" == "a5\'b"
-    assertEquals parseopt.cmdLineRest(p2), expected2
+      let args = @["a1b", "a2 b", "", "a4\"b", "a5'b", r"a6\b", "a7\'b"]
+      var p2 = parseoptCustom.initOptParser(args)
+      let expected2 = when defined(windows):
+        """a1b "a2 b" "" a4\"b a5'b a6\b a7'b"""
+      else:
+        """a1b 'a2 b' '' 'a4"b' 'a5'"'"'b' 'a6\b' 'a7'"'"'b'"""
+      doAssert "a5'b" == "a5\'b"
+      assertEquals parseoptCustom.cmdLineRest(p2), expected2
+    runTest(parseopt)
+    runTest(parseopt2)
 
   block: # fix #9842
     let exe = buildDir / "D20190112T145450".addFileExt(ExeExt)