pkubat / rpms / cpio

Forked from rpms/cpio 4 years ago
Clone
Radek Brich e98db37
--- cpio-2.9/doc/cpio.info.rh	2007-06-28 15:25:08.000000000 +0200
Radek Brich e98db37
+++ cpio-2.9/doc/cpio.info	2007-07-16 15:10:20.000000000 +0200
Radek Brich e98db37
@@ -266,7 +266,8 @@ File: cpio.info,  Node: Options,  Prev: 
e032091
      Set the I/O block size to BLOCK-SIZE * 512 bytes.
e032091
 
e032091
 `-c'
e032091
-     Use the old portable (ASCII) archive format.
e032091
+     Identical to "-H newc", use the new (SVR4) portable format.
e032091
+     If you wish the old portable (ASCII) archive format, use "-H odc" instead.
e032091
 
Radek Brich e98db37
 `-C IO-SIZE'
Radek Brich e98db37
 `--io-size=IO-SIZE'
Radek Brich e98db37
--- cpio-2.9/src/main.c.rh	2007-06-28 12:46:41.000000000 +0200
Radek Brich e98db37
+++ cpio-2.9/src/main.c	2007-07-16 15:09:10.000000000 +0200
Radek Brich e98db37
@@ -111,7 +111,7 @@ static struct argp_option options[] = {
8293934
   {"block-size", BLOCK_SIZE_OPTION, N_("BLOCK-SIZE"), 0,
Radek Brich e98db37
    N_("Set the I/O block size to BLOCK-SIZE * 512 bytes"), GRID+1 },
8293934
   {NULL, 'c', NULL, 0,
Radek Brich e98db37
-   N_("Use the old portable (ASCII) archive format"), GRID+1 },
Radek Brich e98db37
+   N_("Identical to \"-H newc\", use the new (SVR4) portable format.If you wish the old portable (ASCII) archive format, use \"-H odc\" instead."), GRID+1 },
8293934
   {"dot", 'V', NULL, 0, 
Radek Brich e98db37
    N_("Print a \".\" for each file processed"), GRID+1 },
8293934
   {"io-size", 'C', N_("NUMBER"), 0,
Radek Brich e98db37
@@ -338,6 +338,7 @@ parse_opt (int key, char *arg, struct ar
e032091
     case 'c':		/* Use the old portable ASCII format.  */
e032091
       if (archive_format != arf_unknown)
Radek Brich e98db37
 	error (0, EXIT_FAILURE, _("Archive format multiply defined"));
e032091
+#define SVR4_COMPAT
e032091
 #ifdef SVR4_COMPAT
e032091
       archive_format = arf_newascii; /* -H newc.  */
e032091
 #else