cpio/cpio-2.6-rh.patch
2006-07-18 15:25:32 +00:00

32 lines
1.4 KiB
Diff

--- cpio-2.6/doc/cpio.info.rh 2004-02-27 13:42:01.000000000 +0100
+++ cpio-2.6/doc/cpio.info 2006-07-18 17:10:52.000000000 +0200
@@ -261,7 +261,8 @@
Set the I/O block size to BLOCK-SIZE * 512 bytes.
`-c'
- Use the old portable (ASCII) archive format.
+ Identical to "-H newc", use the new (SVR4) portable format.
+ If you wish the old portable (ASCII) archive format, use "-H odc" instead.
`-C IO-SIZE, --io-size=IO-SIZE'
Set the I/O block size to IO-SIZE bytes.
--- cpio-2.6/src/main.c.rh 2004-11-23 01:42:18.000000000 +0100
+++ cpio-2.6/src/main.c 2006-07-18 17:18:10.000000000 +0200
@@ -101,7 +101,7 @@
{"block-size", BLOCK_SIZE_OPTION, N_("BLOCK-SIZE"), 0,
N_("Set the I/O block size to BLOCK-SIZE * 512 bytes"), 110},
{NULL, 'c', NULL, 0,
- N_("Use the old portable (ASCII) archive format"), 0},
+ N_("Identical to \"-H newc\", use the new (SVR4) portable format.If you wish the old portable (ASCII) archive format, use \"-H odc\" instead."), 0},
{"dot", 'V', NULL, 0,
N_("Print a \".\" for each file processed"), 110},
{"io-size", 'C', N_("NUMBER"), 0,
@@ -302,6 +302,7 @@
case 'c': /* Use the old portable ASCII format. */
if (archive_format != arf_unknown)
USAGE_ERROR ((0, 0, _("Archive format multiply defined")));
+#define SVR4_COMPAT
#ifdef SVR4_COMPAT
archive_format = arf_newascii; /* -H newc. */
#else