Issue cs01#194: Change --args to match 'gdb --args'. 'cmd' now only takes program name.

Author: fritzr

gdbgui/backend.py

@@ -765,18 +765,6 @@ def main():
     security = parser.add_argument_group(title="security settings")
     other = parser.add_argument_group(title="other settings")
 
-    gdb_group.add_argument(
-        "cmd",
-        nargs="*",
-        help="The binary and arguments to run in gdb. Example: './mybinary myarg -flag1 -flag2'",
-        default=[],
-    )
-    gdb_group.add_argument(
-        "--args",
-        nargs="+",
-        help='Alias for cmd argument above. Example: gdbgui --args "./mybinary myarg -flag1 -flag2"',
-        default=[],
-    )
     gdb_group.add_argument(
         "-x", "--gdb_cmd_file", help="Execute GDB commands from file."
     )
@@ -858,12 +846,36 @@ def main():
         help="By default, the browser will open with gdbgui. Pass this flag so the browser does not open.",
         action="store_true",
     )
+    other.add_argument(
+        "-b",
+        "--browser",
+        help="Use the given browser executable instead of the system default.",
+        default=None,
+    )
     other.add_argument(
         "--debug",
         help="The debug flag of this Flask application. "
         "Pass this flag when debugging gdbgui itself to automatically reload the server when changes are detected",
         action="store_true",
     )
+
+    gdb_group.add_argument(
+        "--args",
+        nargs=argparse.REMAINDER,
+        help='All remaining args are taken as the binary and arguments to run'
+            ' in gdb (as with gdb --args).'
+            ' Example: gdbgui [...] --args ./mybinary myarg -flag1 -flag2',
+        default=[],
+    )
+    gdb_group.add_argument(
+        "cmd",
+        nargs='?',
+        help='Name of the binary to run in gdb. To pass flags to the binary,'
+            ' use --args.'
+            ' Example: gdbgui ./mybinary [gdbgui-args...]',
+        default=[],
+    )
+
     args = parser.parse_args()
 
     initialize_preferences()