Index: uspace/app/bdsh/cmds/modules/ls/ls.c =================================================================== --- uspace/app/bdsh/cmds/modules/ls/ls.c (revision c878693123930f0906703462cf2807430679517e) +++ uspace/app/bdsh/cmds/modules/ls/ls.c (revision 04c0fc5aa45ec90f84d2ef0b8b067f698c6f5f0e) @@ -267,5 +267,5 @@ /* Populate the directory list. */ - if (ls.recursive) { + if (ls.recursive && nbdirs > 0) { tmp = (struct dir_elem_t *) realloc(*dir_list_ptr, nbdirs * sizeof(struct dir_elem_t)); Index: uspace/app/bdsh/cmds/modules/module_aliases.c =================================================================== --- uspace/app/bdsh/cmds/modules/module_aliases.c (revision 04c0fc5aa45ec90f84d2ef0b8b067f698c6f5f0e) +++ uspace/app/bdsh/cmds/modules/module_aliases.c (revision 04c0fc5aa45ec90f84d2ef0b8b067f698c6f5f0e) @@ -0,0 +1,50 @@ +/* + * 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. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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 "module_aliases.h" + +/* + * Modules that declare multiple names for themselves but use the + * same entry functions are aliases. This array helps to determine if + * a module is an alias, as such it can be invoked differently. + * format is alias , real_name + */ + +/* + * So far, this is only used in the help display but could be used to + * handle a module differently even prior to reaching its entry code. + * For instance, 'exit' could behave differently than 'quit', prior to + * the entry point being reached. + */ + +const char *mod_aliases[] = { + "ren", "mv", + "umount", "unmount", + NULL, NULL +}; Index: uspace/app/bdsh/cmds/modules/module_aliases.h =================================================================== --- uspace/app/bdsh/cmds/modules/module_aliases.h (revision c878693123930f0906703462cf2807430679517e) +++ uspace/app/bdsh/cmds/modules/module_aliases.h (revision 04c0fc5aa45ec90f84d2ef0b8b067f698c6f5f0e) @@ -30,23 +30,5 @@ #define MODULE_ALIASES_H -/* - * Modules that declare multiple names for themselves but use the - * same entry functions are aliases. This array helps to determine if - * a module is an alias, as such it can be invoked differently. - * format is alias , real_name - */ - -/* - * So far, this is only used in the help display but could be used to - * handle a module differently even prior to reaching its entry code. - * For instance, 'exit' could behave differently than 'quit', prior to - * the entry point being reached. - */ - -const char *mod_aliases[] = { - "ren", "mv", - "umount", "unmount", - NULL, NULL -}; +extern const char *mod_aliases[]; #endif Index: uspace/app/bdsh/cmds/modules/modules.c =================================================================== --- uspace/app/bdsh/cmds/modules/modules.c (revision 04c0fc5aa45ec90f84d2ef0b8b067f698c6f5f0e) +++ uspace/app/bdsh/cmds/modules/modules.c (revision 04c0fc5aa45ec90f84d2ef0b8b067f698c6f5f0e) @@ -0,0 +1,92 @@ +/* + * 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. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. + */ + +/* + * Each built in function has two files, one being an entry.h file which + * prototypes the run/help entry functions, the other being a .def file + * which fills the modules[] array according to the cmd_t structure + * defined in cmds.h. + * + * To add or remove a module, just make a new directory in cmds/modules + * for it and copy the 'show' example for basics, then include it here. + * (or reverse the process to remove one) + * + * NOTE: See module_ aliases.h as well, this is where aliases (commands that + * share an entry point with others) are indexed + */ + +#include "config.h" +#include "modules.h" + +/* Prototypes for each module's entry (help/exec) points */ + +#include "help/entry.h" +#include "mkdir/entry.h" +#include "mkfile/entry.h" +#include "rm/entry.h" +#include "cat/entry.h" +#include "touch/entry.h" +#include "ls/entry.h" +#include "pwd/entry.h" +#include "sleep/entry.h" +#include "cp/entry.h" +#include "mv/entry.h" +#include "mount/entry.h" +#include "unmount/entry.h" +#include "kcon/entry.h" +#include "printf/entry.h" +#include "echo/entry.h" +#include "cmp/entry.h" + +/* + * Each .def function fills the module_t struct with the individual name, entry + * point, help entry point, etc. You can use config.h to control what modules + * are loaded based on what libraries exist on the system. + */ + +module_t modules[] = { +#include "help/help_def.inc" +#include "mkdir/mkdir_def.inc" +#include "mkfile/mkfile_def.inc" +#include "rm/rm_def.inc" +#include "cat/cat_def.inc" +#include "touch/touch_def.inc" +#include "ls/ls_def.inc" +#include "pwd/pwd_def.inc" +#include "sleep/sleep_def.inc" +#include "cp/cp_def.inc" +#include "mv/mv_def.inc" +#include "mount/mount_def.inc" +#include "unmount/unmount_def.inc" +#include "kcon/kcon_def.inc" +#include "printf/printf_def.inc" +#include "echo/echo_def.inc" +#include "cmp/cmp_def.inc" + + { NULL, NULL, NULL, NULL } +}; Index: uspace/app/bdsh/cmds/modules/modules.h =================================================================== --- uspace/app/bdsh/cmds/modules/modules.h (revision c878693123930f0906703462cf2807430679517e) +++ uspace/app/bdsh/cmds/modules/modules.h (revision 04c0fc5aa45ec90f84d2ef0b8b067f698c6f5f0e) @@ -30,67 +30,8 @@ #define MODULES_H -/* - * Each built in function has two files, one being an entry.h file which - * prototypes the run/help entry functions, the other being a .def file - * which fills the modules[] array according to the cmd_t structure - * defined in cmds.h. - * - * To add or remove a module, just make a new directory in cmds/modules - * for it and copy the 'show' example for basics, then include it here. - * (or reverse the process to remove one) - * - * NOTE: See module_ aliases.h as well, this is where aliases (commands that - * share an entry point with others) are indexed - */ +#include "../cmds.h" +#include "modules.h" -#include "config.h" - -/* Prototypes for each module's entry (help/exec) points */ - -#include "help/entry.h" -#include "mkdir/entry.h" -#include "mkfile/entry.h" -#include "rm/entry.h" -#include "cat/entry.h" -#include "touch/entry.h" -#include "ls/entry.h" -#include "pwd/entry.h" -#include "sleep/entry.h" -#include "cp/entry.h" -#include "mv/entry.h" -#include "mount/entry.h" -#include "unmount/entry.h" -#include "kcon/entry.h" -#include "printf/entry.h" -#include "echo/entry.h" -#include "cmp/entry.h" - -/* - * Each .def function fills the module_t struct with the individual name, entry - * point, help entry point, etc. You can use config.h to control what modules - * are loaded based on what libraries exist on the system. - */ - -module_t modules[] = { -#include "help/help_def.inc" -#include "mkdir/mkdir_def.inc" -#include "mkfile/mkfile_def.inc" -#include "rm/rm_def.inc" -#include "cat/cat_def.inc" -#include "touch/touch_def.inc" -#include "ls/ls_def.inc" -#include "pwd/pwd_def.inc" -#include "sleep/sleep_def.inc" -#include "cp/cp_def.inc" -#include "mv/mv_def.inc" -#include "mount/mount_def.inc" -#include "unmount/unmount_def.inc" -#include "kcon/kcon_def.inc" -#include "printf/printf_def.inc" -#include "echo/echo_def.inc" -#include "cmp/cmp_def.inc" - - { NULL, NULL, NULL, NULL } -}; +extern module_t modules[]; #endif Index: uspace/app/bdsh/cmds/modules/sleep/sleep.c =================================================================== --- uspace/app/bdsh/cmds/modules/sleep/sleep.c (revision c878693123930f0906703462cf2807430679517e) +++ uspace/app/bdsh/cmds/modules/sleep/sleep.c (revision 04c0fc5aa45ec90f84d2ef0b8b067f698c6f5f0e) @@ -27,6 +27,6 @@ */ -#include #include +#include #include #include