summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2009-07-15 16:27:47 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2009-07-15 16:27:47 (GMT)
commit7dd0ce49531b6340950b4a3eedbef1c958a475d9 (patch)
tree5f220482aeb6c63b761a62fb12af37c6441b6082
parent0ad438b12a97159c43c9bfc75a4ae4873ecf9bf9 (diff)
downloadbusybox-7dd0ce49531b6340950b4a3eedbef1c958a475d9.tar.gz
busybox-7dd0ce49531b6340950b4a3eedbef1c958a475d9.tar.bz2
randomconfig fixes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--libbb/Kbuild22
-rw-r--r--libbb/lineedit.c5
2 files changed, 18 insertions, 9 deletions
diff --git a/libbb/Kbuild b/libbb/Kbuild
index efd04e3..8c7a189 100644
--- a/libbb/Kbuild
+++ b/libbb/Kbuild
@@ -116,30 +116,36 @@ lib-y += xgethostbyname.o
lib-y += xreadlink.o
lib-y += xrealloc_vector.o
-# conditionally compiled objects:
-lib-$(CONFIG_FEATURE_MOUNT_LOOP) += loop.o
-lib-$(CONFIG_LOSETUP) += loop.o
+# A mix of optimizations (why build stuff we know won't be used)
+# and objects which may fail to build (SELinux on selinux-less system)
+lib-$(CONFIG_SELINUX) += selinux_common.o
lib-$(CONFIG_FEATURE_MTAB_SUPPORT) += mtab.o
+lib-$(CONFIG_FEATURE_ASSUME_UNICODE) += unicode.o
+lib-$(CONFIG_FEATURE_CHECK_NAMES) += die_if_bad_username.o
+
+lib-$(CONFIG_LOSETUP) += loop.o
+lib-$(CONFIG_FEATURE_MOUNT_LOOP) += loop.o
+
lib-$(CONFIG_ADDGROUP) += update_passwd.o
lib-$(CONFIG_ADDUSER) += update_passwd.o
lib-$(CONFIG_DELGROUP) += update_passwd.o
lib-$(CONFIG_DELUSER) += update_passwd.o
+
lib-$(CONFIG_PASSWD) += pw_encrypt.o update_passwd.o
lib-$(CONFIG_CHPASSWD) += pw_encrypt.o update_passwd.o
lib-$(CONFIG_CRYPTPW) += pw_encrypt.o
lib-$(CONFIG_SULOGIN) += pw_encrypt.o
-lib-$(CONFIG_FEATURE_HTTPD_AUTH_MD5) += pw_encrypt.o
lib-$(CONFIG_VLOCK) += pw_encrypt.o correct_password.o
lib-$(CONFIG_SU) += pw_encrypt.o correct_password.o
lib-$(CONFIG_LOGIN) += pw_encrypt.o correct_password.o
+lib-$(CONFIG_FEATURE_HTTPD_AUTH_MD5) += pw_encrypt.o
+
lib-$(CONFIG_DF) += find_mount_point.o
lib-$(CONFIG_MKFS_MINIX) += find_mount_point.o
-lib-$(CONFIG_SELINUX) += selinux_common.o
+lib-$(CONFIG_FSCK_MINIX) += find_mount_point.o
+
lib-$(CONFIG_HWCLOCK) += rtc.o
lib-$(CONFIG_RTCWAKE) += rtc.o
-lib-$(CONFIG_FEATURE_CHECK_NAMES) += die_if_bad_username.o
-
-lib-$(CONFIG_FEATURE_ASSUME_UNICODE) += unicode.o
# We shouldn't build xregcomp.c if we don't need it - this ensures we don't
# require regex.h to be in the include dir even if we don't need it thereby
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 8b7ff4f..5ebea70 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -233,11 +233,13 @@ static size_t load_string(const char *src, int maxsize)
safe_strncpy(command_ps, src, maxsize);
return strlen(command_ps);
}
+# if ENABLE_FEATURE_TAB_COMPLETION
static void save_string(char *dst, int maxsize)
{
safe_strncpy(dst, command_ps, maxsize);
}
-#define BB_PUTCHAR(c) bb_putchar(c)
+# endif
+# define BB_PUTCHAR(c) bb_putchar(c)
#endif
@@ -683,6 +685,7 @@ static void exe_n_cwd_tab_completion(char *command, int type)
#undef dirbuf
}
+//FIXME: HUH??? How about Unicode?
#define QUOT (UCHAR_MAX+1)
#define collapse_pos(is, in) do { \