4ee824f6b
Denys Vlasenko
2017-07-03
Subject
randomconfig fixes
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
networking/udhcp/common.h+2 -0
| @@ -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; | |
networking/udhcp/packet.c+2 -0
| @@ -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) | |
shell/hush.c+5 -3
| @@ -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++; | |