Changeset a20a451 in mainline

Timestamp:

2018-11-30T09:40:48Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

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

Children:

87ba3ceb

Parents:

c483fca

Message:

adding options for single column output and human readable sizes

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

@@ -42 +42 @@
 #include <vfs/vfs.h>
 #include <str.h>
+#include <cap.h>
 
 #include "ls.h"
@@ -58 +59 @@
         { "unsort", no_argument, 0, 'u' },
         { "recursive", no_argument, 0, 'r' },
+        { "well-formatted", no_argument, 0, 'w' },
+        { "single-column", no_argument, 0, '1' },
         { 0, 0, 0, 0 }
 };
@@ -74 +77 @@
         ls->sort = 1;
 
+        ls->well_formatted = false;
+        ls->single_column = false;
+
         return 1;
 }
@@ -90 +96 @@
 static void ls_print(struct dir_elem_t *de)
 {
-        if (de->s.is_file)
+        if (!ls.single_column && de->s.is_file) {
+                if (ls.well_formatted) {
+                        cap_spec_t cap;
+
+                        cap_from_blocks(1, de->s.size, &cap);
+                        cap_simplify(&cap);
+
+                        char *rptr;
+                        if (cap_format(&cap, &rptr) == EOK) {
+                                printf("%-40s\t%s\n", de->name, rptr);
+                                free(rptr);
+                                //if there is a failure with cap_format we simply print out an unformatted size
+                                return;
+                        }
+
+                }
+
                 printf("%-40s\t%llu\n", de->name, (long long) de->s.size);
-        else if (de->s.is_directory)
+        } else if (!ls.single_column && de->s.is_directory)
                 printf("%-40s\t<dir>\n", de->name);
         else
@@ -364 +386 @@
 
         while (c != -1) {
-                c = getopt_long(argc, argv, "hur", long_options, &opt_ind);
+                c = getopt_long(argc, argv, "hurw1", long_options, &opt_ind);
                 switch (c) {
                 case 'h':
@@ -374 +396 @@
                 case 'r':
                         ls.recursive = 1;
+                        break;
+                case 'w':
+                        ls.well_formatted = true;
+                        break;
+                case '1':
+                        ls.single_column = true;
                         break;
                 }

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

@@ -14 +14 @@
         unsigned int sort;
 
+        bool single_column;
+        bool well_formatted;
 } ls_job_t;