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