Changeset 234e39e in mainline for uspace/app

Timestamp:

2010-01-09T22:12:40Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c4702798

Parents:

40d4c1d (diff), 9245413 (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 mkfile and mkfat.

Location:

uspace/app

Files:

• bdsh/Makefile.build (modified) (1 diff)
• bdsh/cmds/modules/mkfile/entry.h (added)
• bdsh/cmds/modules/mkfile/mkfile.c (added)
• bdsh/cmds/modules/mkfile/mkfile.h (added)
• bdsh/cmds/modules/mkfile/mkfile_def.h (added)
• bdsh/cmds/modules/modules.h (modified) (2 diffs)
• mkfat/Makefile (added)
• mkfat/Makefile.build (added)
• mkfat/Makefile.common (added)
• mkfat/fat.h (added)
• mkfat/mkfat.c (added)

uspace/app/bdsh/Makefile.build

@@ -42 +42 @@
         cmds/modules/help/help.c \
         cmds/modules/mkdir/mkdir.c \
+        cmds/modules/mkfile/mkfile.c \
         cmds/modules/rm/rm.c \
         cmds/modules/bdd/bdd.c \

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"