diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-11-05 07:49:20 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-11-05 07:49:20 -0600 |
| commit | 8d32bce60e8345d3ab90dbf5018234dac53df162 (patch) | |
| tree | c452d096b475925bf329b0048e1317a5a9b16bc1 /apps/nshlib | |
| parent | c803bfc335ba2d965d8ae784511a4a59766e82e4 (diff) | |
| download | nuttx-8d32bce60e8345d3ab90dbf5018234dac53df162.tar.gz nuttx-8d32bce60e8345d3ab90dbf5018234dac53df162.tar.bz2 nuttx-8d32bce60e8345d3ab90dbf5018234dac53df162.zip | |
Move CONFIG_NSH_TMPDIR to CONFIG_LIBC_TMPDIR
Diffstat (limited to 'apps/nshlib')
| -rw-r--r-- | apps/nshlib/Kconfig | 11 | ||||
| -rw-r--r-- | apps/nshlib/nsh.h | 4 | ||||
| -rw-r--r-- | apps/nshlib/nsh_parse.c | 2 |
3 files changed, 3 insertions, 14 deletions
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, "``"); |