sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

NSH: Like bash, NSH set command should strip off any leading or trailing whitespace

Browse Source
This commit is contained in:
Gregory Nutt 2015-11-23 11:18:32 -06:00
parent 178c9780a8
commit f2ea88fc9e
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog.txt
View File

@ -1457,4 +1457,6 @@
to supported multiple root directories. From Ken Petit (2015-11-23). to supported multiple root directories. From Ken Petit (2015-11-23).
* apps/nshlib: Add support for 'basename' and 'dirname' commands * apps/nshlib: Add support for 'basename' and 'dirname' commands
(2015-11-23). (2015-11-23).
* apps/nshlib: Like bash, NSH set command should strip off any
leading or trailing whitespace (2015-11-23).

24
nshlib/nsh_envcmds.c
View File

@ -43,6 +43,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <string.h> #include <string.h>
#include <ctype.h>
#include <libgen.h> #include <libgen.h>
#include <errno.h> #include <errno.h>
@ -314,7 +315,28 @@ int cmd_pwd(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
#ifndef CONFIG_NSH_DISABLE_SET #ifndef CONFIG_NSH_DISABLE_SET
int cmd_set(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) int cmd_set(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
{ {
int ret = setenv(argv[1], argv[2], TRUE); FAR char *value;
int ndx;
int ret;
/* Strip leading whitespace from the value */
for (value = argv[2];
*value != '\0' && isspace(*value);
value++);
/* Strip trailing whitespace from the value */
for (ndx = strlen(value) - 1;
ndx >= 0 && isspace(value[ndx]);
ndx--)
{
value[ndx] = '\0';
}
/* Set the environment variable */
ret = setenv(argv[1], value, TRUE);
if (ret < 0) if (ret < 0)
{ {
nsh_output(vtbl, g_fmtcmdfailed, argv[0], "setenv", NSH_ERRNO); nsh_output(vtbl, g_fmtcmdfailed, argv[0], "setenv", NSH_ERRNO);