diff options
| -rw-r--r-- | nuttx/ChangeLog | 3 | ||||
| -rw-r--r-- | nuttx/Documentation/NuttX.html | 3 | ||||
| -rw-r--r-- | nuttx/examples/nsh/Makefile | 2 | ||||
| -rw-r--r-- | nuttx/examples/nsh/nsh.h | 27 | ||||
| -rw-r--r-- | nuttx/examples/nsh/nsh_envcmds.c | 138 | ||||
| -rw-r--r-- | nuttx/examples/nsh/nsh_main.c | 26 | ||||
| -rw-r--r-- | nuttx/examples/nsh/nsh_proccmds.c | 7 |
7 files changed, 172 insertions, 34 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index c79ae5de0..be8a343ab 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -196,6 +196,7 @@ * examples/ostest/: Added an environment variable test. * examples/nsh/: Break into several files. * lib/: Added strrchr, basename, dirname - * examples/nsh/: Add cp, rm, and rmdir commands + * examples/nsh/: Add cp, rm, rmdir, set, unset commands. echo will now print + environment variables. * Started m68322 diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html index c9cf2f5d3..2ea742e70 100644 --- a/nuttx/Documentation/NuttX.html +++ b/nuttx/Documentation/NuttX.html @@ -633,7 +633,8 @@ Other memory: * examples/ostest: Added an environment variable test. * examples/nsh/: Break into several files. * lib/: Added strrchr, basename, dirname - * examples/nsh/: Add cp, rm, and rmdir commands + * examples/nsh/: Add cp, rm, rmdir, set, unset commands. echo will now print + environment variables. * Started m68322 </pre></ul> diff --git a/nuttx/examples/nsh/Makefile b/nuttx/examples/nsh/Makefile index 636762682..faeb30246 100644 --- a/nuttx/examples/nsh/Makefile +++ b/nuttx/examples/nsh/Makefile @@ -40,7 +40,7 @@ MKDEP = $(TOPDIR)/tools/mkdeps.sh ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) -CSRCS = nsh_main.c nsh_fscmds.c nsh_proccmds.c +CSRCS = nsh_main.c nsh_fscmds.c nsh_proccmds.c nsh_envcmds.c COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) diff --git a/nuttx/examples/nsh/nsh.h b/nuttx/examples/nsh/nsh.h index fef113e45..fc9f807d2 100644 --- a/nuttx/examples/nsh/nsh.h +++ b/nuttx/examples/nsh/nsh.h @@ -72,22 +72,29 @@ extern const char g_fmtcmdoutofmemory[]; ****************************************************************************/ #if CONFIG_NFILE_DESCRIPTORS > 0 -void cmd_cat(int argc, char **argv); -void cmd_cp(int argc, char **argv); +extern void cmd_cat(int argc, char **argv); +extern void cmd_cp(int argc, char **argv); #endif -void cmd_exec(int argc, char **argv); +extern void cmd_echo(int argc, char **argv); +extern void cmd_exec(int argc, char **argv); #if CONFIG_NFILE_DESCRIPTORS > 0 -void cmd_ls(int argc, char **argv); +extern void cmd_ls(int argc, char **argv); #endif #if !defined(CONFIG_DISABLE_MOUNTPOINT) && CONFIG_NFILE_DESCRIPTORS > 0 -void cmd_mkdir(int argc, char **argv); -void cmd_mount(int argc, char **argv); +extern void cmd_mkdir(int argc, char **argv); +extern void cmd_mount(int argc, char **argv); +#endif +extern void cmd_ps(int argc, char **argv); +#ifndef CONFIG_DISABLE_ENVIRON +extern void cmd_set(int argc, char **argv); #endif -void cmd_ps(int argc, char **argv); #if !defined(CONFIG_DISABLE_MOUNTPOINT) && CONFIG_NFILE_DESCRIPTORS > 0 -void cmd_rm(int argc, char **argv); -void cmd_rmdir(int argc, char **argv); -void cmd_umount(int argc, char **argv); +extern void cmd_rm(int argc, char **argv); +extern void cmd_rmdir(int argc, char **argv); +extern void cmd_umount(int argc, char **argv); +#endif +#ifndef CONFIG_DISABLE_ENVIRON +extern void cmd_unset(int argc, char **argv); #endif #endif /* __NSH_H */ diff --git a/nuttx/examples/nsh/nsh_envcmds.c b/nuttx/examples/nsh/nsh_envcmds.c new file mode 100644 index 000000000..c6ff9a0f2 --- /dev/null +++ b/nuttx/examples/nsh/nsh_envcmds.c @@ -0,0 +1,138 @@ +/**************************************************************************** + * nsh_envcmds.c + * + * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. 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. + * 3. Neither the name Gregory Nutt 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. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <nuttx/config.h> +#include <sys/types.h> + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <errno.h> + +#include "nsh.h" + +/**************************************************************************** + * Definitions + ****************************************************************************/ + +/**************************************************************************** + * Private Types + ****************************************************************************/ + +/**************************************************************************** + * Private Function Prototypes + ****************************************************************************/ + +/**************************************************************************** + * Private Data + ****************************************************************************/ + +/**************************************************************************** + * Public Data + ****************************************************************************/ + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: cmd_echo + ****************************************************************************/ + +void cmd_echo(int argc, char **argv) +{ + int i; + + /* echo each argument, separated by a space as it must have been on the + * command line + */ + + for (i = 1; i < argc; i++) + { + /* Check for references to environment variables */ + +#ifndef CONFIG_DISABLE_ENVIRON + if (argv[i][0] == '$') + { + char *value = getenv(argv[i]+1); + if (value) + { + printf("%s ", value); + } + } + else +#endif + { + printf("%s ", argv[i]); + } + } + putchar('\n'); +} + +/**************************************************************************** + * Name: cmd_set + ****************************************************************************/ + +#ifndef CONFIG_DISABLE_ENVIRON +void cmd_set(int argc, char **argv) +{ + if (setenv(argv[1], argv[2], TRUE) < 0) + { + printf(g_fmtcmdfailed, argv[0], "setenv", strerror(errno)); + } +} +#endif + +/**************************************************************************** + * Name: cmd_unset + ****************************************************************************/ + +#ifndef CONFIG_DISABLE_ENVIRON +void cmd_unset(int argc, char **argv) +{ + if (unsetenv(argv[1]) < 0) + { + printf(g_fmtcmdfailed, argv[0], "unsetenv", strerror(errno)); + } +} +#endif diff --git a/nuttx/examples/nsh/nsh_main.c b/nuttx/examples/nsh/nsh_main.c index e0b7e7904..a52d2d0b8 100644 --- a/nuttx/examples/nsh/nsh_main.c +++ b/nuttx/examples/nsh/nsh_main.c @@ -71,7 +71,6 @@ struct cmdmap_s ****************************************************************************/ static void cmd_help(int argc, char **argv); -static void cmd_echo(int argc, char **argv); static void cmd_unrecognized(int argc, char **argv); /**************************************************************************** @@ -87,7 +86,11 @@ static const struct cmdmap_s g_cmdmap[] = { "cat", cmd_cat, 2, 2, "<path>" }, { "cp", cmd_cp, 3, 3, "<source-path> <dest-path>" }, #endif - { "echo", cmd_echo, 2, 2, "<string>" }, +#ifndef CONFIG_DISABLE_ENVIRON + { "echo", cmd_echo, 0, NSH_MAX_ARGUMENTS, "[<string|$name> [<string|$name>...]]" }, +#else + { "echo", cmd_echo, 0, NSH_MAX_ARGUMENTS, "[<string> [<string>...]]" }, +#endif { "exec", cmd_exec, 2, 3, "<hex-address>" }, { "help", cmd_help, 1, 1, NULL }, #if CONFIG_NFILE_DESCRIPTORS > 0 @@ -98,11 +101,17 @@ static const struct cmdmap_s g_cmdmap[] = { "mount", cmd_mount, 4, 5, "-t <fstype> <block-device> <dir-path>" }, #endif { "ps", cmd_ps, 1, 1, NULL }, +#ifndef CONFIG_DISABLE_ENVIRON + { "set", cmd_set, 3, 3, "<name> <value>" }, +#endif #if !defined(CONFIG_DISABLE_MOUNTPOINT) && CONFIG_NFILE_DESCRIPTORS > 0 { "rm", cmd_rm, 2, 2, "<file-path>" }, { "rmdir", cmd_rmdir, 2, 2, "<dir-path>" }, { "umount", cmd_umount, 2, 2, "<dir-path>" }, #endif +#ifndef CONFIG_DISABLE_ENVIRON + { "unset", cmd_unset, 2, 2, "<name>" }, +#endif { NULL, NULL, 1, 1, NULL } }; @@ -124,17 +133,6 @@ const char g_fmtcmdoutofmemory[] = "nsh: %s: out of memory\n"; ****************************************************************************/ /**************************************************************************** - * Name: cmd_echo - ****************************************************************************/ - -static void cmd_echo(int argc, char **argv) -{ - /* Echo the rest of the line */ - - puts(argv[1]); -} - -/**************************************************************************** * Name: cmd_help ****************************************************************************/ @@ -260,7 +258,7 @@ int user_start(int argc, char *argv[]) handler = cmdmap->handler; break; } - } + } } /* If a error was detected above, handler will be nullified to diff --git a/nuttx/examples/nsh/nsh_proccmds.c b/nuttx/examples/nsh/nsh_proccmds.c index 7820e3499..285db5586 100644 --- a/nuttx/examples/nsh/nsh_proccmds.c +++ b/nuttx/examples/nsh/nsh_proccmds.c @@ -44,13 +44,6 @@ #include <stdlib.h> #include <sched.h> -#if 0 -#include <unistd.h> -#include <limits.h> -#include <string.h> -#include <errno.h> -#endif - #include "nsh.h" /**************************************************************************** |