projects / packages / busybox.git / blame
| Commit | Line | Data |
|---|---|---|
| f0f0442b AM |
1 | diff -urpN busybox-1.18.1/archival/cpio.c busybox-1.18.1-cpio/archival/cpio.c |
| 2 | --- busybox-1.18.1/archival/cpio.c 2010-12-20 01:41:26.000000000 +0100 | |
| 3 | +++ busybox-1.18.1-cpio/archival/cpio.c 2010-12-26 02:26:38.000000000 +0100 | |
| 4 | @@ -308,16 +308,12 @@ int cpio_main(int argc UNUSED_PARAM, cha | |
| 5 | /* -L makes sense only with -o or -p */ | |
| 6 | ||
| 7 | #if !ENABLE_FEATURE_CPIO_O | |
| 8 | - /* no parameters */ | |
| 9 | - opt_complementary = "=0"; | |
| 10 | opt = getopt32(argv, OPTION_STR, &cpio_filename); | |
| 11 | argv += optind; | |
| 12 | if (opt & CPIO_OPT_FILE) { /* -F */ | |
| 13 | xmove_fd(xopen(cpio_filename, O_RDONLY), STDIN_FILENO); | |
| 14 | } | |
| 15 | #else | |
| 16 | - /* _exactly_ one parameter for -p, thus <= 1 param if -p is allowed */ | |
| 17 | - opt_complementary = ENABLE_FEATURE_CPIO_P ? "?1" : "=0"; | |
| 18 | opt = getopt32(argv, OPTION_STR "oH:" IF_FEATURE_CPIO_P("p"), &cpio_filename, &cpio_fmt); | |
| 19 | argv += optind; | |
| 20 | if ((opt & (CPIO_OPT_FILE|CPIO_OPT_CREATE)) == CPIO_OPT_FILE) { /* -F without -o */ |