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/main_help.c | |
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 'cpukit/libmisc/shell/main_help.c')
-rw-r--r-- | cpukit/libmisc/shell/main_help.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/cpukit/libmisc/shell/main_help.c b/cpukit/libmisc/shell/main_help.c index 964b511b2b..299fbf6149 100644 --- a/cpukit/libmisc/shell/main_help.c +++ b/cpukit/libmisc/shell/main_help.c @@ -27,7 +27,7 @@ /* * show the help for one command. */ -int shell_help_cmd(shell_cmd_t * shell_cmd) { +int rtems_shell_help_cmd(rtems_shell_cmd_t * shell_cmd) { char * pc; int col,line; @@ -73,19 +73,19 @@ int shell_help_cmd(shell_cmd_t * shell_cmd) { * Can you see the header of routine? Known? * The same with all the commands.... */ -int shell_help( +int rtems_shell_help( int argc, char * argv[] ) { int col,line,arg; - shell_topic_t *topic; - shell_cmd_t * shell_cmd = shell_first_cmd; + rtems_shell_topic_t *topic; + rtems_shell_cmd_t * shell_cmd = rtems_shell_first_cmd; if (argc<2) { printf("help: ('r' repeat last cmd - 'e' edit last cmd)\n" " TOPIC? The topics are\n"); - topic = shell_first_topic; + topic = rtems_shell_first_topic; col = 0; while (topic) { if (!col){ @@ -110,14 +110,14 @@ int shell_help( printf("\n"); line = 0; } - topic = shell_lookup_topic(argv[arg]); + topic = rtems_shell_lookup_topic(argv[arg]); if (!topic){ - if ((shell_cmd = shell_lookup_cmd(argv[arg])) == NULL) { + if ((shell_cmd = rtems_shell_lookup_cmd(argv[arg])) == NULL) { printf("help: topic or cmd '%s' not found. Try <help> alone for a list\n", argv[arg]); line++; } else { - line+= shell_help_cmd(shell_cmd); + line+= rtems_shell_help_cmd(shell_cmd); } continue; } @@ -125,7 +125,7 @@ int shell_help( line++; while (shell_cmd) { if (!strcmp(topic->topic,shell_cmd->topic)) - line+= shell_help_cmd(shell_cmd); + line+= rtems_shell_help_cmd(shell_cmd); if (line>16) { printf("Press any key to continue..."); getchar(); @@ -139,11 +139,11 @@ int shell_help( return 0; } -shell_cmd_t Shell_HELP_Command = { +rtems_shell_cmd_t rtems_Shell_HELP_Command = { "help", /* name */ "help [topic] # list of usage of commands", /* usage */ "help", /* topic */ - shell_help, /* command */ + rtems_shell_help, /* command */ NULL, /* alias */ NULL /* next */ }; |