Changeset f4f4b95 in mainline

Timestamp:

2018-12-15T18:33:04Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

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

Children:

0feb39b

Parents:

c7afdf7a

git-author:

Matthieu Riolo <matthieu.riolo@…> (2018-12-15 18:30:35)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2018-12-15 18:33:04)

Message:

improved error handling

Location:

uspace/app/bdsh/cmds/modules/ls

Files:

• ls.c (modified) (6 diffs)
• ls.h (modified) (1 diff)

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

@@ -66 +66 @@
 /* Prototypes for the ls command, excluding entry points. */
 static unsigned int ls_start(ls_job_t *);
-static void ls_print(struct dir_elem_t *);
-static void ls_print_single_column(struct dir_elem_t *);
+static bool ls_print(struct dir_elem_t *);
+static bool ls_print_single_column(struct dir_elem_t *);
 static int ls_cmp_type_name(const void *, const void *);
 static int ls_cmp_name(const void *, const void *);
@@ -96 +96 @@
  * @param de            Directory element.
  */
-static void ls_print(struct dir_elem_t *de)
+static bool ls_print(struct dir_elem_t *de)
 {
         int width = 13;
 
         if (de->s.is_file) {
-                if (!ls.exact_size) {
+                if (ls.exact_size) {
+                        printf("%-40s\t%*llu\n", de->name, width, (long long) de->s.size);
+                } else {
                         cap_spec_t cap;
 
@@ -114 +116 @@
 
                                 printf("%-40s\t%*s %2s\n", de->name, width - 3, bytes, suffix);
-                                
-                                //if there is a failure with cap_format we simply print out an unformatted size
-                                return;
-                        }
-
-                }
-
-                printf("%-40s\t%*llu\n", de->name, width, (long long) de->s.size);
+                        } else
+                                return false;
+                }
         } else if (de->s.is_directory)
                 printf("%-40s\t%*s\n", de->name, width, "<dir>");
         else
                 printf("%-40s\n", de->name);
-}
-
-static void ls_print_single_column(struct dir_elem_t *de)
+
+        return true;
+}
+
+static bool ls_print_single_column(struct dir_elem_t *de)
 {
         if (de->s.is_file) {
@@ -135 +134 @@
                 printf("%s/\n", de->name);
         }
+
+        return true;
 }
 
@@ -251 +252 @@
         }
 
-        for (i = 0; i < nbdirs; i++)
-                ls.printer(&tosort[i]);
+        for (i = 0; i < nbdirs; i++) {
+                if (!ls.printer(&tosort[i])) {
+                        cli_error(CL_ENOMEM, "%s: Out of memory", cmdname);
+                        goto out;
+                }
+        }
 
         /* Populate the directory list. */
@@ -465 +470 @@
         switch (scope) {
         case LS_FILE:
-                ls.printer(&de);
+                if (!ls.printer(&de)) {
+                        cli_error(CL_ENOMEM, "%s: Out of memory", cmdname);
+                        return CMD_FAILURE;
+                }
                 break;
         case LS_DIR:

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

@@ -27 +27 @@
         bool exact_size;
 
-        void (*printer)(struct dir_elem_t *);
+        bool (*printer)(struct dir_elem_t *);
 } ls_job_t;