Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-05-28 21:41:30 +00:00
Code Issues Projects Releases Wiki Activity

randomconfig fixes

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-07-03 01:22:13 +02:00
parent 48c803a206
commit 4ee824f6ba
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
networking/udhcp/common.h
View File

@ -295,7 +295,9 @@ int FAST_FUNC udhcp_str2optset(const char *str,
const struct dhcp_optflag *optflags, const struct dhcp_optflag *optflags,
const char *option_strings); const char *option_strings);
#if ENABLE_UDHCPC || ENABLE_UDHCPD
void udhcp_init_header(struct dhcp_packet *packet, char type) FAST_FUNC; 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; int udhcp_recv_kernel_packet(struct dhcp_packet *packet, int fd) FAST_FUNC;

2
networking/udhcp/packet.c
View File

@ -12,6 +12,7 @@
#include <netinet/if_ether.h> #include <netinet/if_ether.h>
#include <netpacket/packet.h> #include <netpacket/packet.h>
#if ENABLE_UDHCPC || ENABLE_UDHCPD
void FAST_FUNC udhcp_init_header(struct dhcp_packet *packet, char type) void FAST_FUNC udhcp_init_header(struct dhcp_packet *packet, char type)
{ {
memset(packet, 0, sizeof(*packet)); 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; packet->options[0] = DHCP_END;
udhcp_add_simple_option(packet, DHCP_MESSAGE_TYPE, type); udhcp_add_simple_option(packet, DHCP_MESSAGE_TYPE, type);
} }
#endif
#if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 2 #if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 2
void FAST_FUNC udhcp_dump_packet(struct dhcp_packet *packet) void FAST_FUNC udhcp_dump_packet(struct dhcp_packet *packet)

8
shell/hush.c
View File

@ -331,9 +331,9 @@
/* Separate defines document which part of code implements what */ /* Separate defines document which part of code implements what */
#define BASH_PATTERN_SUBST ENABLE_HUSH_BASH_COMPAT #define BASH_PATTERN_SUBST ENABLE_HUSH_BASH_COMPAT
#define BASH_SUBSTR 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_SOURCE ENABLE_HUSH_BASH_COMPAT
#define BASH_HOSTNAME_VAR ENABLE_HUSH_BASH_COMPAT #define BASH_HOSTNAME_VAR ENABLE_HUSH_BASH_COMPAT
#define BASH_TEST2 (ENABLE_HUSH_BASH_COMPAT && ENABLE_HUSH_TEST)
/* Build knobs */ /* Build knobs */
@ -1457,7 +1457,7 @@ static void restore_redirected_FILEs(void)
fl = fl->next; fl = fl->next;
} }
} }
#if ENABLE_FEATURE_SH_STANDALONE #if ENABLE_FEATURE_SH_STANDALONE && BB_MMU
static void close_all_FILE_list(void) static void close_all_FILE_list(void)
{ {
struct FILE_list *fl = G.FILE_list; struct FILE_list *fl = G.FILE_list;
@ -8575,8 +8575,9 @@ int hush_main(int argc, char **argv)
optarg++; optarg++;
empty_trap_mask = bb_strtoull(optarg, &optarg, 16); empty_trap_mask = bb_strtoull(optarg, &optarg, 16);
if (empty_trap_mask != 0) { if (empty_trap_mask != 0) {
int sig; IF_HUSH_TRAP(int sig;)
install_special_sighandlers(); install_special_sighandlers();
# if ENABLE_HUSH_TRAP
G_traps = xzalloc(sizeof(G_traps[0]) * NSIG); G_traps = xzalloc(sizeof(G_traps[0]) * NSIG);
for (sig = 1; sig < NSIG; sig++) { for (sig = 1; sig < NSIG; sig++) {
if (empty_trap_mask & (1LL << sig)) { if (empty_trap_mask & (1LL << sig)) {
@ -8584,6 +8585,7 @@ int hush_main(int argc, char **argv)
install_sighandler(sig, SIG_IGN); install_sighandler(sig, SIG_IGN);
} }
} }
# endif
} }
# if ENABLE_HUSH_LOOPS # if ENABLE_HUSH_LOOPS
optarg++; optarg++;