From e64fbba33a3ca1c3194fb93322feb1b19169878c Mon Sep 17 00:00:00 2001
From: Nikias Bassen
Date: Fri, 5 Jun 2020 17:06:39 +0200
Subject: plistutil: Fix option parsing

---
 tools/plistutil.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'tools')

diff --git a/tools/plistutil.c b/tools/plistutil.c
index e439d13..9c503b7 100644
--- a/tools/plistutil.c
+++ b/tools/plistutil.c
@@ -84,8 +84,7 @@ static options_t *parse_arguments(int argc, char *argv[])
             i++;
             continue;
         }
-
-        if (!strcmp(argv[i], "--outfile") || !strcmp(argv[i], "-o"))
+        else if (!strcmp(argv[i], "--outfile") || !strcmp(argv[i], "-o"))
         {
             if ((i + 1) == argc)
             {
@@ -96,8 +95,7 @@ static options_t *parse_arguments(int argc, char *argv[])
             i++;
             continue;
         }
-
-        if (!strcmp(argv[i], "--format") || !strcmp(argv[i], "-f"))
+        else if (!strcmp(argv[i], "--format") || !strcmp(argv[i], "-f"))
         {
             if ((i + 1) == argc)
             {
@@ -116,14 +114,18 @@ static options_t *parse_arguments(int argc, char *argv[])
             i++;
             continue;
         }
-
-        if (!strcmp(argv[i], "--debug") || !strcmp(argv[i], "-d"))
+        else if (!strcmp(argv[i], "--debug") || !strcmp(argv[i], "-d"))
         {
             options->debug = 1;
         }
-
-        if (!strcmp(argv[i], "--help") || !strcmp(argv[i], "-h"))
+        else if (!strcmp(argv[i], "--help") || !strcmp(argv[i], "-h"))
+        {
+            free(options);
+            return NULL;
+        }
+        else
         {
+            printf("ERROR: Invalid option '%s'\n", argv[i]);
             free(options);
             return NULL;
         }
-- 
cgit v1.1-32-gdbae