Changeset 5f70118 in mainline for uspace/app/bdsh/cmds/modules

Timestamp:

2010-01-10T12:16:59Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c77a64f

Parents:

309ede1 (diff), 1ac3a52 (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.

Location:

uspace/app/bdsh/cmds/modules

Files:

• ls/ls.c (modified) (1 diff)
• mkfile/entry.h (added)
• mkfile/mkfile.c (added)
• mkfile/mkfile.h (added)
• mkfile/mkfile_def.h (added)
• modules.h (modified) (2 diffs)

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

@@ -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);

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

@@ -20 +20 @@
 #include "help/entry.h"
 #include "mkdir/entry.h"
+#include "mkfile/entry.h"
 #include "rm/entry.h"
 #include "bdd/entry.h"
@@ -39 +40 @@
 #include "help/help_def.h"
 #include "mkdir/mkdir_def.h"
+#include "mkfile/mkfile_def.h"
 #include "rm/rm_def.h"
 #include "bdd/bdd_def.h"