Changeset d9f53877 in mainline

Timestamp:

2012-04-08T11:53:23Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

90924df

Parents:

81475250 (diff), 9d58539 (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 bdsh/echo and bdsh/printf (thx Alex Prutkov)

Location:

uspace/app/bdsh

Files:

• Makefile (modified) (1 diff)
• TODO (modified) (1 diff)
• cmds/modules/echo/echo.c (added)
• cmds/modules/echo/echo.h (added)
• cmds/modules/echo/echo_def.h (added)
• cmds/modules/echo/entry.h (added)
• cmds/modules/modules.h (modified) (2 diffs)
• cmds/modules/printf/TODO (added)
• cmds/modules/printf/entry.h (added)
• cmds/modules/printf/printf.c (added)
• cmds/modules/printf/printf.h (added)
• cmds/modules/printf/printf_def.h (added)

uspace/app/bdsh/Makefile

@@ -48 +48 @@
         cmds/modules/cp/cp.c \
         cmds/modules/mv/mv.c \
+        cmds/modules/printf/printf.c \
+        cmds/modules/echo/echo.c \
         cmds/modules/mount/mount.c \
         cmds/modules/unmount/unmount.c \

uspace/app/bdsh/TODO

@@ -30 +30 @@
 * Add wrappers for signal, sigaction to make ports to modules easier
 
-* Add 'echo' and 'printf' modules.
-
 Regarding POSIX:
 ----------------

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

@@ -61 +61 @@
 #include "unmount/entry.h"
 #include "kcon/entry.h"
+#include "printf/entry.h"
+#include "echo/entry.h"
 
 /* Each .def function fills the module_t struct with the individual name, entry
@@ -82 +84 @@
 #include "unmount/unmount_def.h"
 #include "kcon/kcon_def.h"
+#include "printf/printf_def.h"
+#include "echo/echo_def.h"
 
         {NULL, NULL, NULL, NULL}