summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko2017-07-03 01:22:13 +0200
committerDenys Vlasenko2017-07-03 01:22:13 +0200
commit4ee824f6ba3f35228f1c48e21681aa532a7dc23f (patch)
tree75011c43b93dc3deb5587f1a6b9424f3bef5dd03
parent48c803a2064d5ae24540760f13a21f092247bd82 (diff)
downloadbusybox-4ee824f6ba3f35228f1c48e21681aa532a7dc23f.zip
busybox-4ee824f6ba3f35228f1c48e21681aa532a7dc23f.tar.gz
randomconfig fixes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--networking/udhcp/common.h2
-rw-r--r--networking/udhcp/packet.c2
-rw-r--r--shell/hush.c8
3 files changed, 9 insertions, 3 deletions
diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h
index 6907e7f..a9c23a1 100644
--- a/networking/udhcp/common.h
+++ b/networking/udhcp/common.h
@@ -295,7 +295,9 @@ int FAST_FUNC udhcp_str2optset(const char *str,
const struct dhcp_optflag *optflags,
const char *option_strings);
+#if ENABLE_UDHCPC || ENABLE_UDHCPD
void udhcp_init_header(struct dhcp_packet *packet, char type) FAST_FUNC;
+#endif
int udhcp_recv_kernel_packet(struct dhcp_packet *packet, int fd) FAST_FUNC;
diff --git a/networking/udhcp/packet.c b/networking/udhcp/packet.c
index 0a31f26..9e1b46d 100644
--- a/networking/udhcp/packet.c
+++ b/networking/udhcp/packet.c
@@ -12,6 +12,7 @@
#include <netinet/if_ether.h>
#include <netpacket/packet.h>
+#if ENABLE_UDHCPC || ENABLE_UDHCPD
void FAST_FUNC udhcp_init_header(struct dhcp_packet *packet, char type)
{
memset(packet, 0, sizeof(*packet));
@@ -29,6 +30,7 @@ void FAST_FUNC udhcp_init_header(struct dhcp_packet *packet, char type)
packet->options[0] = DHCP_END;
udhcp_add_simple_option(packet, DHCP_MESSAGE_TYPE, type);
}
+#endif
#if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 2
void FAST_FUNC udhcp_dump_packet(struct dhcp_packet *packet)
diff --git a/shell/hush.c b/shell/hush.c
index 125463a..f5c1e5b 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -331,9 +331,9 @@
/* Separate defines document which part of code implements what */
#define BASH_PATTERN_SUBST ENABLE_HUSH_BASH_COMPAT
#define BASH_SUBSTR ENABLE_HUSH_BASH_COMPAT
-#define BASH_TEST2 ENABLE_HUSH_BASH_COMPAT
#define BASH_SOURCE ENABLE_HUSH_BASH_COMPAT
#define BASH_HOSTNAME_VAR ENABLE_HUSH_BASH_COMPAT
+#define BASH_TEST2 (ENABLE_HUSH_BASH_COMPAT && ENABLE_HUSH_TEST)
/* Build knobs */
@@ -1457,7 +1457,7 @@ static void restore_redirected_FILEs(void)
fl = fl->next;
}
}
-#if ENABLE_FEATURE_SH_STANDALONE
+#if ENABLE_FEATURE_SH_STANDALONE && BB_MMU
static void close_all_FILE_list(void)
{
struct FILE_list *fl = G.FILE_list;
@@ -8575,8 +8575,9 @@ int hush_main(int argc, char **argv)
optarg++;
empty_trap_mask = bb_strtoull(optarg, &optarg, 16);
if (empty_trap_mask != 0) {
- int sig;
+ IF_HUSH_TRAP(int sig;)
install_special_sighandlers();
+# if ENABLE_HUSH_TRAP
G_traps = xzalloc(sizeof(G_traps[0]) * NSIG);
for (sig = 1; sig < NSIG; sig++) {
if (empty_trap_mask & (1LL << sig)) {
@@ -8584,6 +8585,7 @@ int hush_main(int argc, char **argv)
install_sighandler(sig, SIG_IGN);
}
}
+# endif
}
# if ENABLE_HUSH_LOOPS
optarg++;