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

File:

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

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

@@ -42 +42 @@
 #include <vfs/vfs.h>
 #include <str.h>
-#include <cap.h>
+#include <capa.h>
 
 #include "ls.h"
@@ -106 +106 @@
                 }
 
-                cap_spec_t cap;
-                cap_from_blocks(de->s.size, 1, &cap);
-                cap_simplify(&cap);
+                capa_spec_t capa;
+                capa_from_blocks(de->s.size, 1, &capa);
+                capa_simplify(&capa);
 
                 char *rptr;
-                errno_t rc = cap_format(&cap, &rptr);
+                errno_t rc = capa_format(&capa, &rptr);
                 if (rc != EOK) {
                         return rc;
@@ -267 +267 @@
 
         /* 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));