From 5887fd95f0ffa01086439978a56a7eb58559e155 Mon Sep 17 00:00:00 2001 From: ache Date: Tue, 17 Jan 1995 23:04:29 +0000 Subject: More koshering [ul]case fix, don't use pre-initialized tables at all, treat 0xFF as valid character. --- bin/dd/conv_tab.c | 72 +++---------------------------------------------------- bin/dd/dd.c | 18 ++++++++------ 2 files changed, 14 insertions(+), 76 deletions(-) (limited to 'bin') diff --git a/bin/dd/conv_tab.c b/bin/dd/conv_tab.c index 3c118f1..2fb2bc6 100644 --- a/bin/dd/conv_tab.c +++ b/bin/dd/conv_tab.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: conv_tab.c,v 1.2 1994/09/24 02:54:47 davidg Exp $ */ #ifndef lint @@ -71,76 +71,10 @@ static char sccsid[] = "@(#)conv_tab.c 8.1 (Berkeley) 5/31/93"; */ /* 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 */ -}; +u_char l2u[256]; /* 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 u2l[256]; /* EBCDIC to ASCII -- 32V compatible. */ u_char e2a_32V[] = { diff --git a/bin/dd/dd.c b/bin/dd/dd.c index dc55aed..d342870 100644 --- a/bin/dd/dd.c +++ b/bin/dd/dd.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: dd.c,v 1.2 1994/09/24 02:54:52 davidg Exp $ + * $Id: dd.c,v 1.3 1995/01/17 22:55:59 ache Exp $ */ #ifndef lint @@ -177,34 +177,38 @@ setup() if (ddflags & (C_LCASE|C_UCASE)) if (ddflags & C_ASCII) if (ddflags & C_LCASE) { - for (cnt = 0; cnt < 0377; ++cnt) + for (cnt = 0; cnt <= 0377; ++cnt) if (isupper(ctab[cnt])) ctab[cnt] = tolower(ctab[cnt]); } else { - for (cnt = 0; cnt < 0377; ++cnt) + for (cnt = 0; cnt <= 0377; ++cnt) if (islower(ctab[cnt])) ctab[cnt] = toupper(ctab[cnt]); } else if (ddflags & C_EBCDIC) if (ddflags & C_LCASE) { - for (cnt = 0; cnt < 0377; ++cnt) + for (cnt = 0; cnt <= 0377; ++cnt) if (isupper(cnt)) ctab[cnt] = ctab[tolower(cnt)]; } else { - for (cnt = 0; cnt < 0377; ++cnt) + for (cnt = 0; cnt <= 0377; ++cnt) if (islower(cnt)) ctab[cnt] = ctab[toupper(cnt)]; } else { ctab = ddflags & C_LCASE ? u2l : l2u; if (ddflags & C_LCASE) { - for (cnt = 0; cnt < 0377; ++cnt) + for (cnt = 0; cnt <= 0377; ++cnt) if (isupper(cnt)) ctab[cnt] = tolower(cnt); + else + ctab[cnt] = cnt; } else { - for (cnt = 0; cnt < 0377; ++cnt) + for (cnt = 0; cnt <= 0377; ++cnt) if (islower(cnt)) ctab[cnt] = toupper(cnt); + else + ctab[cnt] = cnt; } } (void)time(&st.start); /* Statistics timestamp. */ -- cgit v1.1