Changes in uspace/app/bdsh/cmds/modules/ls/ls.c [c878693:59cce22] in mainline

File:

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

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

@@ -42 +42 @@
 #include <vfs/vfs.h>
 #include <str.h>
-#include <cap.h>
 
 #include "ls.h"
@@ -59 +58 @@
         { "unsort", no_argument, 0, 'u' },
         { "recursive", no_argument, 0, 'r' },
-        { "exact-size", no_argument, 0, 'e' },
-        { "single-column", no_argument, 0, '1' },
         { 0, 0, 0, 0 }
 };
@@ -66 +63 @@
 /* Prototypes for the ls command, excluding entry points. */
 static unsigned int ls_start(ls_job_t *);
-static errno_t ls_print(struct dir_elem_t *);
-static errno_t 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 *);
+static void ls_print(struct dir_elem_t *);
+static int ls_cmp(const void *, const void *);
 static signed int ls_scan_dir(const char *, DIR *, struct dir_elem_t **);
 static unsigned int ls_recursive(const char *, DIR *);
@@ -79 +74 @@
         ls->sort = 1;
 
-        ls->exact_size = false;
-        ls->single_column = false;
-        ls->printer = ls_print;
         return 1;
 }
@@ -96 +88 @@
  * @param de            Directory element.
  */
-static errno_t ls_print(struct dir_elem_t *de)
-{
-        int width = 13;
-
-        if (de->s.is_file) {
-                if (ls.exact_size) {
-                        printf("%-40s\t%*llu\n", de->name, width, (long long) de->s.size);
-                        return EOK;
-                }
-
-                cap_spec_t cap;
-                cap_from_blocks(de->s.size, 1, &cap);
-                cap_simplify(&cap);
-
-                char *rptr;
-                errno_t rc = cap_format(&cap, &rptr);
-                if (rc != EOK) {
-                        return rc;
-                }
-
-                char *sep = str_rchr(rptr, ' ');
-                if (sep == NULL) {
-                        free(rptr);
-                        return ENOENT;
-                }
-
-                *sep = '\0';
-
-                printf("%-40s\t%*s %2s\n", de->name, width - 3, rptr, sep + 1);
-                free(rptr);
-        } else if (de->s.is_directory)
-                printf("%-40s\t%*s\n", de->name, width, "<dir>");
+static void ls_print(struct dir_elem_t *de)
+{
+        if (de->s.is_file)
+                printf("%-40s\t%llu\n", de->name, (long long) de->s.size);
+        else if (de->s.is_directory)
+                printf("%-40s\t<dir>\n", de->name);
         else
                 printf("%-40s\n", de->name);
-
-        return EOK;
-}
-
-static errno_t ls_print_single_column(struct dir_elem_t *de)
-{
-        if (de->s.is_file) {
-                printf("%s\n", de->name);
-        } else {
-                printf("%s/\n", de->name);
-        }
-
-        return EOK;
 }
 
@@ -156 +109 @@
  * @return              -1 if a < b, 1 otherwise.
  */
-static int ls_cmp_type_name(const void *a, const void *b)
+static int ls_cmp(const void *a, const void *b)
 {
         struct dir_elem_t const *da = a;
@@ -167 +120 @@
         else
                 return 1;
-}
-
-/** Compare directories/files per name
- *
- * This comparision ignores the type of
- * the node. Sorted will strictly by name.
- *
- */
-static int ls_cmp_name(const void *a, const void *b)
-{
-        struct dir_elem_t const *da = a;
-        struct dir_elem_t const *db = b;
-
-        return str_cmp(da->name, db->name);
 }
 
@@ -253 +192 @@
         }
 
-        if (ls.sort) {
-                int (*compar)(const void *, const void *);
-                compar = ls.single_column ? ls_cmp_name : ls_cmp_type_name;
-                qsort(&tosort[0], nbdirs, sizeof(struct dir_elem_t), compar);
-        }
-
-        for (i = 0; i < nbdirs; i++) {
-                if (ls.printer(&tosort[i]) != EOK) {
-                        cli_error(CL_ENOMEM, "%s: Out of memory", cmdname);
-                        goto out;
-                }
-        }
+        if (ls.sort)
+                qsort(&tosort[0], nbdirs, sizeof(struct dir_elem_t), ls_cmp);
+
+        for (i = 0; i < nbdirs; i++)
+                ls_print(&tosort[i]);
 
         /* Populate the directory list. */
-        if (ls.recursive) {
+        if (ls.recursive && nbdirs > 0) {
                 tmp = (struct dir_elem_t *) realloc(*dir_list_ptr,
                     nbdirs * sizeof(struct dir_elem_t));
@@ -401 +333 @@
                     "If not path is given, the current working directory is used.\n"
                     "Options:\n"
-                    "  -h, --help            A short option summary\n"
-                    "  -u, --unsort          Do not sort directory entries\n"
-                    "  -r, --recursive       List subdirectories recursively\n"
-                    "  -e, --exact-size      File sizes will be unformatted (raw bytes count)\n"
-                    "  -1, --single-column   Only the names will be returned\n",
+                    "  -h, --help       A short option summary\n"
+                    "  -u, --unsort     Do not sort directory entries\n"
+                    "  -r, --recursive  List subdirectories recursively\n",
                     cmdname);
         }
@@ -434 +364 @@
 
         while (c != -1) {
-                c = getopt_long(argc, argv, "hure1", long_options, &opt_ind);
+                c = getopt_long(argc, argv, "hur", long_options, &opt_ind);
                 switch (c) {
                 case 'h':
@@ -445 +375 @@
                         ls.recursive = 1;
                         break;
-                case 'e':
-                        ls.exact_size = true;
-                        break;
-                case '1':
-                        ls.single_column = true;
-                        ls.printer = ls_print_single_column;
-                        break;
                 }
         }
@@ -477 +400 @@
         switch (scope) {
         case LS_FILE:
-                if (ls.printer(&de) != EOK) {
-                        cli_error(CL_ENOMEM, "%s: Out of memory", cmdname);
-                        return CMD_FAILURE;
-                }
+                ls_print(&de);
                 break;
         case LS_DIR: