diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-03-03 12:38:53 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-03-03 12:38:53 +0000 |
| commit | 5aeba8440e8d2256e4b716030f97e3bf493b725a (patch) | |
| tree | 028ad58fe980a353c86fc9c44fd0a5f3be71c5fa /bin/dd/dd.c | |
| parent | 1017c29793838bf57e48d99b824f3237afaffebd (diff) | |
From NetBSD: Use const qualifier with conversion, args and clist tables
Diffstat (limited to 'bin/dd/dd.c')
| -rw-r--r-- | bin/dd/dd.c | 27 |
1 files changed, 12 insertions, 15 deletions
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 */ } |