Merge pull request #1733 from promansk/fix-cli-help-text

crun: fix the binary name displayed in the Usage info for commands.

Author: giuseppe

src/crun.c

@@ -427,6 +427,16 @@ fill_handler_from_argv0 (char *argv0, struct crun_global_arguments *args)
     args->handler = b + 5;
 }
 
+static char **
+copy_args (char **argv, int argc)
+{
+  char **buff = xmalloc0 ((argc + 1) * sizeof (char *));
+  for (int i = 0; i < argc; i++)
+    buff[i] = argv[i];
+
+  return buff;
+}
+
 int
 main (int argc, char **argv)
 {
@@ -448,15 +458,19 @@ main (int argc, char **argv)
 #endif
 
   fill_handler_from_argv0 (argv[0], &arguments);
-
   argp_parse (&argp, argc, argv, ARGP_IN_ORDER, &first_argument, &arguments);
 
   command = get_command (argv[first_argument]);
   if (command == NULL)
     libcrun_fail_with_error (0, "unknown command %s", argv[first_argument]);
 
-  ret = command->handler (&arguments, argc - first_argument, argv + first_argument, &err);
+  int command_argc = argc - first_argument;
+  cleanup_free char **command_argv = copy_args (argv + first_argument, command_argc);
+  command_argv[0] = argv[0];
+
+  ret = command->handler (&arguments, command_argc, command_argv, &err);
   if (ret && err)
     libcrun_fail_with_error (err->status, "%s", err->msg);
+
   return ret;
 }

tests/test_delete.py

@@ -96,10 +96,17 @@ def test_multiple_containers_delete():
             return -1
     return 0
 
+def test_help_delete():
+    out = run_crun_command(["delete", "--help"])
+    if "Usage: crun [OPTION...] delete CONTAINER" not in out:
+        return -1
+    
+    return 0
 
 all_tests = {
     "test_simple_delete" : test_simple_delete,
     "test_multiple_containers_delete" : test_multiple_containers_delete,
+    "test_help_delete": test_help_delete,
 }
 
 if __name__ == "__main__":

tests/test_exec.py

@@ -464,6 +464,13 @@ def test_exec_getpgrp():
             run_crun_command(["delete", "-f", cid])
     return 0
 
+def test_exec_help():
+    out = run_crun_command(["exec", "--help"])
+    if "Usage: crun [OPTION...] exec CONTAINER cmd" not in out:
+        return -1
+    
+    return 0
+
 all_tests = {
     "exec" : test_exec,
     "exec-not-exists" : test_exec_not_exists,
@@ -479,6 +486,7 @@ def test_exec_getpgrp():
     "exec-test-uid-tty": test_uid_tty,
     "exec-cpu-affinity": test_exec_cpu_affinity,
     "exec-getpgrp": test_exec_getpgrp,
+    "exec-help" : test_exec_help,
 }
 
 if __name__ == "__main__":

tests/test_mounts.py

@@ -669,6 +669,13 @@ def check_test_file(expected):
         shutil.rmtree(bind_dir)
     return 0
 
+def test_mount_help():
+    out = run_crun_command(["mounts", "--help"])
+    if "Usage: crun [OPTION...] mounts [add|remove] CONTAINER FILE" not in out:
+        return -1
+    
+    return 0
+
 all_tests = {
     "mount-ro" : test_mount_ro,
     "mount-rro" : test_mount_rro,
@@ -698,6 +705,7 @@ def check_test_file(expected):
     "mount-copy-symlink": test_copy_symlink,
     "mount-tmpfs-permissions": test_mount_tmpfs_permissions,
     "mount-add-remove-mounts": test_add_remove_mounts,
+    "mount-help": test_mount_help,
 }
 
 if __name__ == "__main__":

tests/test_start.py

@@ -521,6 +521,13 @@ def test_home_unknown_id():
         return -1
     return 0
 
+def test_start_help():
+    out = run_crun_command(["start", "--help"])
+    if "Usage: crun [OPTION...] start CONTAINER" not in out:
+        return -1
+    
+    return 0
+
 all_tests = {
     "start" : test_start,
     "start-override-config" : test_start_override_config,
@@ -541,6 +548,7 @@ def test_home_unknown_id():
     "run-keep": test_run_keep,
     "invalid-id": test_invalid_id,
     "home-unknown-id": test_home_unknown_id,
+    "help": test_start_help,
 }
 
 if __name__ == "__main__":

tests/test_update.py

@@ -49,9 +49,16 @@ def test_update():
         shutil.rmtree(temp_dir)
     return 1
 
+def test_update_help():
+    out = run_crun_command(["update", "--help"])
+    if "Usage: crun [OPTION...] update [OPTION]... CONTAINER" not in out:
+        return -1
+    
+    return 0
 
 all_tests = {
     "test-update" : test_update,
+    "test-update-help": test_update_help,
 }
 
 if __name__ == "__main__":