wok diff busybox/stuff/busybox-1.18.1-cpio.u @ rev 7783

Up: e2fsprogs to 1.41.14.
author Christopher Rogers <slaxemulator@gmail.com>
date Thu Dec 23 15:36:53 2010 +0000 (2010-12-23)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/busybox/stuff/busybox-1.18.1-cpio.u	Thu Dec 23 15:36:53 2010 +0000
     1.3 @@ -0,0 +1,21 @@
     1.4 +Enable filters for cpio -i and cpio -t
     1.5 +--- busybox-1.18.1/archival/cpio.c
     1.6 ++++ busybox-1.18.1/archival/cpio.c
     1.7 +@@ -309,7 +309,7 @@
     1.8 + 
     1.9 + #if !ENABLE_FEATURE_CPIO_O
    1.10 + 	/* no parameters */
    1.11 +-	opt_complementary = "=0";
    1.12 ++	// -i may have parameters //opt_complementary = "=0";
    1.13 + 	opt = getopt32(argv, OPTION_STR, &cpio_filename);
    1.14 + 	argv += optind;
    1.15 + 	if (opt & CPIO_OPT_FILE) { /* -F */
    1.16 +@@ -317,7 +317,7 @@
    1.17 + 	}
    1.18 + #else
    1.19 + 	/* _exactly_ one parameter for -p, thus <= 1 param if -p is allowed */
    1.20 +-	opt_complementary = ENABLE_FEATURE_CPIO_P ? "?1" : "=0";
    1.21 ++	// -i may have parameters //opt_complementary = ENABLE_FEATURE_CPIO_P ? "?1" : "=0";
    1.22 + 	opt = getopt32(argv, OPTION_STR "oH:" IF_FEATURE_CPIO_P("p"), &cpio_filename, &cpio_fmt);
    1.23 + 	argv += optind;
    1.24 + 	if ((opt & (CPIO_OPT_FILE|CPIO_OPT_CREATE)) == CPIO_OPT_FILE) { /* -F without -o */