diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-09-19 15:12:13 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-09-19 15:12:13 +0000 |
| commit | 71075f37bd4cb6a9f65f2e86ff0b1b19f518d166 (patch) | |
| tree | a55f2a5ec1ff07d398bf03b3aaf586fce9467bce /nuttx/examples/nsh | |
| parent | 6667ff8f6a7d35dfecb9f3d396da3afa20aa853b (diff) | |
| download | px4-nuttx-71075f37bd4cb6a9f65f2e86ff0b1b19f518d166.tar.gz px4-nuttx-71075f37bd4cb6a9f65f2e86ff0b1b19f518d166.tar.bz2 px4-nuttx-71075f37bd4cb6a9f65f2e86ff0b1b19f518d166.zip | |
Fixes for clean compile w/o environment variables
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@941 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/examples/nsh')
| -rw-r--r-- | nuttx/examples/nsh/nsh.h | 2 | ||||
| -rw-r--r-- | nuttx/examples/nsh/nsh_main.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/nuttx/examples/nsh/nsh.h b/nuttx/examples/nsh/nsh.h index 7626a4e3c..b98cec49b 100644 --- a/nuttx/examples/nsh/nsh.h +++ b/nuttx/examples/nsh/nsh.h @@ -184,7 +184,7 @@ /* Stubs used when working directory is not supported */ #if CONFIG_NFILE_DESCRIPTORS <= 0 || defined(CONFIG_DISABLE_ENVIRON) -# define nsh_getfullpath(v,p) (p) +# define nsh_getfullpath(v,p) ((char*)(p)) # define nsh_freefullpath(p) #endif diff --git a/nuttx/examples/nsh/nsh_main.c b/nuttx/examples/nsh/nsh_main.c index 20204d902..6acf48d53 100644 --- a/nuttx/examples/nsh/nsh_main.c +++ b/nuttx/examples/nsh/nsh_main.c @@ -544,6 +544,7 @@ char *nsh_argument(FAR struct nsh_vtbl_s *vtbl, char **saveptr) *saveptr = pend; +#ifndef CONFIG_DISABLE_ENVIRON /* Check for references to environment variables */ if (pbegin[0] == '$' && !quoted) @@ -563,7 +564,7 @@ char *nsh_argument(FAR struct nsh_vtbl_s *vtbl, char **saveptr) } /* Not a built-in? Return the value of the environment variable with this name */ -#ifndef CONFIG_DISABLE_ENVIRON + else { char *value = getenv(pbegin+1); @@ -576,8 +577,8 @@ char *nsh_argument(FAR struct nsh_vtbl_s *vtbl, char **saveptr) return (char*)""; } } -#endif } +#endif } /* Return the beginning of the token. */ |