Module Name: src
Committed By: christos
Date: Fri Jan 14 23:55:16 UTC 2022
Modified Files:
src/bin/dd: args.c conv_tab.c dd.1
Log Message:
The "ibm" and "oldibm" tables are identical, because POSIX just
standardised the table from V7. Nobody, including the original authors,
seems to have noticed this. Merge them and update the documentation.
Also fix the odd, inconsistent, spelling of "pre-4.3BSD-Reno").
(From nabijaczleweli)
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/bin/dd/args.c
cvs rdiff -u -r1.9 -r1.10 src/bin/dd/conv_tab.c
cvs rdiff -u -r1.37 -r1.38 src/bin/dd/dd.1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/dd/args.c
diff -u src/bin/dd/args.c:1.41 src/bin/dd/args.c:1.42
--- src/bin/dd/args.c:1.41 Sat Oct 9 17:31:36 2021
+++ src/bin/dd/args.c Fri Jan 14 18:55:16 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: args.c,v 1.41 2021/10/09 21:31:36 rillig Exp $ */
+/* $NetBSD: args.c,v 1.42 2022/01/14 23:55:16 christos Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)args.c 8.3 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: args.c,v 1.41 2021/10/09 21:31:36 rillig Exp $");
+__RCSID("$NetBSD: args.c,v 1.42 2022/01/14 23:55:16 christos Exp $");
#endif
#endif /* not lint */
@@ -355,13 +355,13 @@ static const struct conv {
{ "ascii", C_ASCII, C_EBCDIC, e2a_POSIX },
{ "block", C_BLOCK, C_UNBLOCK, NULL },
{ "ebcdic", C_EBCDIC, C_ASCII, a2e_POSIX },
- { "ibm", C_EBCDIC, C_ASCII, a2ibm_POSIX },
+ { "ibm", C_EBCDIC, C_ASCII, a2ibm },
{ "lcase", C_LCASE, C_UCASE, NULL },
{ "noerror", C_NOERROR, 0, NULL },
{ "notrunc", C_NOTRUNC, 0, NULL },
{ "oldascii", C_ASCII, C_EBCDIC, e2a_32V },
{ "oldebcdic", C_EBCDIC, C_ASCII, a2e_32V },
- { "oldibm", C_EBCDIC, C_ASCII, a2ibm_32V },
+ { "oldibm", C_EBCDIC, C_ASCII, a2ibm },
{ "osync", C_OSYNC, C_BS, NULL },
{ "sparse", C_SPARSE, 0, NULL },
{ "swab", C_SWAB, 0, NULL },
Index: src/bin/dd/conv_tab.c
diff -u src/bin/dd/conv_tab.c:1.9 src/bin/dd/conv_tab.c:1.10
--- src/bin/dd/conv_tab.c:1.9 Thu Aug 7 05:05:10 2003
+++ src/bin/dd/conv_tab.c Fri Jan 14 18:55:16 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: conv_tab.c,v 1.9 2003/08/07 09:05:10 agc Exp $ */
+/* $NetBSD: conv_tab.c,v 1.10 2022/01/14 23:55:16 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)conv_tab.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: conv_tab.c,v 1.9 2003/08/07 09:05:10 agc Exp $");
+__RCSID("$NetBSD: conv_tab.c,v 1.10 2022/01/14 23:55:16 christos Exp $");
#endif
#endif /* not lint */
@@ -142,42 +142,6 @@ const u_char a2e_32V[] = {
0356, 0357, 0372, 0373, 0374, 0375, 0376, 0377, /* 0370 */
};
-/* ASCII to IBM EBCDIC -- 32V compatible. */
-const u_char a2ibm_32V[] = {
- 0000, 0001, 0002, 0003, 0067, 0055, 0056, 0057, /* 0000 */
- 0026, 0005, 0045, 0013, 0014, 0015, 0016, 0017, /* 0010 */
- 0020, 0021, 0022, 0023, 0074, 0075, 0062, 0046, /* 0020 */
- 0030, 0031, 0077, 0047, 0034, 0035, 0036, 0037, /* 0030 */
- 0100, 0132, 0177, 0173, 0133, 0154, 0120, 0175, /* 0040 */
- 0115, 0135, 0134, 0116, 0153, 0140, 0113, 0141, /* 0050 */
- 0360, 0361, 0362, 0363, 0364, 0365, 0366, 0367, /* 0060 */
- 0370, 0371, 0172, 0136, 0114, 0176, 0156, 0157, /* 0070 */
- 0174, 0301, 0302, 0303, 0304, 0305, 0306, 0307, /* 0100 */
- 0310, 0311, 0321, 0322, 0323, 0324, 0325, 0326, /* 0110 */
- 0327, 0330, 0331, 0342, 0343, 0344, 0345, 0346, /* 0120 */
- 0347, 0350, 0351, 0255, 0340, 0275, 0137, 0155, /* 0130 */
- 0171, 0201, 0202, 0203, 0204, 0205, 0206, 0207, /* 0140 */
- 0210, 0211, 0221, 0222, 0223, 0224, 0225, 0226, /* 0150 */
- 0227, 0230, 0231, 0242, 0243, 0244, 0245, 0246, /* 0160 */
- 0247, 0250, 0251, 0300, 0117, 0320, 0241, 0007, /* 0170 */
- 0040, 0041, 0042, 0043, 0044, 0025, 0006, 0027, /* 0200 */
- 0050, 0051, 0052, 0053, 0054, 0011, 0012, 0033, /* 0210 */
- 0060, 0061, 0032, 0063, 0064, 0065, 0066, 0010, /* 0220 */
- 0070, 0071, 0072, 0073, 0004, 0024, 0076, 0341, /* 0230 */
- 0101, 0102, 0103, 0104, 0105, 0106, 0107, 0110, /* 0240 */
- 0111, 0121, 0122, 0123, 0124, 0125, 0126, 0127, /* 0250 */
- 0130, 0131, 0142, 0143, 0144, 0145, 0146, 0147, /* 0260 */
- 0150, 0151, 0160, 0161, 0162, 0163, 0164, 0165, /* 0270 */
- 0166, 0167, 0170, 0200, 0212, 0213, 0214, 0215, /* 0300 */
- 0216, 0217, 0220, 0232, 0233, 0234, 0235, 0236, /* 0310 */
- 0237, 0240, 0252, 0253, 0254, 0255, 0256, 0257, /* 0320 */
- 0260, 0261, 0262, 0263, 0264, 0265, 0266, 0267, /* 0330 */
- 0270, 0271, 0272, 0273, 0274, 0275, 0276, 0277, /* 0340 */
- 0312, 0313, 0314, 0315, 0316, 0317, 0332, 0333, /* 0350 */
- 0334, 0335, 0336, 0337, 0352, 0353, 0354, 0355, /* 0360 */
- 0356, 0357, 0372, 0373, 0374, 0375, 0376, 0377, /* 0370 */
-};
-
/* EBCDIC to ASCII -- POSIX and System V compatible. */
const u_char e2a_POSIX[] = {
0000, 0001, 0002, 0003, 0234, 0011, 0206, 0177, /* 0000 */
@@ -250,8 +214,8 @@ const u_char a2e_POSIX[] = {
0356, 0357, 0372, 0373, 0374, 0375, 0376, 0377, /* 0370 */
};
-/* ASCII to IBM EBCDIC -- POSIX and System V compatible. */
-const u_char a2ibm_POSIX[] = {
+/* ASCII to IBM EBCDIC -- 32V, POSIX and System V compatible. */
+const u_char a2ibm[] = {
0000, 0001, 0002, 0003, 0067, 0055, 0056, 0057, /* 0000 */
0026, 0005, 0045, 0013, 0014, 0015, 0016, 0017, /* 0010 */
0020, 0021, 0022, 0023, 0074, 0075, 0062, 0046, /* 0020 */
Index: src/bin/dd/dd.1
diff -u src/bin/dd/dd.1:1.37 src/bin/dd/dd.1:1.38
--- src/bin/dd/dd.1:1.37 Tue May 18 03:17:09 2021
+++ src/bin/dd/dd.1 Fri Jan 14 18:55:16 2022
@@ -1,4 +1,4 @@
-.\" $NetBSD: dd.1,v 1.37 2021/05/18 07:17:09 nia Exp $
+.\" $NetBSD: dd.1,v 1.38 2022/01/14 23:55:16 christos Exp $
.\"
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -32,7 +32,7 @@
.\"
.\" @(#)dd.1 8.2 (Berkeley) 1/13/94
.\"
-.Dd May 18, 2021
+.Dd January 14, 2022
.Dt DD 1
.Os
.Sh NAME
@@ -293,8 +293,8 @@ The value
.Cm oldascii
specifies the one used in historic
.Tn AT&T
-and pre-
-.Bx 4.3 Reno
+and
+.Pf pre- Bx 4.3 Reno
systems.
.It Cm block
Treats the input as a sequence of newline or end-of-file terminated variable
