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
This commit is contained in:
parent
6a96311905
commit
106ae37184
@ -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
|
||||
|
||||
|
@ -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. */
|
||||
|
Loading…
Reference in New Issue
Block a user