Changes in uspace/app/bdsh/cmds/modules/ls/ls.c [26c02b22:6afc9d7] in mainline

File:

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

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

@@ -31 +31 @@
  * As more stuff is completed and exposed in libc, this will improve */
 
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -187 +188 @@
                 if (rc != 0) {
                         printf("ls: skipping bogus node %s\n", buff);
-                        printf("rc=%d\n", rc);
+                        printf("error=%d\n", errno);
                         goto out;
                 }
@@ -314 +315 @@
 static unsigned int ls_scope(const char *path, struct dir_elem_t *de)
 {
-        if (stat(path, &de->s)) {
+        if (stat(path, &de->s) != 0) {
                 cli_error(CL_ENOENT, "%s", path);
                 return LS_BOGUS;
@@ -362 +363 @@
         argc = cli_count_args(argv);
         
-        for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
+        for (c = 0, optreset = 1, optind = 0, opt_ind = 0; c != -1;) {
                 c = getopt_long(argc, argv, "hur", long_options, &opt_ind);
                 switch (c) {
@@ -376 +377 @@
                 }
         }
-        
+
         argc -= optind;
-        
+
         de.name = (char *) malloc(PATH_MAX);
         if (!de.name) {
-                cli_error(CL_ENOMEM, "%s: ", cmdname);
+                cli_error(CL_ENOMEM, "%s: Out of memory", cmdname);
                 return CMD_FAILURE;
         }
         memset(de.name, 0, PATH_MAX);
-        
-        if (argc == 0)
-                getcwd(de.name, PATH_MAX);
-        else
+
+        if (argc == 0) {
+                if (getcwd(de.name, PATH_MAX) == NULL) {
+                        cli_error(CL_EFAIL, "%s: Failed determining working "
+                            "directory", cmdname);
+                        return CMD_FAILURE;
+                }
+        } else {
                 str_cpy(de.name, PATH_MAX, argv[optind]);
+        }
 
         scope = ls_scope(de.name, &de);