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

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 mainline changes (needs fixes).

File:

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

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

@@ -40 +40 @@
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <string.h>
+#include <str.h>
 
 #include "errors.h"
@@ -49 +49 @@
 #include "cmds.h"
 
-static char *cmdname = "ls";
+static const char *cmdname = "ls";
 
 static void ls_scan_dir(const char *d, DIR *dirp)
@@ -100 +100 @@
         if (s.is_file)
                 printf("%-40s\t%llu\n", name, (long long) s.size);
+        else if (s.is_directory)
+                printf("%-40s\t<dir>\n", name);
         else
                 printf("%-40s\n", name);