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

More ARMv7-A files that are just copies of the ARMv4/5 files for now

Browse Source
This commit is contained in:
Gregory Nutt 2013-07-19 11:43:04 -06:00
parent 8a654d000b
commit 4bb75f9a3f
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nshlib/nsh.h
View File

@ -384,7 +384,7 @@
/* Stubs used when working directory is not supported */ /* Stubs used when working directory is not supported */
#if CONFIG_NFILE_DESCRIPTORS <= 0 || defined(CONFIG_DISABLE_ENVIRON) #if CONFIG_NFILE_DESCRIPTORS <= 0 || defined(CONFIG_DISABLE_ENVIRON)
# define nsh_getfullpath(v,p) ((char*)(p)) # define nsh_getfullpath(v,p) ((FAR char*)(p))
# define nsh_freefullpath(p) # define nsh_freefullpath(p)
#endif #endif
@ -556,8 +556,9 @@ int nsh_fileapp(FAR struct nsh_vtbl_s *vtbl, FAR const char *cmd,
#if CONFIG_NFILE_DESCRIPTORS > 0 && !defined(CONFIG_DISABLE_ENVIRON) #if CONFIG_NFILE_DESCRIPTORS > 0 && !defined(CONFIG_DISABLE_ENVIRON)
FAR const char *nsh_getcwd(void); FAR const char *nsh_getcwd(void);
char *nsh_getfullpath(FAR struct nsh_vtbl_s *vtbl, const char *relpath); FAR char *nsh_getfullpath(FAR struct nsh_vtbl_s *vtbl,
void nsh_freefullpath(char *relpath); FAR const char *relpath);
void nsh_freefullpath(FAR char *fullpath);
#endif #endif
/* Debug */ /* Debug */

9
nshlib/nsh_envcmds.c
View File

@ -157,7 +157,8 @@ FAR const char *nsh_getcwd(void)
****************************************************************************/ ****************************************************************************/
#if CONFIG_NFILE_DESCRIPTORS > 0 && !defined(CONFIG_DISABLE_ENVIRON) #if CONFIG_NFILE_DESCRIPTORS > 0 && !defined(CONFIG_DISABLE_ENVIRON)
char *nsh_getfullpath(FAR struct nsh_vtbl_s *vtbl, const char *relpath) FAR char *nsh_getfullpath(FAR struct nsh_vtbl_s *vtbl,
FAR const char *relpath)
{ {
const char *wd; const char *wd;
@ -196,11 +197,11 @@ char *nsh_getfullpath(FAR struct nsh_vtbl_s *vtbl, const char *relpath)
****************************************************************************/ ****************************************************************************/
#if CONFIG_NFILE_DESCRIPTORS > 0 && !defined(CONFIG_DISABLE_ENVIRON) #if CONFIG_NFILE_DESCRIPTORS > 0 && !defined(CONFIG_DISABLE_ENVIRON)
void nsh_freefullpath(char *relpath) void nsh_freefullpath(FAR char *fullpath)
{ {
if (relpath) if (fullpath)
{ {
free(relpath); free(fullpath);
} }
} }
#endif #endif