mirror of
https://github.com/sheumann/hush.git
synced 2024-09-12 00:55:11 +00:00
assorted fixes for breakage found by randomconfig
This commit is contained in:
parent
7f175ccbc3
commit
856be770a6
@ -48,6 +48,9 @@ static const char usage_messages[] ALIGN1 = ""
|
|||||||
#include "applets.h"
|
#include "applets.h"
|
||||||
/* The -1 arises because of the {0,NULL,0,-1} entry. */
|
/* The -1 arises because of the {0,NULL,0,-1} entry. */
|
||||||
|
|
||||||
|
#if ENABLE_FEATURE_SH_STANDALONE
|
||||||
|
const unsigned short NUM_APPLETS = ARRAY_SIZE(applets);
|
||||||
|
#endif
|
||||||
const struct bb_applet *current_applet;
|
const struct bb_applet *current_applet;
|
||||||
const char *applet_name ATTRIBUTE_EXTERNALLY_VISIBLE;
|
const char *applet_name ATTRIBUTE_EXTERNALLY_VISIBLE;
|
||||||
#if !BB_MMU
|
#if !BB_MMU
|
||||||
|
@ -58,6 +58,7 @@ lib-$(CONFIG_GUNZIP) += $(GUNZIP_FILES)
|
|||||||
lib-$(CONFIG_FEATURE_GUNZIP_UNCOMPRESS) += decompress_uncompress.o
|
lib-$(CONFIG_FEATURE_GUNZIP_UNCOMPRESS) += decompress_uncompress.o
|
||||||
lib-$(CONFIG_RPM2CPIO) += $(GUNZIP_FILES) get_header_cpio.o
|
lib-$(CONFIG_RPM2CPIO) += $(GUNZIP_FILES) get_header_cpio.o
|
||||||
lib-$(CONFIG_RPM) += $(GUNZIP_FILES) get_header_cpio.o
|
lib-$(CONFIG_RPM) += $(GUNZIP_FILES) get_header_cpio.o
|
||||||
|
lib-$(CONFIG_FEATURE_RPM_BZ2) += decompress_bunzip2.o
|
||||||
lib-$(CONFIG_TAR) += get_header_tar.o
|
lib-$(CONFIG_TAR) += get_header_tar.o
|
||||||
lib-$(CONFIG_FEATURE_TAR_BZIP2) += decompress_bunzip2.o get_header_tar_bz2.o
|
lib-$(CONFIG_FEATURE_TAR_BZIP2) += decompress_bunzip2.o get_header_tar_bz2.o
|
||||||
lib-$(CONFIG_FEATURE_TAR_LZMA) += decompress_unlzma.o get_header_tar_lzma.o
|
lib-$(CONFIG_FEATURE_TAR_LZMA) += decompress_unlzma.o get_header_tar_lzma.o
|
||||||
@ -66,3 +67,4 @@ lib-$(CONFIG_FEATURE_TAR_COMPRESS) += decompress_uncompress.o
|
|||||||
lib-$(CONFIG_UNCOMPRESS) += decompress_uncompress.o
|
lib-$(CONFIG_UNCOMPRESS) += decompress_uncompress.o
|
||||||
lib-$(CONFIG_UNZIP) += $(GUNZIP_FILES)
|
lib-$(CONFIG_UNZIP) += $(GUNZIP_FILES)
|
||||||
lib-$(CONFIG_FEATURE_COMPRESS_USAGE) += decompress_bunzip2.o
|
lib-$(CONFIG_FEATURE_COMPRESS_USAGE) += decompress_bunzip2.o
|
||||||
|
|
||||||
|
@ -2420,14 +2420,17 @@ static int file_insert(const char * fn, char *p
|
|||||||
file_modified++;
|
file_modified++;
|
||||||
close(fd);
|
close(fd);
|
||||||
fi0:
|
fi0:
|
||||||
if (ENABLE_FEATURE_VI_READONLY && update_ro_status
|
#if ENABLE_FEATURE_VI_READONLY
|
||||||
|
if (update_ro_status
|
||||||
&& ((access(fn, W_OK) < 0) ||
|
&& ((access(fn, W_OK) < 0) ||
|
||||||
/* root will always have access()
|
/* root will always have access()
|
||||||
* so we check fileperms too */
|
* so we check fileperms too */
|
||||||
!(statbuf.st_mode & (S_IWUSR | S_IWGRP | S_IWOTH))))
|
!(statbuf.st_mode & (S_IWUSR | S_IWGRP | S_IWOTH))
|
||||||
{
|
)
|
||||||
|
) {
|
||||||
SET_READONLY_FILE(readonly_mode);
|
SET_READONLY_FILE(readonly_mode);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
return cnt;
|
return cnt;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -631,6 +631,7 @@ static void process_config_line(const char *line, unsigned long *event_mask)
|
|||||||
last_config->next = new;
|
last_config->next = new;
|
||||||
last_config = new;
|
last_config = new;
|
||||||
return;
|
return;
|
||||||
|
|
||||||
process_config_line_err:
|
process_config_line_err:
|
||||||
msg_logger_and_die(LOG_ERR, bb_msg_bad_config, msg , line);
|
msg_logger_and_die(LOG_ERR, bb_msg_bad_config, msg , line);
|
||||||
} /* End Function process_config_line */
|
} /* End Function process_config_line */
|
||||||
@ -644,11 +645,9 @@ static int do_servicing(int fd, unsigned long event_mask)
|
|||||||
{
|
{
|
||||||
ssize_t bytes;
|
ssize_t bytes;
|
||||||
struct devfsd_notify_struct info;
|
struct devfsd_notify_struct info;
|
||||||
unsigned long tmp_event_mask;
|
|
||||||
|
|
||||||
/* Tell devfs what events we care about */
|
/* (void*) cast is only in order to match prototype */
|
||||||
tmp_event_mask = event_mask;
|
xioctl(fd, DEVFSDIOC_SET_EVENT_MASK, (void*)event_mask);
|
||||||
xioctl(fd, DEVFSDIOC_SET_EVENT_MASK, tmp_event_mask);
|
|
||||||
while (!caught_signal) {
|
while (!caught_signal) {
|
||||||
errno = 0;
|
errno = 0;
|
||||||
bytes = read(fd,(char *) &info, sizeof info);
|
bytes = read(fd,(char *) &info, sizeof info);
|
||||||
|
@ -484,12 +484,12 @@ static const struct dhcp_client_t ext_dhcp_clients[] = {
|
|||||||
static int dhcp_up(struct interface_defn_t *ifd, execfn *exec)
|
static int dhcp_up(struct interface_defn_t *ifd, execfn *exec)
|
||||||
{
|
{
|
||||||
#if ENABLE_FEATURE_IFUPDOWN_EXTERNAL_DHCP
|
#if ENABLE_FEATURE_IFUPDOWN_EXTERNAL_DHCP
|
||||||
|
int i;
|
||||||
#if ENABLE_FEATURE_IFUPDOWN_IP
|
#if ENABLE_FEATURE_IFUPDOWN_IP
|
||||||
/* ip doesn't up iface when it configures it (unlike ifconfig) */
|
/* ip doesn't up iface when it configures it (unlike ifconfig) */
|
||||||
if (!execute("ip link set %iface% up", ifd, exec))
|
if (!execute("ip link set %iface% up", ifd, exec))
|
||||||
return 0;
|
return 0;
|
||||||
#endif
|
#endif
|
||||||
int i;
|
|
||||||
for (i = 0; i < ARRAY_SIZE(ext_dhcp_clients); i++) {
|
for (i = 0; i < ARRAY_SIZE(ext_dhcp_clients); i++) {
|
||||||
if (exists_execable(ext_dhcp_clients[i].name))
|
if (exists_execable(ext_dhcp_clients[i].name))
|
||||||
return execute(ext_dhcp_clients[i].startcmd, ifd, exec);
|
return execute(ext_dhcp_clients[i].startcmd, ifd, exec);
|
||||||
|
@ -6,6 +6,10 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
lib-y:=
|
lib-y:=
|
||||||
|
|
||||||
|
lib-$(CONFIG_SLATTACH) += \
|
||||||
|
utils.o
|
||||||
|
|
||||||
lib-$(CONFIG_IP) += \
|
lib-$(CONFIG_IP) += \
|
||||||
ip_parse_common_args.o \
|
ip_parse_common_args.o \
|
||||||
libnetlink.o \
|
libnetlink.o \
|
||||||
|
@ -219,7 +219,9 @@ static unsigned long display_generic(int scr_width)
|
|||||||
char buf[80];
|
char buf[80];
|
||||||
char scrbuf[80];
|
char scrbuf[80];
|
||||||
unsigned long total, used, mfree, shared, buffers, cached;
|
unsigned long total, used, mfree, shared, buffers, cached;
|
||||||
|
#if ENABLE_FEATURE_TOP_DECIMALS || ENABLE_FEATURE_TOP_CPU_GLOBAL_PERCENTS
|
||||||
unsigned total_diff;
|
unsigned total_diff;
|
||||||
|
#endif
|
||||||
|
|
||||||
#if ENABLE_FEATURE_TOP_DECIMALS
|
#if ENABLE_FEATURE_TOP_DECIMALS
|
||||||
/* formats 7 char string (8 with terminating NUL) */
|
/* formats 7 char string (8 with terminating NUL) */
|
||||||
@ -305,7 +307,7 @@ static unsigned long display_generic(int scr_width)
|
|||||||
/* clear screen & go to top */
|
/* clear screen & go to top */
|
||||||
printf(OPT_BATCH_MODE ? "%s\n" : "\e[H\e[J%s\n", scrbuf);
|
printf(OPT_BATCH_MODE ? "%s\n" : "\e[H\e[J%s\n", scrbuf);
|
||||||
|
|
||||||
if (ENABLE_FEATURE_TOP_CPU_GLOBAL_PERCENTS) {
|
#if ENABLE_FEATURE_TOP_CPU_GLOBAL_PERCENTS
|
||||||
/*
|
/*
|
||||||
* xxx% = (jif.xxx - prev_jif.xxx) / (jif.total - prev_jif.total) * 100%
|
* xxx% = (jif.xxx - prev_jif.xxx) / (jif.total - prev_jif.total) * 100%
|
||||||
*/
|
*/
|
||||||
@ -344,7 +346,7 @@ static unsigned long display_generic(int scr_width)
|
|||||||
#undef SHOW_STAT
|
#undef SHOW_STAT
|
||||||
#undef CALC_STAT
|
#undef CALC_STAT
|
||||||
#undef FMT
|
#undef FMT
|
||||||
}
|
#endif
|
||||||
|
|
||||||
/* read load average as a string */
|
/* read load average as a string */
|
||||||
buf[0] = '\0';
|
buf[0] = '\0';
|
||||||
|
@ -154,8 +154,10 @@ int more_main(int argc, char **argv)
|
|||||||
|
|
||||||
/* The user may have resized the terminal.
|
/* The user may have resized the terminal.
|
||||||
* Re-read the dimensions. */
|
* Re-read the dimensions. */
|
||||||
|
#if ENABLE_FEATURE_USE_TERMIOS
|
||||||
get_terminal_width_height(cin_fileno, &terminal_width, &terminal_height);
|
get_terminal_width_height(cin_fileno, &terminal_width, &terminal_height);
|
||||||
terminal_height -= 1;
|
terminal_height -= 1;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Crudely convert tabs into spaces, which are
|
/* Crudely convert tabs into spaces, which are
|
||||||
|
Loading…
Reference in New Issue
Block a user