Changeset cfc3027 in mainline

Timestamp:

2011-04-01T14:23:08Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

bdbb6f6

Parents:

2859445

Message:

Fix handling of options.

File:

• uspace/app/bdsh/cmds/modules/ls/ls.c (modified) (4 diffs)

uspace/app/bdsh/cmds/modules/ls/ls.c

@@ -57 +57 @@
 /** Structure to represent a directory entry.
  *
- * Useful to keep together important informations
+ * Useful to keep together important information
  * for sorting directory entries.
  */
@@ -69 +69 @@
 static struct option const long_options[] = {
         { "help", no_argument, 0, 'h' },
-        { "unsort", no_argument, 0, 'u' },      
+        { "unsort", no_argument, 0, 'u' },
         { 0, 0, 0, 0 }
 };
@@ -246 +246 @@
         }
         
-        int dir = (int) argc > optind ? (int) argc - 1 : optind - 1;
-        argc -= (optind - 1);
+        argc -= optind;
         
         de.name = (char *) malloc(PATH_MAX);
@@ -256 +255 @@
         memset(de.name, 0, sizeof(PATH_MAX));
         
-        if (argc == 1)
+        if (argc == 0)
                 getcwd(de.name, PATH_MAX);
         else
-                str_cpy(de.name, PATH_MAX, argv[dir]);
+                str_cpy(de.name, PATH_MAX, argv[optind]);
         
         if (stat(de.name, &de.s)) {