Changeset ff381a7 in mainline for uspace/app/bdsh/cmds/modules/ls/ls.c

Timestamp:

2015-11-02T20:54:19Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/app/bdsh/cmds/modules/ls/ls.c (modified) (4 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;
@@ -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);