Fix POSIX build in standalone shell mode

The conditional compilation to control standalone shell mode was
incorrect when building for POSIX.  This hadn't been noticed before
as it had only been tested in the default configuration where
standalone shell mode is disabled.

3 files changed, 7 insertions, 4 deletions

diff --git a/include/libbb.h b/include/libbb.h
index 96496169d..2f882aa9d 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -1332,9 +1332,10 @@ void run_applet_no_and_exit(int a, const char *name, char **argv) NORETURN FAST_
 #  if ENABLE_FEATURE_PREFER_APPLETS || ENABLE_FEATURE_SH_STANDALONE
 int is_applet_preferred(const char *name, const char *path) FAST_FUNC;
 int find_applet_by_name_with_path(const char *name, const char *path) FAST_FUNC;
-#  else
-#   define is_applet_preferred(n, p) (1)
 #  endif
+# else
+#  define is_applet_preferred(n, p) (1)
+#  define find_applet_by_name_with_path(n, p) find_applet_by_name(n)
 # endif
 #endif
 void show_usage_if_dash_dash_help(int applet_no, char **argv) FAST_FUNC;
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 976a7d87d..13cbb3229 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -974,8 +974,10 @@ static NOINLINE unsigned complete_cmd_dir_file(const char *command, int type)
         if (type == FIND_EXE_ONLY && !dirbuf) {
 # if ENABLE_FEATURE_SH_STANDALONE && NUM_APPLETS != 1
                 const char *p = applet_names;
+#  if ENABLE_PLATFORM_MINGW32
                 const char *shpath = state->flags & WITH_PATH_LOOKUP ?
                                                                 state->path_lookup : NULL;
+#  endif
                 while (*p) {
                         if (strncmp(basecmd, p, baselen) == 0 &&
                                         is_applet_preferred(p, shpath))
diff --git a/shell/ash.c b/shell/ash.c
index e74662d8d..235eb8b7d 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -9106,7 +9106,7 @@ tryexec(IF_FEATURE_SH_STANDALONE(int applet_no,) const char *cmd, char **argv, c
 # else
                 if (APPLET_IS_NOEXEC(applet_no)) {
 # endif
-#if ENABLE_PLATFORM_MINGW32 && !defined(_UCRT)
+#if !ENABLE_PLATFORM_MINGW32 || !defined(_UCRT)
                         /* If building for UCRT move this up into shellexec() to
                          * work around a bug. */
                         clearenv();
@@ -9183,7 +9183,7 @@ static void shellexec(char *prog, char **argv, const char *path, int idx)
         int applet_no = -1; /* used only by FEATURE_SH_STANDALONE */
 
         envp = listvars(VEXPORT, VUNSET, /*strlist:*/ NULL, /*end:*/ NULL);
-#if ENABLE_PLATFORM_MINGW32 && defined(_UCRT)
+#if ENABLE_FEATURE_SH_STANDALONE && ENABLE_PLATFORM_MINGW32 && defined(_UCRT)
         /* Avoid UCRT bug by updating parent's environment and passing a
          * NULL environment pointer to execve(). */
         clearenv();