diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-11-05 10:47:50 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-11-05 10:47:50 -0600 |
| commit | 640683d99db1fb3879f2a0fbe69724e395d3a652 (patch) | |
| tree | 70a366046764080a63be68d4f5796f7ce226d36f /apps | |
| parent | 25e3eeffe377f4747995563036ae548cf4fdc017 (diff) | |
| parent | 6e100d4cc58aa8fc352e460601cc4cee81f4e339 (diff) | |
| download | nuttx-640683d99db1fb3879f2a0fbe69724e395d3a652.tar.gz nuttx-640683d99db1fb3879f2a0fbe69724e395d3a652.tar.bz2 nuttx-640683d99db1fb3879f2a0fbe69724e395d3a652.zip | |
Merge remote-tracking branch 'origin/master' into bas24
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/ChangeLog.txt | 2 | ||||
| -rw-r--r-- | apps/nshlib/Kconfig | 11 | ||||
| -rw-r--r-- | apps/nshlib/nsh.h | 4 | ||||
| -rw-r--r-- | apps/nshlib/nsh_parse.c | 2 |
4 files changed, 5 insertions, 14 deletions
diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt index a246f462c..df7295df2 100644 --- a/apps/ChangeLog.txt +++ b/apps/ChangeLog.txt @@ -1095,3 +1095,5 @@ issues. From Radoslaw Adamczyk (2014-10-23). * apps/examples/keypadtest/keypadtest_main.c: Fixes to keypadtest from Pierre-Noel Bouteville (2014-10-23). + * apps/nshlib/nsh_parse.c, nsh.h, and Kconfig: Move CONFIG_NSH_TMPDIR + to CONFIG_LIBC_TMPDIR (2014-11-05). diff --git a/apps/nshlib/Kconfig b/apps/nshlib/Kconfig index ba9c718b4..3e212e746 100644 --- a/apps/nshlib/Kconfig +++ b/apps/nshlib/Kconfig @@ -77,17 +77,6 @@ config NSH_CMDPARMS Because this feature commits significant resources, it is disabled by default. -config NSH_TMPDIR - string "Temporary file directory" - default "/tmp" - depends on NSH_CMDPARMS - ---help--- - If NSH_CMDPARMS is selected, then function output will be retained - in a temporary file. In that case, this string must be provided to - specify the full path to a directory where temporary files can be - created. This would be a good application of RAM disk: To provide - temporary storage for function output. - config NSH_MAXARGUMENTS int "Maximum number of command arguments" default 6 diff --git a/apps/nshlib/nsh.h b/apps/nshlib/nsh.h index dc13e3753..d726b5253 100644 --- a/apps/nshlib/nsh.h +++ b/apps/nshlib/nsh.h @@ -100,8 +100,8 @@ * hold temporary files must be provided. */ -#if defined(CONFIG_NSH_CMDPARMS) && !defined(CONFIG_NSH_TMPDIR) -# define CONFIG_NSH_TMPDIR "/tmp" +#if defined(CONFIG_NSH_CMDPARMS) && !defined(CONFIG_LIBC_TMPDIR) +# define CONFIG_LIBC_TMPDIR "/tmp" #endif /* Networking support. Make sure that all non-boolean configuration diff --git a/apps/nshlib/nsh_parse.c b/apps/nshlib/nsh_parse.c index 2ed9452cf..a7a35e8f2 100644 --- a/apps/nshlib/nsh_parse.c +++ b/apps/nshlib/nsh_parse.c @@ -874,7 +874,7 @@ static FAR char *nsh_cmdparm(FAR struct nsh_vtbl_s *vtbl, FAR char *cmdline, /* Create a unique file name using the task ID */ tmpfile = NULL; - ret = asprintf(&tmpfile, "%s/TMP%d.dat", CONFIG_NSH_TMPDIR, getpid()); + ret = asprintf(&tmpfile, "%s/TMP%d.dat", CONFIG_LIBC_TMPDIR, getpid()); if (ret < 0 || !tmpfile) { nsh_output(vtbl, g_fmtcmdoutofmemory, "``"); |