Index: uspace/app/bdsh/Makefile =================================================================== --- uspace/app/bdsh/Makefile (revision 491af0758837101e936eb4ead9f4b1ab22a80ead) +++ uspace/app/bdsh/Makefile (revision 721d3a27f5f7351210d6241085eda2bc4ef374bf) @@ -58,5 +58,4 @@ cmds/modules/ \ cmds/modules/help/ \ - cmds/modules/quit/ \ cmds/modules/mkdir/ \ cmds/modules/rm/ \ @@ -68,9 +67,9 @@ 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,4 +80,5 @@ cmds/modules/sleep/sleep.c \ cmds/modules/cp/cp.c \ + cmds/builtins/exit/exit.c \ cmds/builtins/cd/cd.c \ cmds/mod_cmds.c \ Index: uspace/app/bdsh/cmds/builtins/builtins.h =================================================================== --- uspace/app/bdsh/cmds/builtins/builtins.h (revision 491af0758837101e936eb4ead9f4b1ab22a80ead) +++ uspace/app/bdsh/cmds/builtins/builtins.h (revision 721d3a27f5f7351210d6241085eda2bc4ef374bf) @@ -5,7 +5,9 @@ #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} }; Index: uspace/app/bdsh/cmds/builtins/exit/entry.h =================================================================== --- uspace/app/bdsh/cmds/builtins/exit/entry.h (revision 721d3a27f5f7351210d6241085eda2bc4ef374bf) +++ uspace/app/bdsh/cmds/builtins/exit/entry.h (revision 721d3a27f5f7351210d6241085eda2bc4ef374bf) @@ -0,0 +1,12 @@ +#ifndef EXIT_ENTRY_H_ +#define EXIT_ENTRY_H_ + +#include "scli.h" + +/* Entry points for the quit command */ +extern void help_cmd_exit(unsigned int); +extern int cmd_exit(char *[], cliuser_t *); + +#endif + + Index: uspace/app/bdsh/cmds/builtins/exit/exit.c =================================================================== --- uspace/app/bdsh/cmds/builtins/exit/exit.c (revision 721d3a27f5f7351210d6241085eda2bc4ef374bf) +++ uspace/app/bdsh/cmds/builtins/exit/exit.c (revision 721d3a27f5f7351210d6241085eda2bc4ef374bf) @@ -0,0 +1,55 @@ +/* Copyright (c) 2008, Tim Post + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * Neither the name of the original program's authors nor the names of its + * contributors may be used to endorse or promote products derived from this + * software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#include +#include "entry.h" +#include "exit.h" +#include "cmds.h" + +static const char *cmdname = "exit"; + +extern volatile unsigned int cli_quit; +extern const char *progname; + +void help_cmd_exit(unsigned int level) +{ + printf("Type `%s' to exit %s\n", cmdname, progname); + return; +} + +/* Quits the program and returns the status of whatever command + * came before invoking 'quit' */ +int cmd_exit(char *argv[], cliuser_t *usr) +{ + /* Inform that we're outta here */ + cli_quit = 1; + return CMD_SUCCESS; +} Index: uspace/app/bdsh/cmds/builtins/exit/exit.h =================================================================== --- uspace/app/bdsh/cmds/builtins/exit/exit.h (revision 721d3a27f5f7351210d6241085eda2bc4ef374bf) +++ uspace/app/bdsh/cmds/builtins/exit/exit.h (revision 721d3a27f5f7351210d6241085eda2bc4ef374bf) @@ -0,0 +1,6 @@ +#ifndef EXIT_H +#define EXIT_H + +/* Prototypes for the quit command (excluding entry points) */ + +#endif Index: uspace/app/bdsh/cmds/builtins/exit/exit_def.h =================================================================== --- uspace/app/bdsh/cmds/builtins/exit/exit_def.h (revision 721d3a27f5f7351210d6241085eda2bc4ef374bf) +++ uspace/app/bdsh/cmds/builtins/exit/exit_def.h (revision 721d3a27f5f7351210d6241085eda2bc4ef374bf) @@ -0,0 +1,6 @@ +{ + "exit", + "Exit the shell", + &cmd_exit, + &help_cmd_exit, +}, Index: uspace/app/bdsh/cmds/modules/modules.h =================================================================== --- uspace/app/bdsh/cmds/modules/modules.h (revision 491af0758837101e936eb4ead9f4b1ab22a80ead) +++ uspace/app/bdsh/cmds/modules/modules.h (revision 721d3a27f5f7351210d6241085eda2bc4ef374bf) @@ -19,5 +19,4 @@ #include "help/entry.h" -#include "quit/entry.h" #include "mkdir/entry.h" #include "rm/entry.h" @@ -35,5 +34,4 @@ module_t modules[] = { #include "help/help_def.h" -#include "quit/quit_def.h" #include "mkdir/mkdir_def.h" #include "rm/rm_def.h" Index: uspace/app/bdsh/cmds/modules/quit/entry.h =================================================================== --- uspace/app/bdsh/cmds/modules/quit/entry.h (revision 491af0758837101e936eb4ead9f4b1ab22a80ead) +++ (revision ) @@ -1,10 +1,0 @@ -#ifndef QUIT_ENTRY_H_ -#define QUIT_ENTRY_H_ - -/* Entry points for the quit command */ -extern void help_cmd_quit(unsigned int); -extern int cmd_quit(char *[]); - -#endif - - Index: uspace/app/bdsh/cmds/modules/quit/quit.c =================================================================== --- uspace/app/bdsh/cmds/modules/quit/quit.c (revision 491af0758837101e936eb4ead9f4b1ab22a80ead) +++ (revision ) @@ -1,55 +1,0 @@ -/* Copyright (c) 2008, Tim Post - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * Neither the name of the original program's authors nor the names of its - * contributors may be used to endorse or promote products derived from this - * software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#include -#include -#include "entry.h" -#include "quit.h" -#include "cmds.h" - -static char *cmdname = "exit"; - -extern volatile unsigned int cli_quit; -extern const char *progname; - -void help_cmd_quit(unsigned int level) -{ - printf("Type `%s' to exit %s\n", cmdname, progname); - return; -} - -/* Quits the program and returns the status of whatever command - * came before invoking 'quit' */ -int cmd_quit(char *argv[]) -{ - /* Inform that we're outta here */ - cli_quit = 1; - return CMD_SUCCESS; -} Index: uspace/app/bdsh/cmds/modules/quit/quit.h =================================================================== --- uspace/app/bdsh/cmds/modules/quit/quit.h (revision 491af0758837101e936eb4ead9f4b1ab22a80ead) +++ (revision ) @@ -1,6 +1,0 @@ -#ifndef QUIT_H -#define QUIT_H - -/* Prototypes for the quit command (excluding entry points) */ - -#endif Index: uspace/app/bdsh/cmds/modules/quit/quit_def.h =================================================================== --- uspace/app/bdsh/cmds/modules/quit/quit_def.h (revision 491af0758837101e936eb4ead9f4b1ab22a80ead) +++ (revision ) @@ -1,6 +1,0 @@ -{ - "exit", - "Exit the shell", - &cmd_quit, - &help_cmd_quit, -},