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

Timestamp:

2019-01-03T06:53:22Z (5 years ago)

Author:

Vojtech Horky <vojtech.horky@…>

Branches:

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

Children:

043d464f

Parents:

b4a4ad94 (diff), 7acd787 (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 upstream changes

File:

• uspace/app/bdsh/cmds/modules/ls/ls.c (modified) (1 diff)

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

@@ -199 +199 @@
 
         /* 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));