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_ipcp.c b/src/tools/irm/irm_unbind_ipcp.c
index 23e25057..5d78603d 100644
--- a/src/tools/irm/irm_unbind_ipcp.c
+++ b/src/tools/irm/irm_unbind_ipcp.c
@@ -63,15 +63,20 @@ int do_unbind_ipcp(int     argc,
         ssize_t                 len;
         ssize_t                 i;
 
+        if (argc < 1) {
+                usage();
+                return -1;
+        }
+
+        ipcp = *argv;
+        ++argv;
+        --argc;
+
         while (argc > 0) {
                 if (matches(*argv, "name") == 0) {
                         name = *(argv + 1);
                         ++argv;
                         --argc;
-                } else if (matches(*argv, "ipcp") == 0) {
-                        ipcp = *(argv + 1);
-                        ++argv;
-                        --argc;
                 } else {
                         printf("\"%s\" is unknown, try \"irm "
                                "unbind ipcp\".\n", *argv);