aboutsummaryrefslogtreecommitdiff
path: root/libbb/messages.c
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2018-02-13 09:44:44 +0000
committerRon Yorston <rmy@pobox.com>2018-02-13 09:44:44 +0000
commitdc19a361bd6c6df30338371532691bbc7f7126bb (patch)
tree1fb2cd646d54b5f8e425c4f11f3e09fc21d1966b /libbb/messages.c
parent096aee2bb468d1ab044de36e176ed1f6c7e3674d (diff)
parent3459024bf404af814cacfe90a0deb719e282ae62 (diff)
downloadbusybox-w32-dc19a361bd6c6df30338371532691bbc7f7126bb.tar.gz
busybox-w32-dc19a361bd6c6df30338371532691bbc7f7126bb.tar.bz2
busybox-w32-dc19a361bd6c6df30338371532691bbc7f7126bb.zip
Merge branch 'busybox' into merge
Diffstat (limited to 'libbb/messages.c')
-rw-r--r--libbb/messages.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/libbb/messages.c b/libbb/messages.c
index 31721a3b3..f5bbd3e32 100644
--- a/libbb/messages.c
+++ b/libbb/messages.c
@@ -6,11 +6,6 @@
6 */ 6 */
7#include "libbb.h" 7#include "libbb.h"
8 8
9/* allow default system PATH to be extended via CFLAGS */
10#ifndef BB_ADDITIONAL_PATH
11#define BB_ADDITIONAL_PATH ""
12#endif
13
14/* allow version to be extended, via CFLAGS */ 9/* allow version to be extended, via CFLAGS */
15#ifndef BB_EXTRA_VERSION 10#ifndef BB_EXTRA_VERSION
16#define BB_EXTRA_VERSION " ("AUTOCONF_TIMESTAMP")" 11#define BB_EXTRA_VERSION " ("AUTOCONF_TIMESTAMP")"
@@ -38,8 +33,7 @@ const char bb_busybox_exec_path[] ALIGN1 = CONFIG_BUSYBOX_EXEC_PATH;
38const char bb_default_login_shell[] ALIGN1 = LIBBB_DEFAULT_LOGIN_SHELL; 33const char bb_default_login_shell[] ALIGN1 = LIBBB_DEFAULT_LOGIN_SHELL;
39/* util-linux manpage says /sbin:/bin:/usr/sbin:/usr/bin, 34/* util-linux manpage says /sbin:/bin:/usr/sbin:/usr/bin,
40 * but I want to save a few bytes here. Check libbb.h before changing! */ 35 * but I want to save a few bytes here. Check libbb.h before changing! */
41const char bb_PATH_root_path[] ALIGN1 = 36const char bb_PATH_root_path[] ALIGN1 = BB_PATH_ROOT_PATH;
42 "PATH=/sbin:/usr/sbin:/bin:/usr/bin" BB_ADDITIONAL_PATH;
43 37
44 38
45//const int const_int_1 = 1; 39//const int const_int_1 = 1;