Fixes #34

yousefvand · Jun 17, 2021 · 2304a94 · 2304a94
1 parent 982778d
commit 2304a94
Show file tree

Hide file tree

Showing 6 changed files with 631 additions and 638 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -61,6 +61,7 @@
     "startrow",
     "stty",
     "systemctl",
+    "tnum",
     "tprintf",
     "tput",
     "ttput",

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## 5.?.?
 
 - `build.go` now generates `COMMANDS.md` as well.
+- Fixed #34 (Argument parsing for switches may result in infinite loop)
 
 ## 5.5.0
 

diff --git a/nsroot/misc/arguments-parse.json b/nsroot/misc/arguments-parse.json
@@ -5,15 +5,20 @@
   ],
   "body": [
     "POSITIONAL=()",
-    "while [[ \\$# > 0 ]]; do",
+    "while (( \\$# > 0 )); do",
     "\tcase \"\\${1\\}\" in",
     "\t\t-f|--flag)",
     "\t\techo flag: \"\\${1\\}\"",
     "\t\tshift # shift once since flags have no values",
     "\t\t;;",
     "\t\t-s|--switch)",
-    "\t\techo \"switch: \\${1\\} with value: \\${2\\}\"",
-    "\t\tshift 2 # shift twice to bypass switch and its value",
+    "\t\tnumOfArgs=1 # number of switch arguments",
+    "\t\tif (( \\$# < numOfArgs + 1 )); then",
+    "\t\t\tshift \\$#",
+    "\t\telse",
+    "\t\t\techo \"switch: \\${1\\} with value: \\${2\\}\"",
+    "\t\t\tshift \\$((numOfArgs + 1)) # shift 'numOfArgs + 1' to bypass switch and its value",
+    "\t\tfi",
     "\t\t;;",
     "\t\t*) # unknown flag/switch",
     "\t\tPOSITIONAL+=(\"\\${1\\}\")",