apps/: Rename BINFMT_EXEPATH to LIB_ENVPATH.

This commit is contained in:
anchao 2018-11-08 07:31:52 -06:00 committed by Gregory Nutt
parent aeabc12536
commit 3432acf7c4
3 changed files with 9 additions and 9 deletions

View File

@ -158,7 +158,7 @@ static unsigned int g_mmstep; /* Memory Usage at beginning of test step */
static const char delimiter[] = static const char delimiter[] =
"****************************************************************************"; "****************************************************************************";
#ifndef CONFIG_BINFMT_EXEPATH #ifndef CONFIG_LIB_ENVPATH
static char fullpath[128]; static char fullpath[128];
#endif #endif
@ -364,7 +364,7 @@ int elf_main(int argc, char *argv[])
mm_update(&g_mmstep, "after mount"); mm_update(&g_mmstep, "after mount");
#if defined(CONFIG_BINFMT_EXEPATH) && !defined(CONFIG_PATH_INITIAL) #if defined(CONFIG_LIB_ENVPATH) && !defined(CONFIG_PATH_INITIAL)
/* Does the system support the PATH variable? Has the PATH variable /* Does the system support the PATH variable? Has the PATH variable
* already been set? If YES and NO, then set the PATH variable to * already been set? If YES and NO, then set the PATH variable to
* the ROMFS mountpoint. * the ROMFS mountpoint.
@ -391,7 +391,7 @@ int elf_main(int argc, char *argv[])
* search the PATH variable to find the executable. * search the PATH variable to find the executable.
*/ */
#ifdef CONFIG_BINFMT_EXEPATH #ifdef CONFIG_LIB_ENVPATH
filename = dirlist[i]; filename = dirlist[i];
#else #else
snprintf(fullpath, 128, "%s/%s", MOUNTPT, dirlist[i]); snprintf(fullpath, 128, "%s/%s", MOUNTPT, dirlist[i]);

View File

@ -131,7 +131,7 @@
static const char delimiter[] = static const char delimiter[] =
"****************************************************************************"; "****************************************************************************";
#ifndef CONFIG_BINFMT_EXEPATH #ifndef CONFIG_LIB_ENVPATH
static char fullpath[128]; static char fullpath[128];
#endif #endif
@ -189,7 +189,7 @@ int nxflat_main(int argc, char *argv[])
ROMFSDEV, MOUNTPT, errno); ROMFSDEV, MOUNTPT, errno);
} }
#if defined(CONFIG_BINFMT_EXEPATH) && !defined(CONFIG_PATH_INITIAL) #if defined(CONFIG_LIB_ENVPATH) && !defined(CONFIG_PATH_INITIAL)
/* Does the system support the PATH variable? Has the PATH variable /* Does the system support the PATH variable? Has the PATH variable
* already been set? If YES and NO, then set the PATH variable to * already been set? If YES and NO, then set the PATH variable to
* the ROMFS mountpoint. * the ROMFS mountpoint.
@ -216,7 +216,7 @@ int nxflat_main(int argc, char *argv[])
* search the PATH variable to find the executable. * search the PATH variable to find the executable.
*/ */
#ifdef CONFIG_BINFMT_EXEPATH #ifdef CONFIG_LIB_ENVPATH
filename = dirlist[i]; filename = dirlist[i];
#else #else
snprintf(fullpath, 128, "%s/%s", MOUNTPT, dirlist[i]); snprintf(fullpath, 128, "%s/%s", MOUNTPT, dirlist[i]);

View File

@ -279,7 +279,7 @@ int spawn_main(int argc, char *argv[])
* the ROMFS mountpoint. * the ROMFS mountpoint.
*/ */
#if defined(CONFIG_BINFMT_EXEPATH) && !defined(CONFIG_PATH_INITIAL) #if defined(CONFIG_LIB_ENVPATH) && !defined(CONFIG_PATH_INITIAL)
(void)setenv("PATH", MOUNTPT, 1); (void)setenv("PATH", MOUNTPT, 1);
#endif #endif
@ -325,7 +325,7 @@ int spawn_main(int argc, char *argv[])
* search the PATH variable to find the executable. * search the PATH variable to find the executable.
*/ */
#ifdef CONFIG_BINFMT_EXEPATH #ifdef CONFIG_LIB_ENVPATH
filepath = g_hello; filepath = g_hello;
#else #else
snprintf(fullpath, 128, "%s/%s", MOUNTPT, g_hello); snprintf(fullpath, 128, "%s/%s", MOUNTPT, g_hello);
@ -422,7 +422,7 @@ int spawn_main(int argc, char *argv[])
* search the PATH variable to find the executable. * search the PATH variable to find the executable.
*/ */
#ifdef CONFIG_BINFMT_EXEPATH #ifdef CONFIG_LIB_ENVPATH
filepath = g_redirect; filepath = g_redirect;
#else #else
snprintf(fullpath, 128, "%s/%s", MOUNTPT, g_redirect); snprintf(fullpath, 128, "%s/%s", MOUNTPT, g_redirect);