548620c18
Denys Vlasenko
2016-12-08
Subject
randomconfig fixes
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
archival/bbunzip.c +6 -1archival/libarchive/Kbuild.src +8 -1include/libbb.h +10 -2libbb/Kbuild.src +5 -0runit/sv.c +1 -1
archival/bbunzip.c+6 -1
| @@ -9,6 +9,8 @@ | |
| /* lzop_main() uses bbunpack(), need this: */ | |
| //kbuild:lib-$(CONFIG_LZOP) += bbunzip.o | |
| + | /* bzip2_main() too: */ |
| + | //kbuild:lib-$(CONFIG_BZIP2) += bbunzip.o |
| /* Note: must be kept in sync with archival/lzop.c */ | |
| enum { | |
| @@ -190,7 +192,10 @@ int FAST_FUNC bbunpack(char **argv, | |
| return exitcode; | |
| } | |
| - | #if ENABLE_UNCOMPRESS || ENABLE_BUNZIP2 || ENABLE_UNLZMA || ENABLE_UNXZ |
| + | #if ENABLE_UNCOMPRESS \ |
| + | || ENABLE_BUNZIP2 || ENABLE_BZCAT \ |
| + | || ENABLE_UNLZMA || ENABLE_LZCAT || ENABLE_LZMA \ |
| + | || ENABLE_UNXZ || ENABLE_XZCAT || ENABLE_XZ |
| static | |
| char* FAST_FUNC make_new_name_generic(char *filename, const char *expected_ext) | |
| { | |
archival/libarchive/Kbuild.src+8 -1
| @@ -48,16 +48,23 @@ lib-$(CONFIG_CPIO) += get_header_cpio.o | |
| lib-$(CONFIG_TAR) += get_header_tar.o unsafe_prefix.o | |
| lib-$(CONFIG_FEATURE_TAR_TO_COMMAND) += data_extract_to_command.o | |
| lib-$(CONFIG_LZOP) += lzo1x_1.o lzo1x_1o.o lzo1x_d.o | |
| + | lib-$(CONFIG_UNLZOP) += lzo1x_1.o lzo1x_1o.o lzo1x_d.o |
| + | lib-$(CONFIG_LZOPCAT) += lzo1x_1.o lzo1x_1o.o lzo1x_d.o |
| lib-$(CONFIG_LZOP_COMPR_HIGH) += lzo1x_9x.o | |
| lib-$(CONFIG_BUNZIP2) += open_transformer.o decompress_bunzip2.o | |
| + | lib-$(CONFIG_BZCAT) += open_transformer.o decompress_bunzip2.o |
| lib-$(CONFIG_UNLZMA) += open_transformer.o decompress_unlzma.o | |
| + | lib-$(CONFIG_LZCAT) += open_transformer.o decompress_unlzma.o |
| + | lib-$(CONFIG_LZMA) += open_transformer.o decompress_unlzma.o |
| lib-$(CONFIG_UNXZ) += open_transformer.o decompress_unxz.o | |
| + | lib-$(CONFIG_XZCAT) += open_transformer.o decompress_unxz.o |
| + | lib-$(CONFIG_XZ) += open_transformer.o decompress_unxz.o |
| lib-$(CONFIG_GUNZIP) += open_transformer.o decompress_gunzip.o | |
| + | lib-$(CONFIG_ZCAT) += open_transformer.o decompress_gunzip.o |
| lib-$(CONFIG_UNCOMPRESS) += open_transformer.o decompress_uncompress.o | |
| lib-$(CONFIG_UNZIP) += open_transformer.o decompress_gunzip.o unsafe_prefix.o | |
| lib-$(CONFIG_RPM2CPIO) += open_transformer.o decompress_gunzip.o get_header_cpio.o | |
| lib-$(CONFIG_RPM) += open_transformer.o decompress_gunzip.o get_header_cpio.o | |
| - | |
| lib-$(CONFIG_GZIP) += open_transformer.o | |
| lib-$(CONFIG_BZIP2) += open_transformer.o | |
| lib-$(CONFIG_LZOP) += open_transformer.o | |
include/libbb.h+10 -2
| @@ -1191,8 +1191,16 @@ int bb_cat(char** argv); | |
| /* If shell needs them, they exist even if not enabled as applets */ | |
| int echo_main(int argc, char** argv) IF_ECHO(MAIN_EXTERNALLY_VISIBLE); | |
| int printf_main(int argc, char **argv) IF_PRINTF(MAIN_EXTERNALLY_VISIBLE); | |
| - | int test_main(int argc, char **argv) IF_TEST(MAIN_EXTERNALLY_VISIBLE); |
| - | int kill_main(int argc, char **argv) IF_KILL(MAIN_EXTERNALLY_VISIBLE); |
| + | int test_main(int argc, char **argv) |
| + | #if ENABLE_TEST || ENABLE_TEST1 || ENABLE_TEST2 |
| + | MAIN_EXTERNALLY_VISIBLE |
| + | #endif |
| + | ; |
| + | int kill_main(int argc, char **argv) |
| + | #if ENABLE_KILL || ENABLE_KILLALL || ENABLE_KILLALL5 |
| + | MAIN_EXTERNALLY_VISIBLE |
| + | #endif |
| + | ; |
| /* Similar, but used by chgrp, not shell */ | |
| int chown_main(int argc, char **argv) IF_CHOWN(MAIN_EXTERNALLY_VISIBLE); | |
| /* Used by ftpd */ | |
libbb/Kbuild.src+5 -0
| @@ -132,6 +132,7 @@ lib-$(CONFIG_TFTPD) += udp_io.o | |
| lib-$(CONFIG_TCPSVD) += udp_io.o | |
| lib-$(CONFIG_UDPSVD) += udp_io.o | |
| lib-$(CONFIG_TRACEROUTE) += udp_io.o | |
| + | lib-$(CONFIG_TRACEROUTE6) += udp_io.o |
| lib-$(CONFIG_LOSETUP) += loop.o | |
| lib-$(CONFIG_FEATURE_MOUNT_LOOP) += loop.o | |
| @@ -156,6 +157,7 @@ lib-$(CONFIG_FEATURE_FTP_AUTHENTICATION) += pw_encrypt.o | |
| lib-$(CONFIG_DF) += find_mount_point.o | |
| lib-$(CONFIG_MKFS_MINIX) += find_mount_point.o | |
| lib-$(CONFIG_MKFS_EXT2) += find_mount_point.o | |
| + | lib-$(CONFIG_MKE2FS) += find_mount_point.o |
| lib-$(CONFIG_MKFS_REISER) += find_mount_point.o | |
| lib-$(CONFIG_FSCK_MINIX) += find_mount_point.o | |
| lib-$(CONFIG_MOUNT) += find_mount_point.o | |
| @@ -168,6 +170,7 @@ lib-$(CONFIG_MPSTAT) += get_cpu_count.o | |
| lib-$(CONFIG_POWERTOP) += get_cpu_count.o | |
| lib-$(CONFIG_PING) += inet_cksum.o | |
| + | lib-$(CONFIG_PING6) += inet_cksum.o |
| lib-$(CONFIG_TRACEROUTE) += inet_cksum.o | |
| lib-$(CONFIG_TRACEROUTE6) += inet_cksum.o | |
| lib-$(CONFIG_UDHCPC) += inet_cksum.o | |
| @@ -181,6 +184,8 @@ lib-$(CONFIG_UDHCPD) += inet_cksum.o | |
| lib-$(CONFIG_AWK) += xregcomp.o | |
| lib-$(CONFIG_SED) += xregcomp.o | |
| lib-$(CONFIG_GREP) += xregcomp.o | |
| + | lib-$(CONFIG_EGREP) += xregcomp.o |
| + | lib-$(CONFIG_FGREP) += xregcomp.o |
| lib-$(CONFIG_EXPR) += xregcomp.o | |
| lib-$(CONFIG_MDEV) += xregcomp.o | |
| lib-$(CONFIG_LESS) += xregcomp.o | |
runit/sv.c+1 -1
| @@ -175,7 +175,7 @@ Exit Codes | |
| //config: It is comaptible with daemontools command with the same name. | |
| //applet:IF_SV(APPLET(sv, BB_DIR_USR_BIN, BB_SUID_DROP)) | |
| - | //applet:IF_SV(APPLET(svc, BB_DIR_USR_BIN, BB_SUID_DROP)) |
| + | //applet:IF_SVC(APPLET(svc, BB_DIR_USR_BIN, BB_SUID_DROP)) |
| //kbuild:lib-$(CONFIG_SV) += sv.o | |
| //kbuild:lib-$(CONFIG_SVC) += sv.o | |