tools: Fix irm CLI arg parsing

Fixes "irm name list" matching "list" instead of "name" and improves guards
against missing (last) arguments.

Signed-off-by: Dimitri Staessens <dimitri@ouroboros.rocks>
Signed-off-by: Sander Vrijders <sander@ouroboros.rocks>

1 files changed, 9 insertions, 4 deletions

diff --git a/src/tools/irm/irm_unbind_process.c b/src/tools/irm/irm_unbind_process.c
index bc7e545c..dfa91f4b 100644
--- a/src/tools/irm/irm_unbind_process.c
+++ b/src/tools/irm/irm_unbind_process.c
@@ -58,15 +58,20 @@ int do_unbind_process(int     argc,
         pid_t  pid  = -1;
         char * name = NULL;
 
+        if (argc < 1) {
+                usage();
+                return -1;
+        }
+
+        pid = strtol(*argv, NULL, 10);
+        ++argv;
+        --argc;
+
         while (argc > 1) {
                 if (matches(*argv, "name") == 0) {
                         name = *(argv + 1);
                         ++argv;
                         --argc;
-                } else if (matches(*argv, "process") == 0) {
-                        pid = strtol(*(argv + 1), NULL, 10);
-                        ++argv;
-                        --argc;
                 } else {
                         printf("\"%s\" is unknown, try \"irm "
                                "unbind process\".\n", *argv);