kumquat-buildroot/package/busybox/busybox-1.18.1/busybox-1.18.1-cpio.patch
Peter Korsgaard bd891474cc busybox: 1.18.1 fixes for bzip2 and cpio
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-12-30 08:45:29 +01:00

21 lines
916 B
Diff

diff -urpN busybox-1.18.1/archival/cpio.c busybox-1.18.1-cpio/archival/cpio.c
--- busybox-1.18.1/archival/cpio.c 2010-12-20 01:41:26.000000000 +0100
+++ busybox-1.18.1-cpio/archival/cpio.c 2010-12-26 02:26:38.000000000 +0100
@@ -308,16 +308,12 @@ int cpio_main(int argc UNUSED_PARAM, cha
/* -L makes sense only with -o or -p */
#if !ENABLE_FEATURE_CPIO_O
- /* no parameters */
- opt_complementary = "=0";
opt = getopt32(argv, OPTION_STR, &cpio_filename);
argv += optind;
if (opt & CPIO_OPT_FILE) { /* -F */
xmove_fd(xopen(cpio_filename, O_RDONLY), STDIN_FILENO);
}
#else
- /* _exactly_ one parameter for -p, thus <= 1 param if -p is allowed */
- opt_complementary = ENABLE_FEATURE_CPIO_P ? "?1" : "=0";
opt = getopt32(argv, OPTION_STR "oH:" IF_FEATURE_CPIO_P("p"), &cpio_filename, &cpio_fmt);
argv += optind;
if ((opt & (CPIO_OPT_FILE|CPIO_OPT_CREATE)) == CPIO_OPT_FILE) { /* -F without -o */