Changeset 54e90cc in mainline

Timestamp:

2011-03-23T22:51:39Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

1ff896e

Parents:

fca78d4

Message:

Fix handling of command-line arguments in ext2info

File:

• uspace/app/ext2info/ext2info.c (modified) (5 diffs)

uspace/app/ext2info/ext2info.c

@@ -49 +49 @@
 #include <errno.h>
 #include <libext2.h>
+#include <assert.h>
 
 #define NAME    "ext2info"
@@ -96 +97 @@
         --argc; ++argv;
         
-        if (str_cmp(*argv, "--strict-check") == 0) {
+        if (argc > 0 && str_cmp(*argv, "--strict-check") == 0) {
                 --argc; ++argv;
                 arg_flags |= ARG_STRICT_CHECK;
         }
         
-        if (str_cmp(*argv, "--superblock") == 0) {
+        if (argc > 0 && str_cmp(*argv, "--superblock") == 0) {
                 --argc; ++argv;
                 arg_flags |= ARG_SUPERBLOCK;
         }
         
-        if (str_cmp(*argv, "--block-groups") == 0) {
+        if (argc > 0 && str_cmp(*argv, "--block-groups") == 0) {
                 --argc; ++argv;
                 arg_flags |= ARG_BLOCK_GROUPS;
         }
         
-        if (str_cmp(*argv, "--inode") == 0) {
+        if (argc > 0 && str_cmp(*argv, "--inode") == 0) {
                 --argc; ++argv;
                 if (argc == 0) {
@@ -128 +129 @@
                 --argc; ++argv;
                 
-                if (str_cmp(*argv, "--inode-data") == 0) {
+                if (argc > 0 && str_cmp(*argv, "--inode-data") == 0) {
                         --argc; ++argv;
                         if (argc == 0) {
@@ -146 +147 @@
                 }
                 
-                if (str_cmp(*argv, "--list") == 0) {
+                if (argc > 0 && str_cmp(*argv, "--list") == 0) {
                         --argc; ++argv;
                         arg_flags |= ARG_INODE_LIST;
@@ -152 +153 @@
         }
 
-        if (argc != 1) {
+        if (argc < 1) {
+                printf(NAME ": Error, argument missing.\n");
+                syntax_print();
+                return 1;
+        }
+        else if (argc > 1) {
                 printf(NAME ": Error, unexpected argument.\n");
                 syntax_print();
                 return 1;
         }
+        assert(argc == 1);
         
         // Display common things by default