Index: uspace/app/bdsh/Makefile =================================================================== --- uspace/app/bdsh/Makefile (revision 79872cd42e49e046628c77564cd57e01dec61da6) +++ uspace/app/bdsh/Makefile (revision 69145dae045b049d3f508dcd8da43aafe18f8710) @@ -64,6 +64,6 @@ cmds/modules/touch/ \ cmds/modules/ls/ \ + cmds/modules/pwd/ \ cmds/builtins/ \ - cmds/builtins/pwd/ \ cmds/builtins/cd/ \ lib/ @@ -77,5 +77,5 @@ 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 \ Index: uspace/app/bdsh/cmds/builtins/builtins.h =================================================================== --- uspace/app/bdsh/cmds/builtins/builtins.h (revision 79872cd42e49e046628c77564cd57e01dec61da6) +++ uspace/app/bdsh/cmds/builtins/builtins.h (revision 69145dae045b049d3f508dcd8da43aafe18f8710) @@ -4,9 +4,7 @@ #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} Index: pace/app/bdsh/cmds/builtins/pwd/entry.h =================================================================== --- uspace/app/bdsh/cmds/builtins/pwd/entry.h (revision 79872cd42e49e046628c77564cd57e01dec61da6) +++ (revision ) @@ -1,12 +1,0 @@ -#ifndef PWD_ENTRY_H -#define PWD_ENTRY_H - -#include "scli.h" - -/* Entry points for the pwd command */ -extern void * help_cmd_pwd(unsigned int); -extern int * cmd_pwd(char *[], cliuser_t *); - -#endif - - Index: pace/app/bdsh/cmds/builtins/pwd/pwd.c =================================================================== --- uspace/app/bdsh/cmds/builtins/pwd/pwd.c (revision 79872cd42e49e046628c77564cd57e01dec61da6) +++ (revision ) @@ -1,71 +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 "config.h" -#include "errors.h" -#include "entry.h" -#include "cmds.h" -#include "pwd.h" - -static char * cmdname = "pwd"; - -void * help_cmd_pwd(unsigned int level) -{ - printf("`%s' prints your current working directory.\n", cmdname); - return CMD_VOID; -} - -int * cmd_pwd(char *argv[], cliuser_t *usr) -{ - char *buff; - - buff = (char *) malloc(PATH_MAX); - if (NULL == buff) { - cli_error(CL_ENOMEM, "%s:", cmdname); - return CMD_FAILURE; - } - - memset(buff, 0, sizeof(buff)); - getcwd(buff, PATH_MAX); - - if (! buff) { - cli_error(CL_EFAIL, - "Unable to determine the current working directory"); - free(buff); - return CMD_FAILURE; - } else { - printf("%s\n", buff); - free(buff); - return CMD_SUCCESS; - } -} Index: pace/app/bdsh/cmds/builtins/pwd/pwd.def =================================================================== --- uspace/app/bdsh/cmds/builtins/pwd/pwd.def (revision 79872cd42e49e046628c77564cd57e01dec61da6) +++ (revision ) @@ -1,7 +1,0 @@ -{ - "pwd", - "Prints the current working directory", - &cmd_pwd, - &help_cmd_pwd, - -1 -}, Index: pace/app/bdsh/cmds/builtins/pwd/pwd.h =================================================================== --- uspace/app/bdsh/cmds/builtins/pwd/pwd.h (revision 79872cd42e49e046628c77564cd57e01dec61da6) +++ (revision ) @@ -1,6 +1,0 @@ -#ifndef PWD_H_ -#define PWD_H_ - -/* Prototypes for the pwd command (excluding entry points) */ - -#endif Index: uspace/app/bdsh/cmds/modules/modules.h =================================================================== --- uspace/app/bdsh/cmds/modules/modules.h (revision 79872cd42e49e046628c77564cd57e01dec61da6) +++ uspace/app/bdsh/cmds/modules/modules.h (revision 69145dae045b049d3f508dcd8da43aafe18f8710) @@ -25,4 +25,5 @@ #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,4 +39,5 @@ #include "touch/touch.def" #include "ls/ls.def" +#include "pwd/pwd.def" {NULL, NULL, NULL, NULL} }; Index: uspace/app/bdsh/cmds/modules/pwd/entry.h =================================================================== --- uspace/app/bdsh/cmds/modules/pwd/entry.h (revision 69145dae045b049d3f508dcd8da43aafe18f8710) +++ uspace/app/bdsh/cmds/modules/pwd/entry.h (revision 69145dae045b049d3f508dcd8da43aafe18f8710) @@ -0,0 +1,12 @@ +#ifndef PWD_ENTRY_H +#define PWD_ENTRY_H + +#include "scli.h" + +/* Entry points for the pwd command */ +extern void * help_cmd_pwd(unsigned int); +extern int * cmd_pwd(char **); + +#endif + + Index: uspace/app/bdsh/cmds/modules/pwd/pwd.c =================================================================== --- uspace/app/bdsh/cmds/modules/pwd/pwd.c (revision 69145dae045b049d3f508dcd8da43aafe18f8710) +++ uspace/app/bdsh/cmds/modules/pwd/pwd.c (revision 69145dae045b049d3f508dcd8da43aafe18f8710) @@ -0,0 +1,71 @@ +/* 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 "config.h" +#include "errors.h" +#include "entry.h" +#include "cmds.h" +#include "pwd.h" + +static char * cmdname = "pwd"; + +void * help_cmd_pwd(unsigned int level) +{ + printf("`%s' prints your current working directory.\n", cmdname); + return CMD_VOID; +} + +int * cmd_pwd(char *argv[]) +{ + char *buff; + + buff = (char *) malloc(PATH_MAX); + if (NULL == buff) { + cli_error(CL_ENOMEM, "%s:", cmdname); + return CMD_FAILURE; + } + + memset(buff, 0, sizeof(buff)); + getcwd(buff, PATH_MAX); + + if (! buff) { + cli_error(CL_EFAIL, + "Unable to determine the current working directory"); + free(buff); + return CMD_FAILURE; + } else { + printf("%s\n", buff); + free(buff); + return CMD_SUCCESS; + } +} Index: uspace/app/bdsh/cmds/modules/pwd/pwd.def =================================================================== --- uspace/app/bdsh/cmds/modules/pwd/pwd.def (revision 69145dae045b049d3f508dcd8da43aafe18f8710) +++ uspace/app/bdsh/cmds/modules/pwd/pwd.def (revision 69145dae045b049d3f508dcd8da43aafe18f8710) @@ -0,0 +1,7 @@ +{ + "pwd", + "Prints the current working directory", + &cmd_pwd, + &help_cmd_pwd, + -1 +}, Index: uspace/app/bdsh/cmds/modules/pwd/pwd.h =================================================================== --- uspace/app/bdsh/cmds/modules/pwd/pwd.h (revision 69145dae045b049d3f508dcd8da43aafe18f8710) +++ uspace/app/bdsh/cmds/modules/pwd/pwd.h (revision 69145dae045b049d3f508dcd8da43aafe18f8710) @@ -0,0 +1,6 @@ +#ifndef PWD_H_ +#define PWD_H_ + +/* Prototypes for the pwd command (excluding entry points) */ + +#endif