Changeset 69145dae in mainline

Timestamp:

2008-08-28T02:51:25Z (17 years ago)

Author:

Tim Post <echo@…>

Branches:

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

Children:

88944695

Parents:

79872cd

Message:

pwd should be a module, not a builtin

Location:

uspace/app/bdsh

Files:

• Makefile (modified) (2 diffs)
• cmds/builtins/builtins.h (modified) (1 diff)
• cmds/modules/modules.h (modified) (2 diffs)
• cmds/modules/pwd/entry.h (moved) (moved from uspace/app/bdsh/cmds/builtins/pwd/entry.h ) (1 diff)
• cmds/modules/pwd/pwd.c (moved) (moved from uspace/app/bdsh/cmds/builtins/pwd/pwd.c ) (1 diff)
• cmds/modules/pwd/pwd.def (moved) (moved from uspace/app/bdsh/cmds/builtins/pwd/pwd.def )
• cmds/modules/pwd/pwd.h (moved) (moved from uspace/app/bdsh/cmds/builtins/pwd/pwd.h )

uspace/app/bdsh/Makefile

@@ -64 +64 @@
         cmds/modules/touch/ \
         cmds/modules/ls/ \
+        cmds/modules/pwd/ \
         cmds/builtins/ \
-        cmds/builtins/pwd/ \
         cmds/builtins/cd/ \
         lib/
@@ -77 +77 @@
         cmds/modules/touch/touch.c \
         cmds/modules/ls/ls.c \
-        cmds/builtins/pwd/pwd.c \
+        cmds/modules/pwd/pwd.c \
         cmds/builtins/cd/cd.c \
         cmds/mod_cmds.c \

uspace/app/bdsh/cmds/builtins/builtins.h

@@ -4 +4 @@
 #include "config.h"
 
-#include "pwd/entry.h"
 #include "cd/entry.h"
 
 builtin_t builtins[] = {
-#include "pwd/pwd.def"
 #include "cd/cd.def"
         {NULL, NULL, NULL, NULL}

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

@@ -25 +25 @@
 #include "touch/entry.h"
 #include "ls/entry.h"
+#include "pwd/entry.h"
 
 /* Each .def function fills the module_t struct with the individual name, entry
@@ -38 +39 @@
 #include "touch/touch.def"
 #include "ls/ls.def"
+#include "pwd/pwd.def"
         {NULL, NULL, NULL, NULL}
 };

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

@@ -6 +6 @@
 /* Entry points for the pwd command */
 extern void * help_cmd_pwd(unsigned int);
-extern int * cmd_pwd(char *[], cliuser_t *);
+extern int * cmd_pwd(char **);
 
 #endif

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

@@ -45 +45 @@
         return CMD_VOID;
 }
-        
-int * cmd_pwd(char *argv[], cliuser_t *usr)
+
+int * cmd_pwd(char *argv[])
 {
         char *buff;