From 3432acf7c414085ad4dbea6ad06708f9a6a24690 Mon Sep 17 00:00:00 2001 From: anchao Date: Thu, 8 Nov 2018 07:31:52 -0600 Subject: [PATCH] apps/: Rename BINFMT_EXEPATH to LIB_ENVPATH. --- examples/elf/elf_main.c | 6 +++--- examples/nxflat/nxflat_main.c | 6 +++--- examples/posix_spawn/spawn_main.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/elf/elf_main.c b/examples/elf/elf_main.c index 385b733e0..9dfd6e1b8 100644 --- a/examples/elf/elf_main.c +++ b/examples/elf/elf_main.c @@ -158,7 +158,7 @@ static unsigned int g_mmstep; /* Memory Usage at beginning of test step */ static const char delimiter[] = "****************************************************************************"; -#ifndef CONFIG_BINFMT_EXEPATH +#ifndef CONFIG_LIB_ENVPATH static char fullpath[128]; #endif @@ -364,7 +364,7 @@ int elf_main(int argc, char *argv[]) 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 * already been set? If YES and NO, then set the PATH variable to * the ROMFS mountpoint. @@ -391,7 +391,7 @@ int elf_main(int argc, char *argv[]) * search the PATH variable to find the executable. */ -#ifdef CONFIG_BINFMT_EXEPATH +#ifdef CONFIG_LIB_ENVPATH filename = dirlist[i]; #else snprintf(fullpath, 128, "%s/%s", MOUNTPT, dirlist[i]); diff --git a/examples/nxflat/nxflat_main.c b/examples/nxflat/nxflat_main.c index d6985c111..8845f348e 100644 --- a/examples/nxflat/nxflat_main.c +++ b/examples/nxflat/nxflat_main.c @@ -131,7 +131,7 @@ static const char delimiter[] = "****************************************************************************"; -#ifndef CONFIG_BINFMT_EXEPATH +#ifndef CONFIG_LIB_ENVPATH static char fullpath[128]; #endif @@ -189,7 +189,7 @@ int nxflat_main(int argc, char *argv[]) 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 * already been set? If YES and NO, then set the PATH variable to * the ROMFS mountpoint. @@ -216,7 +216,7 @@ int nxflat_main(int argc, char *argv[]) * search the PATH variable to find the executable. */ -#ifdef CONFIG_BINFMT_EXEPATH +#ifdef CONFIG_LIB_ENVPATH filename = dirlist[i]; #else snprintf(fullpath, 128, "%s/%s", MOUNTPT, dirlist[i]); diff --git a/examples/posix_spawn/spawn_main.c b/examples/posix_spawn/spawn_main.c index 73469e309..f59fd9ec2 100644 --- a/examples/posix_spawn/spawn_main.c +++ b/examples/posix_spawn/spawn_main.c @@ -279,7 +279,7 @@ int spawn_main(int argc, char *argv[]) * 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); #endif @@ -325,7 +325,7 @@ int spawn_main(int argc, char *argv[]) * search the PATH variable to find the executable. */ -#ifdef CONFIG_BINFMT_EXEPATH +#ifdef CONFIG_LIB_ENVPATH filepath = g_hello; #else 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. */ -#ifdef CONFIG_BINFMT_EXEPATH +#ifdef CONFIG_LIB_ENVPATH filepath = g_redirect; #else snprintf(fullpath, 128, "%s/%s", MOUNTPT, g_redirect);