Changeset 721d3a27 in mainline

Timestamp:

2009-01-22T07:39:43Z (16 years ago)

Author:

Tim Post <echo@…>

Branches:

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

Children:

fc11b8a

Parents:

491af07

Message:

exit should be a builtin, since it will eventually need to know about running jobs

Location:

uspace/app/bdsh

Files:

• Makefile (modified) (3 diffs)
• cmds/builtins/builtins.h (modified) (1 diff)
• cmds/builtins/exit/entry.h (added)
• cmds/builtins/exit/exit.c (moved) (moved from uspace/app/bdsh/cmds/modules/quit/quit.c ) (2 diffs)
• cmds/builtins/exit/exit.h (moved) (moved from uspace/app/bdsh/cmds/modules/quit/quit.h ) (1 diff)
• cmds/builtins/exit/exit_def.h (moved) (moved from uspace/app/bdsh/cmds/modules/quit/quit_def.h ) (1 diff)
• cmds/modules/modules.h (modified) (2 diffs)
• cmds/modules/quit/entry.h (deleted)

uspace/app/bdsh/Makefile

@@ -58 +58 @@
         cmds/modules/ \
         cmds/modules/help/ \
-        cmds/modules/quit/ \
         cmds/modules/mkdir/ \
         cmds/modules/rm/ \
@@ -68 +67 @@
         cmds/modules/cp/ \
         cmds/builtins/ \
+        cmds/builtins/exit/\
         cmds/builtins/cd/
 
 SOURCES = \
         cmds/modules/help/help.c \
-        cmds/modules/quit/quit.c \
         cmds/modules/mkdir/mkdir.c \
         cmds/modules/rm/rm.c \
@@ -81 +80 @@
         cmds/modules/sleep/sleep.c \
         cmds/modules/cp/cp.c \
+        cmds/builtins/exit/exit.c \
         cmds/builtins/cd/cd.c \
         cmds/mod_cmds.c \

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

@@ -5 +5 @@
 
 #include "cd/entry.h"
+#include "exit/entry.h"
 
 builtin_t builtins[] = {
 #include "cd/cd_def.h"
+#include "exit/exit_def.h"
         {NULL, NULL, NULL, NULL}
 };

uspace/app/bdsh/cmds/builtins/exit/exit.c

@@ -32 +32 @@
 #include <stdlib.h>
 #include "entry.h"
-#include "quit.h"
+#include "exit.h"
 #include "cmds.h"
 
-static char *cmdname = "exit";
+static const char *cmdname = "exit";
 
 extern volatile unsigned int cli_quit;
 extern const char *progname;
 
-void help_cmd_quit(unsigned int level)
+void help_cmd_exit(unsigned int level)
 {
         printf("Type `%s' to exit %s\n", cmdname, progname);
@@ -48 +48 @@
 /* Quits the program and returns the status of whatever command
  * came before invoking 'quit' */
-int cmd_quit(char *argv[])
+int cmd_exit(char *argv[], cliuser_t *usr)
 {
         /* Inform that we're outta here */

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

@@ -1 @@
-#ifndef QUIT_H
-#define QUIT_H
+#ifndef EXIT_H
+#define EXIT_H
 
 /* Prototypes for the quit command (excluding entry points) */

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

@@ -2 +2 @@
         "exit",
         "Exit the shell",
-        &cmd_quit,
-        &help_cmd_quit,
+        &cmd_exit,
+        &help_cmd_exit,
 },

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

@@ -19 +19 @@
 
 #include "help/entry.h"
-#include "quit/entry.h"
 #include "mkdir/entry.h"
 #include "rm/entry.h"
@@ -35 +34 @@
 module_t modules[] = {
 #include "help/help_def.h"
-#include "quit/quit_def.h"
 #include "mkdir/mkdir_def.h"
 #include "rm/rm_def.h"