From 12d97b66805f87e535962963e858fc2422ffdbc7 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Sun, 16 Jan 2011 20:00:24 +0100 Subject: apply post-1.18.1 patches, bump version to 1.18.2 Signed-off-by: Denys Vlasenko --- archival/cpio.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'archival/cpio.c') diff --git a/archival/cpio.c b/archival/cpio.c index 6ab268821..9fa8badc5 100644 --- a/archival/cpio.c +++ b/archival/cpio.c @@ -308,16 +308,12 @@ int cpio_main(int argc UNUSED_PARAM, char **argv) /* -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 */ -- cgit v1.2.3-55-g6feb