diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-07-19 11:43:04 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-07-19 11:43:04 -0600 |
| commit | ecc3d23672afce147e4e629e3e7cc2562090f02e (patch) | |
| tree | 9427b25afee537779b60fd2c33cb3cafdf29ed88 /apps | |
| parent | 3cbe0e6170775e8c1a53ac9a80a281478adcc6a5 (diff) | |
| download | nuttx-ecc3d23672afce147e4e629e3e7cc2562090f02e.tar.gz nuttx-ecc3d23672afce147e4e629e3e7cc2562090f02e.tar.bz2 nuttx-ecc3d23672afce147e4e629e3e7cc2562090f02e.zip | |
More ARMv7-A files that are just copies of the ARMv4/5 files for now
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/nshlib/nsh.h | 7 | ||||
| -rw-r--r-- | apps/nshlib/nsh_envcmds.c | 9 |
2 files changed, 9 insertions, 7 deletions
diff --git a/apps/nshlib/nsh.h b/apps/nshlib/nsh.h index 957f08bc1..9f1bb40fe 100644 --- a/apps/nshlib/nsh.h +++ b/apps/nshlib/nsh.h @@ -384,7 +384,7 @@ /* Stubs used when working directory is not supported */ #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) #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) FAR const char *nsh_getcwd(void); -char *nsh_getfullpath(FAR struct nsh_vtbl_s *vtbl, const char *relpath); -void nsh_freefullpath(char *relpath); +FAR char *nsh_getfullpath(FAR struct nsh_vtbl_s *vtbl, + FAR const char *relpath); +void nsh_freefullpath(FAR char *fullpath); #endif /* Debug */ diff --git a/apps/nshlib/nsh_envcmds.c b/apps/nshlib/nsh_envcmds.c index 07b775517..02c0ec02e 100644 --- a/apps/nshlib/nsh_envcmds.c +++ b/apps/nshlib/nsh_envcmds.c @@ -157,7 +157,8 @@ FAR const char *nsh_getcwd(void) ****************************************************************************/ #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; @@ -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) -void nsh_freefullpath(char *relpath) +void nsh_freefullpath(FAR char *fullpath) { - if (relpath) + if (fullpath) { - free(relpath); + free(fullpath); } } #endif |