win32: special treatment for PATH

The PATH shell variable is a special case.  It can be exported to
the environment where it might be interpreted by native applications
which assume the separator is ';'.  Hence:

- require that the separator used in PATH is ';'
- enforce this by intercepting calls to setvareq() that set PATH
  and adjusting its value if necessary.

As a result of this the code to parse PATH can be simplified by
replacing the hardcoded Unix ':' path separator by the platform-
dependent macro PATH_SEP.

The MANPATH variable is also required to use ';' as its separator
but since it's less likely to be used this isn't enforced.

2 files changed, 6 insertions, 1 deletions

diff --git a/include/libbb.h b/include/libbb.h
index a17da9c1f..8b18782c8 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -2130,7 +2130,13 @@ extern const char bb_busybox_exec_path[] ALIGN1;
 #ifndef BB_ADDITIONAL_PATH
 #define BB_ADDITIONAL_PATH ""
 #endif
+#if !ENABLE_PLATFORM_MINGW32
 #define BB_PATH_ROOT_PATH "PATH=/sbin:/usr/sbin:/bin:/usr/bin" BB_ADDITIONAL_PATH
+#define PATH_SEP ':'
+#else
+#define BB_PATH_ROOT_PATH "PATH=/sbin;/usr/sbin;/bin;/usr/bin" BB_ADDITIONAL_PATH
+#define PATH_SEP ';'
+#endif
 extern const char bb_PATH_root_path[] ALIGN1; /* BB_PATH_ROOT_PATH */
 #define bb_default_root_path (bb_PATH_root_path + sizeof("PATH"))
 /* util-linux manpage says /sbin:/bin:/usr/sbin:/usr/bin,
diff --git a/include/mingw.h b/include/mingw.h
index 8a695d2d2..cef53a7c9 100644
--- a/include/mingw.h
+++ b/include/mingw.h
@@ -443,7 +443,6 @@ int mingw_execve(const char *cmd, char *const *argv, char *const *envp);
 #define execve mingw_execve
 #define execv mingw_execv
 
-const char * next_path_sep(const char *path);
 #define has_dos_drive_prefix(path) (isalpha(*(path)) && (path)[1] == ':')
 #define is_absolute_path(path) ((path)[0] == '/' || (path)[0] == '\\' || has_dos_drive_prefix(path))