From NetBSD: Use const qualifier with conversion, args and clist tables

5 files changed, 41 insertions, 112 deletions

diff --git a/bin/dd/args.c b/bin/dd/args.c
index 32de4f58a4c..7c817649926 100644
--- a/bin/dd/args.c
+++ b/bin/dd/args.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: args.c,v 1.5 1995/10/08 23:01:22 gwr Exp $	*/
+/*	$NetBSD: args.c,v 1.7 1996/03/01 01:18:58 jtc Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993, 1994
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)args.c	8.3 (Berkeley) 4/2/94";
 #else
-static char rcsid[] = "$NetBSD: args.c,v 1.5 1995/10/08 23:01:22 gwr Exp $";
+static char rcsid[] = "$NetBSD: args.c,v 1.7 1996/03/01 01:18:58 jtc Exp $";
 #endif
 #endif /* not lint */
 
@@ -72,7 +72,7 @@ static void	f_seek __P((char *));
 static void	f_skip __P((char *));
 static u_long	get_bsz __P((char *));
 
-static struct arg {
+const static struct arg {
 	char *name;
 	void (*f) __P((char *));
 	u_int set, noset;
@@ -280,10 +280,10 @@ f_conv(arg)
 }
 #else	/* NO_CONV */
 
-static struct conv {
+const static struct conv {
 	char *name;
 	u_int set, noset;
-	u_char *ctab;
+	const u_char *ctab;
 } clist[] = {
 	{ "ascii",	C_ASCII,	C_EBCDIC,	e2a_POSIX },
 	{ "block",	C_BLOCK,	C_UNBLOCK,	NULL },
diff --git a/bin/dd/conv.c b/bin/dd/conv.c
index 688d7436dcd..ecb5c6a931d 100644
--- a/bin/dd/conv.c
+++ b/bin/dd/conv.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: conv.c,v 1.5 1995/10/08 23:01:23 gwr Exp $	*/
+/*	$NetBSD: conv.c,v 1.6 1996/02/20 19:29:02 jtc Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993, 1994
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)conv.c	8.3 (Berkeley) 4/2/94";
 #else
-static char rcsid[] = "$NetBSD: conv.c,v 1.5 1995/10/08 23:01:23 gwr Exp $";
+static char rcsid[] = "$NetBSD: conv.c,v 1.6 1996/02/20 19:29:02 jtc Exp $";
 #endif
 #endif /* not lint */
 
@@ -63,7 +63,8 @@ void
 def()
 {
 	int cnt;
-	u_char *inp, *t;
+	u_char *inp;
+	const u_char *t;
 
 	if (t = ctab)
 		for (inp = in.dbp - (cnt = in.dbrcnt); cnt--; ++inp)
@@ -117,7 +118,8 @@ block()
 {
 	static int intrunc;
 	int ch, cnt, maxlen;
-	u_char *inp, *outp, *t;
+	u_char *inp, *outp;
+	const u_char *t;
 
 	/*
 	 * Record truncation can cross block boundaries.  If currently in a
@@ -226,7 +228,8 @@ void
 unblock()
 {
 	int cnt;
-	u_char *inp, *t;
+	u_char *inp;
+	const u_char *t;
 
 	/* Translation and case conversion. */
 	if (t = ctab)
diff --git a/bin/dd/conv_tab.c b/bin/dd/conv_tab.c
index 0dcce973ae3..680232dfcce 100644
--- a/bin/dd/conv_tab.c
+++ b/bin/dd/conv_tab.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: conv_tab.c,v 1.4 1995/03/21 09:04:03 cgd Exp $	*/
+/*	$NetBSD: conv_tab.c,v 1.7 1996/02/20 19:29:03 jtc Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -41,17 +41,14 @@
 #if 0
 static char sccsid[] = "@(#)conv_tab.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$NetBSD: conv_tab.c,v 1.4 1995/03/21 09:04:03 cgd Exp $";
+static char rcsid[] = "$NetBSD: conv_tab.c,v 1.7 1996/02/20 19:29:03 jtc Exp $";
 #endif
 #endif /* not lint */
 
 #include <sys/types.h>
 
 /*
- * There are currently eight tables:
- *
- *	lower-case	-> upper-case			conv=upper
- *	upper-case	-> lower-case			conv=lower
+ * There are currently six tables:
  *
  *	ebcdic		-> ascii	32V		conv=oldascii
  *	ascii		-> ebcdic	32V		conv=oldebcdic
@@ -74,80 +71,10 @@ static char rcsid[] = "$NetBSD: conv_tab.c,v 1.4 1995/03/21 09:04:03 cgd Exp $";
  * ACM, Volume 11, Number 11, November 1968, pp. 783-789.
  */
 
-/* Lower-case to upper-case */
-u_char l2u[] = {
-	0000, 0001, 0002, 0003, 0004, 0005, 0006, 0007,		/* 0000 */
-	0010, 0011, 0012, 0013, 0014, 0015, 0016, 0017,		/* 0010 */
-	0020, 0021, 0022, 0023, 0024, 0025, 0026, 0027,		/* 0020 */
-	0030, 0031, 0032, 0033, 0034, 0035, 0036, 0037,		/* 0030 */
-	0040, 0041, 0042, 0043, 0044, 0045, 0046, 0047,		/* 0040 */
-	0050, 0051, 0052, 0053, 0054, 0055, 0056, 0057,		/* 0050 */
-	0060, 0061, 0062, 0063, 0064, 0065, 0066, 0067,		/* 0060 */
-	0070, 0071, 0072, 0073, 0074, 0075, 0076, 0077,		/* 0070 */
-	0100, 0101, 0102, 0103, 0104, 0105, 0106, 0107,		/* 0100 */
-	0110, 0111, 0112, 0113, 0114, 0115, 0116, 0117,		/* 0110 */
-	0120, 0121, 0122, 0123, 0124, 0125, 0126, 0127,		/* 0120 */
-	0130, 0131, 0132, 0133, 0134, 0135, 0136, 0137,		/* 0130 */
-	0140, 0101, 0102, 0103, 0104, 0105, 0106, 0107,		/* 0140 */
-	0110, 0111, 0112, 0113, 0114, 0115, 0116, 0117,		/* 0150 */
-	0120, 0121, 0122, 0123, 0124, 0125, 0126, 0127,		/* 0160 */
-	0130, 0131, 0132, 0173, 0174, 0175, 0176, 0177,		/* 0170 */
-	0200, 0201, 0202, 0203, 0204, 0205, 0206, 0207,		/* 0200 */
-	0210, 0211, 0212, 0213, 0214, 0215, 0216, 0217,		/* 0210 */
-	0220, 0221, 0222, 0223, 0224, 0225, 0226, 0227,		/* 0220 */
-	0230, 0231, 0232, 0233, 0234, 0235, 0236, 0237,		/* 0230 */
-	0240, 0241, 0242, 0243, 0244, 0245, 0246, 0247,		/* 0240 */
-	0250, 0251, 0252, 0253, 0254, 0255, 0256, 0257,		/* 0250 */
-	0260, 0261, 0262, 0263, 0264, 0265, 0266, 0267,		/* 0260 */
-	0270, 0271, 0272, 0273, 0274, 0275, 0276, 0277,		/* 0270 */
-	0300, 0301, 0302, 0303, 0304, 0305, 0306, 0307,		/* 0300 */
-	0310, 0311, 0312, 0313, 0314, 0315, 0316, 0317,		/* 0310 */
-	0320, 0321, 0322, 0323, 0324, 0325, 0326, 0327,		/* 0320 */
-	0330, 0331, 0332, 0333, 0334, 0335, 0336, 0337,		/* 0330 */
-	0340, 0341, 0342, 0343, 0344, 0345, 0346, 0347,		/* 0340 */
-	0350, 0351, 0352, 0353, 0354, 0355, 0356, 0357,		/* 0350 */
-	0360, 0361, 0362, 0363, 0364, 0365, 0366, 0367,		/* 0360 */
-	0370, 0371, 0372, 0373, 0374, 0375, 0376, 0377,		/* 0370 */
-};
-
-/* Upper-case to lower-case */
-u_char u2l[] = {
-	0000, 0001, 0002, 0003, 0004, 0005, 0006, 0007,		/* 0000 */
-	0010, 0011, 0012, 0013, 0014, 0015, 0016, 0017,		/* 0010 */
-	0020, 0021, 0022, 0023, 0024, 0025, 0026, 0027,		/* 0020 */
-	0030, 0031, 0032, 0033, 0034, 0035, 0036, 0037,		/* 0030 */
-	0040, 0041, 0042, 0043, 0044, 0045, 0046, 0047,		/* 0040 */
-	0050, 0051, 0052, 0053, 0054, 0055, 0056, 0057,		/* 0050 */
-	0060, 0061, 0062, 0063, 0064, 0065, 0066, 0067,		/* 0060 */
-	0070, 0071, 0072, 0073, 0074, 0075, 0076, 0077,		/* 0070 */
-	0100, 0141, 0142, 0143, 0144, 0145, 0146, 0147,		/* 0100 */
-	0150, 0151, 0152, 0153, 0154, 0155, 0156, 0157,		/* 0110 */
-	0160, 0161, 0162, 0163, 0164, 0165, 0166, 0167,		/* 0120 */
-	0170, 0171, 0172, 0133, 0134, 0135, 0136, 0137,		/* 0130 */
-	0140, 0141, 0142, 0143, 0144, 0145, 0146, 0147,		/* 0140 */
-	0150, 0151, 0152, 0153, 0154, 0155, 0156, 0157,		/* 0150 */
-	0160, 0161, 0162, 0163, 0164, 0165, 0166, 0167,		/* 0160 */
-	0170, 0171, 0172, 0173, 0174, 0175, 0176, 0177,		/* 0170 */
-	0200, 0201, 0202, 0203, 0204, 0205, 0206, 0207,		/* 0200 */
-	0210, 0211, 0212, 0213, 0214, 0215, 0216, 0217,		/* 0210 */
-	0220, 0221, 0222, 0223, 0224, 0225, 0226, 0227,		/* 0220 */
-	0230, 0231, 0232, 0233, 0234, 0235, 0236, 0237,		/* 0230 */
-	0240, 0241, 0242, 0243, 0244, 0245, 0246, 0247,		/* 0240 */
-	0250, 0251, 0252, 0253, 0254, 0255, 0256, 0257,		/* 0250 */
-	0260, 0261, 0262, 0263, 0264, 0265, 0266, 0267,		/* 0260 */
-	0270, 0271, 0272, 0273, 0274, 0275, 0276, 0277,		/* 0270 */
-	0300, 0301, 0302, 0303, 0304, 0305, 0306, 0307,		/* 0300 */
-	0310, 0311, 0312, 0313, 0314, 0315, 0316, 0317,		/* 0310 */
-	0320, 0321, 0322, 0323, 0324, 0325, 0326, 0327,		/* 0320 */
-	0330, 0331, 0332, 0333, 0334, 0335, 0336, 0337,		/* 0330 */
-	0340, 0341, 0342, 0343, 0344, 0345, 0346, 0347,		/* 0340 */
-	0350, 0351, 0352, 0353, 0354, 0355, 0356, 0357,		/* 0350 */
-	0360, 0361, 0362, 0363, 0364, 0365, 0366, 0367,		/* 0360 */
-	0370, 0371, 0372, 0373, 0374, 0375, 0376, 0377,		/* 0370 */
-};
+u_char casetab[256];
 
 /* EBCDIC to ASCII -- 32V compatible. */
-u_char e2a_32V[] = {
+const u_char e2a_32V[] = {
 	0000, 0001, 0002, 0003, 0234, 0011, 0206, 0177,		/* 0000 */
 	0227, 0215, 0216, 0013, 0014, 0015, 0016, 0017,		/* 0010 */
 	0020, 0021, 0022, 0023, 0235, 0205, 0010, 0207,		/* 0020 */
@@ -183,7 +110,7 @@ u_char e2a_32V[] = {
 };
 
 /* ASCII to EBCDIC -- 32V compatible. */
-u_char a2e_32V[] = {
+const u_char a2e_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 */
@@ -219,7 +146,7 @@ u_char a2e_32V[] = {
 };
 
 /* ASCII to IBM EBCDIC -- 32V compatible. */
-u_char a2ibm_32V[] = {
+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 */
@@ -255,7 +182,7 @@ u_char a2ibm_32V[] = {
 };
 
 /* EBCDIC to ASCII -- POSIX and System V compatible. */
-u_char e2a_POSIX[] = {
+const u_char e2a_POSIX[] = {
 	0000, 0001, 0002, 0003, 0234, 0011, 0206, 0177,		/* 0000 */
 	0227, 0215, 0216, 0013, 0014, 0015, 0016, 0017,		/* 0010 */
 	0020, 0021, 0022, 0023, 0235, 0205, 0010, 0207,		/* 0020 */
@@ -291,7 +218,7 @@ u_char e2a_POSIX[] = {
 };
 
 /* ASCII to EBCDIC -- POSIX and System V compatible. */
-u_char a2e_POSIX[] = {
+const u_char a2e_POSIX[] = {
 	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 */
@@ -327,7 +254,7 @@ u_char a2e_POSIX[] = {
 };
 
 /* ASCII to IBM EBCDIC -- POSIX and System V compatible. */
-u_char a2ibm_POSIX[] = {
+const u_char a2ibm_POSIX[] = {
 	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 */
diff --git a/bin/dd/dd.c b/bin/dd/dd.c
index 989511850cc..0abf7a31599 100644
--- a/bin/dd/dd.c
+++ b/bin/dd/dd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dd.c,v 1.5 1995/10/08 23:01:24 gwr Exp $	*/
+/*	$NetBSD: dd.c,v 1.6 1996/02/20 19:29:06 jtc Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993, 1994
@@ -47,7 +47,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)dd.c	8.5 (Berkeley) 4/2/94";
 #else
-static char rcsid[] = "$NetBSD: dd.c,v 1.5 1995/10/08 23:01:24 gwr Exp $";
+static char rcsid[] = "$NetBSD: dd.c,v 1.6 1996/02/20 19:29:06 jtc Exp $";
 #endif
 #endif /* not lint */
 
@@ -81,7 +81,7 @@ u_long	cpy_cnt;		/* # of blocks to copy */
 u_int	ddflags;		/* conversion options */
 u_int	cbsz;			/* conversion block size */
 u_int	files_cnt = 1;		/* # of files to copy */
-u_char	*ctab;			/* conversion table */
+const u_char	*ctab;		/* conversion table */
 
 int
 main(argc, argv)
@@ -183,28 +183,25 @@ setup()
 		/* Should not get here, but just in case... */
 		errx(1, "case conv and -DNO_CONV");
 #else	/* NO_CONV */
-		if (ddflags & C_ASCII)
+		if (ddflags & C_ASCII || ddflags & C_EBCDIC) {
 			if (ddflags & C_LCASE) {
 				for (cnt = 0; cnt < 0377; ++cnt)
-					if (isupper(ctab[cnt]))
-						ctab[cnt] = tolower(ctab[cnt]);
+					casetab[cnt] = tolower(ctab[cnt]);
 			} else {
 				for (cnt = 0; cnt < 0377; ++cnt)
-					if (islower(ctab[cnt]))
-						ctab[cnt] = toupper(ctab[cnt]);
+					casetab[cnt] = toupper(ctab[cnt]);
 			}
-		else if (ddflags & C_EBCDIC)
+		} else {
 			if (ddflags & C_LCASE) {
 				for (cnt = 0; cnt < 0377; ++cnt)
-					if (isupper(cnt))
-						ctab[cnt] = ctab[tolower(cnt)];
+					casetab[cnt] = tolower(cnt);
 			} else {
 				for (cnt = 0; cnt < 0377; ++cnt)
-					if (islower(cnt))
-						ctab[cnt] = ctab[toupper(cnt)];
+					casetab[cnt] = toupper(cnt);
 			}
-		else
-			ctab = ddflags & C_LCASE ? u2l : l2u;
+		}
+
+		ctab = casetab;
 #endif	/* NO_CONV */
 	}
 
diff --git a/bin/dd/extern.h b/bin/dd/extern.h
index 981e54eee16..6af8999fe60 100644
--- a/bin/dd/extern.h
+++ b/bin/dd/extern.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: extern.h,v 1.4 1995/03/21 09:04:09 cgd Exp $	*/
+/*	$NetBSD: extern.h,v 1.7 1996/02/20 19:29:07 jtc Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993, 1994
@@ -62,6 +62,8 @@ extern u_long cpy_cnt;
 extern u_int cbsz;
 extern u_int ddflags;
 extern u_int files_cnt;
-extern u_char *ctab;
-extern u_char a2e_32V[], a2e_POSIX[], a2ibm_32V[], a2ibm_POSIX[], e2a_32V[];
-extern u_char e2a_POSIX[], l2u[], u2l[];
+extern const u_char *ctab;
+extern const u_char a2e_32V[], a2e_POSIX[];
+extern const u_char e2a_32V[], e2a_POSIX[];
+extern const u_char a2ibm_32V[], a2ibm_POSIX[];
+extern u_char casetab[];