diff options
author | Ron Yorston <rmy@pobox.com> | 2020-02-18 09:11:07 +0000 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2020-02-18 10:16:24 +0000 |
commit | d7a88599bd88035b1eeae276140f0ce9e405c271 (patch) | |
tree | 88ce3b05250cdb046130d5c443db3f03adff95c5 /include | |
parent | 56d1d4639c705537a8661ff0005392b82b0ee039 (diff) | |
parent | 22c75924daa41b7ea097796afd4baafa2fc99d05 (diff) | |
download | busybox-w32-d7a88599bd88035b1eeae276140f0ce9e405c271.tar.gz busybox-w32-d7a88599bd88035b1eeae276140f0ce9e405c271.tar.bz2 busybox-w32-d7a88599bd88035b1eeae276140f0ce9e405c271.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'include')
-rw-r--r-- | include/libbb.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/libbb.h b/include/libbb.h index cbb178c0b..8979665b2 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
@@ -2210,9 +2210,11 @@ extern const char bb_busybox_exec_path[] ALIGN1; | |||
2210 | #if !ENABLE_PLATFORM_MINGW32 | 2210 | #if !ENABLE_PLATFORM_MINGW32 |
2211 | #define BB_PATH_ROOT_PATH "PATH=/sbin:/usr/sbin:/bin:/usr/bin" BB_ADDITIONAL_PATH | 2211 | #define BB_PATH_ROOT_PATH "PATH=/sbin:/usr/sbin:/bin:/usr/bin" BB_ADDITIONAL_PATH |
2212 | #define PATH_SEP ':' | 2212 | #define PATH_SEP ':' |
2213 | #define PATH_SEP_STR ":" | ||
2213 | #else | 2214 | #else |
2214 | #define BB_PATH_ROOT_PATH "PATH=/sbin;/usr/sbin;/bin;/usr/bin" BB_ADDITIONAL_PATH | 2215 | #define BB_PATH_ROOT_PATH "PATH=/sbin;/usr/sbin;/bin;/usr/bin" BB_ADDITIONAL_PATH |
2215 | #define PATH_SEP ';' | 2216 | #define PATH_SEP ';' |
2217 | #define PATH_SEP_STR ";" | ||
2216 | #endif | 2218 | #endif |
2217 | extern const char bb_PATH_root_path[] ALIGN1; /* BB_PATH_ROOT_PATH */ | 2219 | extern const char bb_PATH_root_path[] ALIGN1; /* BB_PATH_ROOT_PATH */ |
2218 | #define bb_default_root_path (bb_PATH_root_path + sizeof("PATH")) | 2220 | #define bb_default_root_path (bb_PATH_root_path + sizeof("PATH")) |