diff options
author | Chris Johns <chrisj@rtems.org> | 2007-12-17 00:12:01 +0000 |
---|---|---|
committer | Chris Johns <chrisj@rtems.org> | 2007-12-17 00:12:01 +0000 |
commit | 2eeb648c35eef0a378470f3cca523963978ffd09 (patch) | |
tree | 1c9ad13fdbf0117c6c953979da82cad8daf48d76 /cpukit/libmisc/shell/shellconfig.h | |
parent | 2007-12-16 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
download | rtems-2eeb648c35eef0a378470f3cca523963978ffd09.tar.bz2 |
2007-12-17 Chris Johns <chrisj@rtems.org>
* libnetworking/rtems/tftp.h: Provide a decl to the TFTP file
system opts table.
* libnetworking/rtems/ftpfs.h: Provide a decl to the FTP file
system opts table.
* libmisc/Makefile.am: Add the mount command and supporting files.
* libmisc/preinstall.am: Rebuilt.
* libmisc/shell/cat_file.c, libmisc/shell/cmds.c,
libmisc/shell/main_alias.c, libmisc/shell/main_cat.c,
libmisc/shell/main_cd.c, libmisc/shell/main_chdir.c,
libmisc/shell/main_chmod.c, libmisc/shell/main_chroot.c,
libmisc/shell/main_cpuuse.c, libmisc/shell/main_date.c,
libmisc/shell/main_dir.c, libmisc/shell/main_exit.c,
libmisc/shell/main_help.c, libmisc/shell/main_id.c,
libmisc/shell/main_logoff.c, libmisc/shell/main_ls.c,
libmisc/shell/main_mallocdump.c, libmisc/shell/main_mdump.c,
libmisc/shell/main_medit.c, libmisc/shell/main_mfill.c,
libmisc/shell/main_mkdir.c, libmisc/shell/main_mmove.c,
libmisc/shell/main_mwdump.c, libmisc/shell/main_pwd.c,
libmisc/shell/main_rm.c, libmisc/shell/main_rmdir.c,
libmisc/shell/main_stackuse.c, libmisc/shell/main_tty.c,
libmisc/shell/main_umask.c, libmisc/shell/main_whoami.c,
libmisc/shell/shell.c, libmisc/shell/shell_cmdset.c,
libmisc/shell/shell_makeargs.c, libmisc/shell/str2int.c,
libmisc/shell/write_file.c: Move all shell_* types, variables and
functions to rtems_shell_* to avoid namespace clashes with
applications. The is an RTEMS shell after all.
* libmisc/shell/shell.h, libmisc/shell/internal.h,
libmisc/shell/shellconfig.h: Move all shell_* types, variables and
functions to rtems_shell_* to avoid namespace clashes with
applications. Add the mount command supporting types.
* libmisc/shell/main_mount.c, libmisc/shell/main_mount_ftp.c,
libmisc/shell/main_mount_msdos.c, libmisc/shell/main_mount_nfs.c,
libmisc/shell/main_mount_tftp.c: New.
Diffstat (limited to '')
-rw-r--r-- | cpukit/libmisc/shell/shellconfig.h | 263 |
1 files changed, 165 insertions, 98 deletions
diff --git a/cpukit/libmisc/shell/shellconfig.h b/cpukit/libmisc/shell/shellconfig.h index e692fdd57c..21d90f732c 100644 --- a/cpukit/libmisc/shell/shellconfig.h +++ b/cpukit/libmisc/shell/shellconfig.h @@ -19,47 +19,57 @@ /* * Externs for all command definition structures */ -extern shell_cmd_t Shell_HELP_Command; -extern shell_cmd_t Shell_ALIAS_Command; -extern shell_cmd_t Shell_LOGOFF_Command; - -extern shell_cmd_t Shell_MDUMP_Command; -extern shell_cmd_t Shell_WDUMP_Command; -extern shell_cmd_t Shell_MEDIT_Command; -extern shell_cmd_t Shell_MFILL_Command; -extern shell_cmd_t Shell_MMOVE_Command; - -extern shell_cmd_t Shell_DATE_Command; -extern shell_cmd_t Shell_ID_Command; -extern shell_cmd_t Shell_TTY_Command; -extern shell_cmd_t Shell_WHOAMI_Command; - -extern shell_cmd_t Shell_PWD_Command; -extern shell_cmd_t Shell_LS_Command; -extern shell_cmd_t Shell_CHDIR_Command; -extern shell_cmd_t Shell_MKDIR_Command; -extern shell_cmd_t Shell_RMDIR_Command; -extern shell_cmd_t Shell_CHROOT_Command; -extern shell_cmd_t Shell_CHMOD_Command; -extern shell_cmd_t Shell_CAT_Command; -extern shell_cmd_t Shell_RM_Command; -extern shell_cmd_t Shell_UMASK_Command; - -extern shell_cmd_t Shell_CPUUSE_Command; -extern shell_cmd_t Shell_STACKUSE_Command; - -extern shell_cmd_t Shell_MALLOC_DUMP_Command; - -extern shell_cmd_t *Shell_Initial_commands[]; +extern rtems_shell_cmd_t rtems_Shell_HELP_Command; +extern rtems_shell_cmd_t rtems_Shell_ALIAS_Command; +extern rtems_shell_cmd_t rtems_Shell_LOGOFF_Command; + +extern rtems_shell_cmd_t rtems_Shell_MDUMP_Command; +extern rtems_shell_cmd_t rtems_Shell_WDUMP_Command; +extern rtems_shell_cmd_t rtems_Shell_MEDIT_Command; +extern rtems_shell_cmd_t rtems_Shell_MFILL_Command; +extern rtems_shell_cmd_t rtems_Shell_MMOVE_Command; + +extern rtems_shell_cmd_t rtems_Shell_DATE_Command; +extern rtems_shell_cmd_t rtems_Shell_ID_Command; +extern rtems_shell_cmd_t rtems_Shell_TTY_Command; +extern rtems_shell_cmd_t rtems_Shell_WHOAMI_Command; + +extern rtems_shell_cmd_t rtems_Shell_PWD_Command; +extern rtems_shell_cmd_t rtems_Shell_LS_Command; +extern rtems_shell_cmd_t rtems_Shell_CHDIR_Command; +extern rtems_shell_cmd_t rtems_Shell_MKDIR_Command; +extern rtems_shell_cmd_t rtems_Shell_RMDIR_Command; +extern rtems_shell_cmd_t rtems_Shell_CHROOT_Command; +extern rtems_shell_cmd_t rtems_Shell_CHMOD_Command; +extern rtems_shell_cmd_t rtems_Shell_CAT_Command; +extern rtems_shell_cmd_t rtems_Shell_RM_Command; +extern rtems_shell_cmd_t rtems_Shell_UMASK_Command; +extern rtems_shell_cmd_t rtems_Shell_MOUNT_Command; + +extern rtems_shell_cmd_t rtems_Shell_CPUUSE_Command; +extern rtems_shell_cmd_t rtems_Shell_STACKUSE_Command; +extern rtems_shell_cmd_t rtems_Shell_MALLOC_DUMP_Command; + +extern rtems_shell_cmd_t *rtems_Shell_Initial_commands[]; + +/* + * Extern for alias commands + */ +extern rtems_shell_alias_t rtems_Shell_DIR_Alias; +extern rtems_shell_alias_t rtems_Shell_CD_Alias; +extern rtems_shell_alias_t rtems_Shell_EXIT_Alias; + +extern rtems_shell_alias_t *rtems_Shell_Initial_aliases[]; /* * Extern for alias commands */ -extern shell_alias_t Shell_DIR_Alias; -extern shell_alias_t Shell_CD_Alias; -extern shell_alias_t Shell_EXIT_Alias; +extern rtems_shell_filesystems_t rtems_Shell_Mount_MSDOS; +extern rtems_shell_filesystems_t rtems_Shell_Mount_TFTP; +extern rtems_shell_filesystems_t rtems_Shell_Mount_FTP; +extern rtems_shell_filesystems_t rtems_Shell_Mount_NFS; -extern shell_alias_t *Shell_Initial_aliases[]; +extern rtems_shell_filesystems_t *rtems_Shell_Mount_filesystems[]; /* * If we are configured to alias a command, then make sure the underlying @@ -69,33 +79,36 @@ extern shell_alias_t *Shell_Initial_aliases[]; #if !defined(CONFIGURE_SHELL_COMMANDS_ALL) #if defined(CONFIGURE_SHELL_COMMANDS_DIR) && \ !defined(CONFIGURE_SHELL_COMMANDS_LS) - #define CONFIGURE_SHELL_COMMANDS_LS + #define CONFIGURE_SHELL_COMMAND_LS #endif #if defined(CONFIGURE_SHELL_COMMANDS_CD) && \ !defined(CONFIGURE_SHELL_COMMANDS_CHDIR) - #define CONFIGURE_SHELL_COMMANDS_CHDIR + #define CONFIGURE_SHELL_COMMAND_CHDIR #endif #if defined(CONFIGURE_SHELL_COMMANDS_EXIT) && \ !defined(CONFIGURE_SHELL_COMMANDS_LOGOFF) - #define CONFIGURE_SHELL_COMMANDS_LOGOFF + #define CONFIGURE_SHELL_COMMAND_LOGOFF #endif #endif #if defined(CONFIGURE_SHELL_COMMANDS_INIT) - shell_alias_t *Shell_Initial_aliases[] = { - #if defined(CONFIGURE_SHELL_COMMANDS_ALL) || \ - defined(CONFIGURE_SHELL_COMMANDS_DIR) - &Shell_DIR_Alias, + rtems_shell_alias_t *rtems_Shell_Initial_aliases[] = { + #if (defined(CONFIGURE_SHELL_COMMANDS_ALL) && \ + !defined(CONFIGURE_SHELL_NO_COMMAND_DIR)) || \ + defined(CONFIGURE_SHELL_COMMAND_DIR) + &rtems_Shell_DIR_Alias, #endif - #if defined(CONFIGURE_SHELL_COMMANDS_ALL) || \ - defined(CONFIGURE_SHELL_COMMANDS_CD) - &Shell_CD_Alias, + #if (defined(CONFIGURE_SHELL_COMMANDS_ALL) && \ + !defined(CONFIGURE_SHELL_NO_COMMAND_CD)) || \ + defined(CONFIGURE_SHELL_COMMAND_CD) + &rtems_Shell_CD_Alias, #endif - #if defined(CONFIGURE_SHELL_COMMANDS_ALL) || \ - defined(CONFIGURE_SHELL_COMMANDS_EXIT) - &Shell_EXIT_Alias, + #if (defined(CONFIGURE_SHELL_COMMANDS_ALL) && \ + !defined(CONFIGURE_SHELL_NO_COMMAND_EXIT)) || \ + defined(CONFIGURE_SHELL_COMMAND_EXIT) + &rtems_Shell_EXIT_Alias, #endif /* @@ -107,123 +120,151 @@ extern shell_alias_t *Shell_Initial_aliases[]; NULL }; - shell_cmd_t *Shell_Initial_commands[] = { + rtems_shell_cmd_t *rtems_Shell_Initial_commands[] = { /* * General comamnds that should be present */ - &Shell_HELP_Command, - &Shell_ALIAS_Command, + &rtems_Shell_HELP_Command, + &rtems_Shell_ALIAS_Command, /* * Common commands that can be optional */ - #if defined(CONFIGURE_SHELL_COMMANDS_ALL) || \ + #if (defined(CONFIGURE_SHELL_COMMANDS_ALL) && \ + !defined(CONFIGURE_SHELL_NO_COMMAND_DATE)) || \ defined(CONFIGURE_SHELL_COMMAND_DATE) - &Shell_DATE_Command, + &rtems_Shell_DATE_Command, #endif - #if defined(CONFIGURE_SHELL_COMMANDS_ALL) || \ + #if (defined(CONFIGURE_SHELL_COMMANDS_ALL) && \ + !defined(CONFIGURE_SHELL_NO_COMMAND_ID)) || \ defined(CONFIGURE_SHELL_COMMAND_ID) - &Shell_ID_Command, + &rtems_Shell_ID_Command, #endif - #if defined(CONFIGURE_SHELL_COMMANDS_ALL) || \ + #if (defined(CONFIGURE_SHELL_COMMANDS_ALL) && \ + !defined(CONFIGURE_SHELL_NO_COMMAND_TTY)) || \ defined(CONFIGURE_SHELL_COMMAND_TTY) - &Shell_TTY_Command, + &rtems_Shell_TTY_Command, #endif - #if defined(CONFIGURE_SHELL_COMMANDS_ALL) || \ + #if (defined(CONFIGURE_SHELL_COMMANDS_ALL) && \ + !defined(CONFIGURE_SHELL_NO_COMMAND_WHOAMI)) || \ defined(CONFIGURE_SHELL_COMMAND_WHOAMI) - &Shell_WHOAMI_Command, + &rtems_Shell_WHOAMI_Command, #endif - #if defined(CONFIGURE_SHELL_COMMANDS_ALL) || \ + #if (defined(CONFIGURE_SHELL_COMMANDS_ALL) && \ + !defined(CONFIGURE_SHELL_NO_COMMAND_LOGOFF)) || \ defined(CONFIGURE_SHELL_COMMAND_LOGOFF) - &Shell_LOGOFF_Command, + &rtems_Shell_LOGOFF_Command, #endif /* * Memory printing/modification family commands */ - #if defined(CONFIGURE_SHELL_COMMANDS_ALL) || \ + #if (defined(CONFIGURE_SHELL_COMMANDS_ALL) && \ + !defined(CONFIGURE_SHELL_NO_COMMAND_MDUMP)) || \ defined(CONFIGURE_SHELL_COMMAND_MDUMP) - &Shell_MDUMP_Command, + &rtems_Shell_MDUMP_Command, #endif - #if defined(CONFIGURE_SHELL_COMMANDS_ALL) || \ + #if (defined(CONFIGURE_SHELL_COMMANDS_ALL) && \ + !defined(CONFIGURE_SHELL_NO_COMMAND_WDUMP)) || \ defined(CONFIGURE_SHELL_COMMAND_WDUMP) - &Shell_WDUMP_Command, + &rtems_Shell_WDUMP_Command, #endif - #if defined(CONFIGURE_SHELL_COMMANDS_ALL) || \ + #if (defined(CONFIGURE_SHELL_COMMANDS_ALL) && \ + !defined(CONFIGURE_SHELL_NO_COMMAND_MEDIT)) || \ defined(CONFIGURE_SHELL_COMMAND_MEDIT) - &Shell_MEDIT_Command, + &rtems_Shell_MEDIT_Command, #endif - #if defined(CONFIGURE_SHELL_COMMANDS_ALL) || \ + #if (defined(CONFIGURE_SHELL_COMMANDS_ALL) && \ + !defined(CONFIGURE_SHELL_NO_COMMAND_MFILL)) || \ defined(CONFIGURE_SHELL_COMMAND_MFILL) - &Shell_MFILL_Command, + &rtems_Shell_MFILL_Command, #endif - #if defined(CONFIGURE_SHELL_COMMANDS_ALL) || \ + #if (defined(CONFIGURE_SHELL_COMMANDS_ALL) && \ + !defined(CONFIGURE_SHELL_NO_COMMAND_MMOVE)) || \ defined(CONFIGURE_SHELL_COMMAND_MMOVE) - &Shell_MMOVE_Command, + &rtems_Shell_MMOVE_Command, #endif /* * File and directory commands */ - #if defined(CONFIGURE_SHELL_COMMANDS_ALL) || \ + #if (defined(CONFIGURE_SHELL_COMMANDS_ALL) && \ + !defined(CONFIGURE_SHELL_NO_COMMAND_PWD)) || \ defined(CONFIGURE_SHELL_COMMAND_PWD) - &Shell_PWD_Command, + &rtems_Shell_PWD_Command, #endif - #if defined(CONFIGURE_SHELL_COMMANDS_ALL) || \ + #if (defined(CONFIGURE_SHELL_COMMANDS_ALL) && \ + !defined(CONFIGURE_SHELL_NO_COMMAND_LS)) || \ defined(CONFIGURE_SHELL_COMMAND_LS) - &Shell_LS_Command, + &rtems_Shell_LS_Command, #endif - #if defined(CONFIGURE_SHELL_COMMANDS_ALL) || \ + #if (defined(CONFIGURE_SHELL_COMMANDS_ALL) && \ + !defined(CONFIGURE_SHELL_NO_COMMAND_CHDIR)) || \ defined(CONFIGURE_SHELL_COMMAND_CHDIR) - &Shell_CHDIR_Command, + &rtems_Shell_CHDIR_Command, #endif - #if defined(CONFIGURE_SHELL_COMMANDS_ALL) || \ + #if (defined(CONFIGURE_SHELL_COMMANDS_ALL) && \ + !defined(CONFIGURE_SHELL_NO_COMMAND_MKDIR)) || \ defined(CONFIGURE_SHELL_COMMAND_MKDIR) - &Shell_MKDIR_Command, + &rtems_Shell_MKDIR_Command, #endif - #if defined(CONFIGURE_SHELL_COMMANDS_ALL) || \ + #if (defined(CONFIGURE_SHELL_COMMANDS_ALL) && \ + !defined(CONFIGURE_SHELL_NO_COMMAND_RMDIR)) || \ defined(CONFIGURE_SHELL_COMMAND_RMDIR) - &Shell_RMDIR_Command, + &rtems_Shell_RMDIR_Command, #endif - #if defined(CONFIGURE_SHELL_COMMANDS_ALL) || \ + #if (defined(CONFIGURE_SHELL_COMMANDS_ALL) && \ + !defined(CONFIGURE_SHELL_NO_COMMAND_CHROOT)) || \ defined(CONFIGURE_SHELL_COMMAND_CHROOT) - &Shell_CHROOT_Command, + &rtems_Shell_CHROOT_Command, #endif - #if defined(CONFIGURE_SHELL_COMMANDS_ALL) || \ + #if (defined(CONFIGURE_SHELL_COMMANDS_ALL) && \ + !defined(CONFIGURE_SHELL_NO_COMMAND_CHMOD)) || \ defined(CONFIGURE_SHELL_COMMAND_CHMOD) - &Shell_CHMOD_Command, + &rtems_Shell_CHMOD_Command, #endif - #if defined(CONFIGURE_SHELL_COMMANDS_ALL) || \ + #if (defined(CONFIGURE_SHELL_COMMANDS_ALL) && \ + !defined(CONFIGURE_SHELL_NO_COMMAND_CAT)) || \ defined(CONFIGURE_SHELL_COMMAND_CAT) - &Shell_CAT_Command, + &rtems_Shell_CAT_Command, #endif - #if defined(CONFIGURE_SHELL_COMMANDS_ALL) || \ + #if (defined(CONFIGURE_SHELL_COMMANDS_ALL) && \ + !defined(CONFIGURE_SHELL_NO_COMMAND_RM)) || \ defined(CONFIGURE_SHELL_COMMAND_RM) - &Shell_RM_Command, + &rtems_Shell_RM_Command, #endif - #if defined(CONFIGURE_SHELL_COMMANDS_ALL) || \ + #if (defined(CONFIGURE_SHELL_COMMANDS_ALL) && \ + !defined(CONFIGURE_SHELL_NO_COMMAND_UMASK)) || \ defined(CONFIGURE_SHELL_COMMAND_UMASK) - &Shell_UMASK_Command, + &rtems_Shell_UMASK_Command, + #endif + #if (defined(CONFIGURE_SHELL_COMMANDS_ALL) && \ + !defined(CONFIGURE_SHELL_NO_COMMAND_MOUNT)) || \ + defined(CONFIGURE_SHELL_COMMAND_MOUNT) + &rtems_Shell_MOUNT_Command, #endif /* * RTEMS Related commands */ - #if defined(CONFIGURE_SHELL_COMMANDS_ALL) || \ + #if (defined(CONFIGURE_SHELL_COMMANDS_ALL) && \ + !defined(CONFIGURE_SHELL_NO_COMMAND_CPUUSE)) || \ defined(CONFIGURE_SHELL_COMMAND_CPUUSE) - &Shell_CPUUSE_Command, + &rtems_Shell_CPUUSE_Command, #endif - #if defined(CONFIGURE_SHELL_COMMANDS_ALL) || \ + #if (defined(CONFIGURE_SHELL_COMMANDS_ALL) && \ + !defined(CONFIGURE_SHELL_NO_COMMAND_STACKUSE)) || \ defined(CONFIGURE_SHELL_COMMAND_STACKUSE) - &Shell_STACKUSE_Command, + &rtems_Shell_STACKUSE_Command, #endif /* * Malloc family commands */ - #if defined(CONFIGURE_SHELL_COMMANDS_ALL) || \ + #if (defined(CONFIGURE_SHELL_COMMANDS_ALL) && \ + !defined(CONFIGURE_SHELL_COMMAND_MALLOC_DUMP)) || \ defined(CONFIGURE_SHELL_COMMAND_MALLOC_DUMP) - &Shell_MALLOC_DUMP_Command, + &rtems_Shell_MALLOC_DUMP_Command, #endif /* @@ -234,6 +275,32 @@ extern shell_alias_t *Shell_Initial_aliases[]; #endif NULL }; + + /* + * The mount command's support file system types. + */ + #if (defined(CONFIGURE_SHELL_COMMANDS_ALL) && \ + !defined(CONFIGURE_SHELL_COMMAND_MALLOC_DUMP)) || \ + defined(CONFIGURE_SHELL_COMMAND_MALLOC_DUMP) + rtems_shell_filesystems_t *rtems_Shell_Mount_filesystems[] = { + #if defined(CONFIGURE_SHELL_MOUNT_MSDOS) + &rtems_Shell_Mount_MSDOS, + #endif + #if RTEMS_NETWORKING + #if defined(CONFIGURE_SHELL_MOUNT_TFTP) + &rtems_Shell_Mount_TFTP, + #endif + #if defined(CONFIGURE_SHELL_MOUNT_FTP) + &rtems_Shell_Mount_FTP, + #endif + #if defined(CONFIGURE_SHELL_MOUNT_NFS) + &rtems_Shell_Mount_NFS, + #endif + #endif + NULL + }; + #endif + #endif #endif |