wok-current rev 7776
busybox: enable filters for cpio -i and cpio -t
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Thu Dec 23 10:37:39 2010 +0100 (2010-12-23) |
parents | fd7062885ec9 |
children | 603ec497379d |
files | busybox/receipt busybox/stuff/busybox-1.18.1-cpio.u |
line diff
1.1 --- a/busybox/receipt Thu Dec 23 01:28:18 2010 +0000 1.2 +++ b/busybox/receipt Thu Dec 23 10:37:39 2010 +0100 1.3 @@ -28,6 +28,7 @@ 1.4 zmodules.u 1.5 printable.u 1.6 cmdline.u 1.7 +cpio.u 1.8 EOT 1.9 cp ../stuff/$PACKAGE-$VERSION.config .config 1.10 make oldconfig
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/busybox/stuff/busybox-1.18.1-cpio.u Thu Dec 23 10:37:39 2010 +0100 2.3 @@ -0,0 +1,21 @@ 2.4 +Enable filters for cpio -i and cpio -t 2.5 +--- busybox-1.18.1/archival/cpio.c 2.6 ++++ busybox-1.18.1/archival/cpio.c 2.7 +@@ -309,7 +309,7 @@ 2.8 + 2.9 + #if !ENABLE_FEATURE_CPIO_O 2.10 + /* no parameters */ 2.11 +- opt_complementary = "=0"; 2.12 ++ // -i may have parameters //opt_complementary = "=0"; 2.13 + opt = getopt32(argv, OPTION_STR, &cpio_filename); 2.14 + argv += optind; 2.15 + if (opt & CPIO_OPT_FILE) { /* -F */ 2.16 +@@ -317,7 +317,7 @@ 2.17 + } 2.18 + #else 2.19 + /* _exactly_ one parameter for -p, thus <= 1 param if -p is allowed */ 2.20 +- opt_complementary = ENABLE_FEATURE_CPIO_P ? "?1" : "=0"; 2.21 ++ // -i may have parameters //opt_complementary = ENABLE_FEATURE_CPIO_P ? "?1" : "=0"; 2.22 + opt = getopt32(argv, OPTION_STR "oH:" IF_FEATURE_CPIO_P("p"), &cpio_filename, &cpio_fmt); 2.23 + argv += optind; 2.24 + if ((opt & (CPIO_OPT_FILE|CPIO_OPT_CREATE)) == CPIO_OPT_FILE) { /* -F without -o */