Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Remove chrtbl(8). Since NetBSD 1.6, the rune type based file...
details: https://anonhg.NetBSD.org/src/rev/360ac745c19e
branches: trunk
changeset: 763311:360ac745c19e
user: joerg <joerg%NetBSD.org@localhost>
date: Thu Mar 17 02:35:27 2011 +0000
description:
Remove chrtbl(8). Since NetBSD 1.6, the rune type based file format for
LC_CTYPE has been used.
diffstat:
distrib/sets/lists/base/mi | 4 +-
distrib/sets/lists/comp/mi | 4 +-
distrib/sets/lists/man/mi | 8 +-
usr.sbin/Makefile | 4 +-
usr.sbin/chrtbl/Makefile | 16 -
usr.sbin/chrtbl/chrtbl.8 | 87 -------
usr.sbin/chrtbl/chrtbl.c | 515 ---------------------------------------------
usr.sbin/chrtbl/ctypeio.c | 91 -------
usr.sbin/chrtbl/ctypeio.h | 29 --
9 files changed, 10 insertions(+), 748 deletions(-)
diffs (truncated from 847 to 300 lines):
diff -r f220185ad7ff -r 360ac745c19e distrib/sets/lists/base/mi
--- a/distrib/sets/lists/base/mi Thu Mar 17 01:01:15 2011 +0000
+++ b/distrib/sets/lists/base/mi Thu Mar 17 02:35:27 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.925 2011/03/10 13:16:57 jmmv Exp $
+# $NetBSD: mi,v 1.926 2011/03/17 02:35:27 joerg Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -1130,7 +1130,7 @@
./usr/sbin/chat base-ppp-bin
./usr/sbin/chown base-sysutil-bin
./usr/sbin/chroot base-sysutil-bin
-./usr/sbin/chrtbl base-sysutil-bin
+./usr/sbin/chrtbl base-obsolete obsolete
./usr/sbin/cnwctl base-netutil-bin
./usr/sbin/cpuctl base-sysutil-bin
./usr/sbin/crash base-sysutil-bin
diff -r f220185ad7ff -r 360ac745c19e distrib/sets/lists/comp/mi
--- a/distrib/sets/lists/comp/mi Thu Mar 17 01:01:15 2011 +0000
+++ b/distrib/sets/lists/comp/mi Thu Mar 17 02:35:27 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1599 2011/03/14 13:53:55 njoly Exp $
+# $NetBSD: mi,v 1.1600 2011/03/17 02:35:27 joerg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -3640,7 +3640,7 @@
./usr/libdata/debug/usr/sbin/chat.debug comp-ppp-debug debug
./usr/libdata/debug/usr/sbin/chown.debug comp-obsolete obsolete
./usr/libdata/debug/usr/sbin/chroot.debug comp-sysutil-debug debug
-./usr/libdata/debug/usr/sbin/chrtbl.debug comp-sysutil-debug debug
+./usr/libdata/debug/usr/sbin/chrtbl.debug comp-obsolete obsolete
./usr/libdata/debug/usr/sbin/cnwctl.debug comp-netutil-debug debug
./usr/libdata/debug/usr/sbin/cpuctl.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/crash.debug comp-sysutil-debug debug
diff -r f220185ad7ff -r 360ac745c19e distrib/sets/lists/man/mi
--- a/distrib/sets/lists/man/mi Thu Mar 17 01:01:15 2011 +0000
+++ b/distrib/sets/lists/man/mi Thu Mar 17 02:35:27 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1301 2011/03/10 13:16:57 jmmv Exp $
+# $NetBSD: mi,v 1.1302 2011/03/17 02:35:28 joerg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2133,7 +2133,7 @@
./usr/share/man/cat8/chat.0 man-ppp-catman .cat
./usr/share/man/cat8/chown.0 man-sysutil-catman .cat
./usr/share/man/cat8/chroot.0 man-sysutil-catman .cat
-./usr/share/man/cat8/chrtbl.0 man-sysutil-catman .cat
+./usr/share/man/cat8/chrtbl.0 man-obsolete obsolete
./usr/share/man/cat8/cleanup.0 man-postfix-catman postfix,.cat
./usr/share/man/cat8/clri.0 man-sysutil-catman .cat
./usr/share/man/cat8/cnwctl.0 man-sysutil-catman .cat
@@ -4770,7 +4770,7 @@
./usr/share/man/html8/chat.html man-ppp-htmlman html
./usr/share/man/html8/chown.html man-sysutil-htmlman html
./usr/share/man/html8/chroot.html man-sysutil-htmlman html
-./usr/share/man/html8/chrtbl.html man-sysutil-htmlman html
+./usr/share/man/html8/chrtbl.html man-obsolete obsolete
./usr/share/man/html8/cleanup.html man-postfix-htmlman postfix,html
./usr/share/man/html8/clri.html man-sysutil-htmlman html
./usr/share/man/html8/cnwctl.html man-sysutil-htmlman html
@@ -7457,7 +7457,7 @@
./usr/share/man/man8/chat.8 man-ppp-man .man
./usr/share/man/man8/chown.8 man-sysutil-man .man
./usr/share/man/man8/chroot.8 man-sysutil-man .man
-./usr/share/man/man8/chrtbl.8 man-sysutil-man .man
+./usr/share/man/man8/chrtbl.8 man-obsolete obsolete
./usr/share/man/man8/cleanup.8 man-postfix-man postfix,.man
./usr/share/man/man8/clri.8 man-sysutil-man .man
./usr/share/man/man8/cnwctl.8 man-sysutil-man .man
diff -r f220185ad7ff -r 360ac745c19e usr.sbin/Makefile
--- a/usr.sbin/Makefile Thu Mar 17 01:01:15 2011 +0000
+++ b/usr.sbin/Makefile Thu Mar 17 02:35:27 2011 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.253 2011/03/06 17:08:42 bouyer Exp $
+# $NetBSD: Makefile,v 1.254 2011/03/17 02:35:28 joerg Exp $
# from: @(#)Makefile 5.20 (Berkeley) 6/12/93
.include <bsd.own.mk>
SUBDIR= ac accton acpitools altq apm apmd arp bad144 bootp \
btattach btconfig btdevctl bthcid btpand catman \
- chroot chrtbl cnwctl cpuctl crash dev_mkdb \
+ chroot cnwctl cpuctl crash dev_mkdb \
dhcp diskpart dumpfs dumplfs edquota eeprom \
envstat eshconfig etcupdate extattrctl flashctl fssconfig fusermount \
fwctl gpioctl grfconfig gspa hdaudioctl ifwatchd inetd \
diff -r f220185ad7ff -r 360ac745c19e usr.sbin/chrtbl/Makefile
--- a/usr.sbin/chrtbl/Makefile Thu Mar 17 01:01:15 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2010/05/22 06:38:15 tnozaki Exp $
-
-.include <bsd.own.mk>
-
-PROG= chrtbl
-MAN= chrtbl.8
-
-SRCS= chrtbl.c ctypeio.c
-
-CPPFLAGS+= -I${NETBSDSRCDIR}/lib/libc/locale
-
-.include <bsd.prog.mk>
-
-.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC)
-COPTS.chrtbl.c+= -Wno-pointer-sign
-.endif
diff -r f220185ad7ff -r 360ac745c19e usr.sbin/chrtbl/chrtbl.8
--- a/usr.sbin/chrtbl/chrtbl.8 Thu Mar 17 01:01:15 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-.\" $NetBSD: chrtbl.8,v 1.9 2010/12/16 17:42:29 wiz Exp $
-.\"
-.\" Copyright (c) 1997 Christos Zoulas
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd May 12, 1997
-.Dt CHRTBL 8
-.Os
-.Sh NAME
-.Nm chrtbl
-.Nd create character classification and upper \*[Lt]-\*[Gt] lower conversion tables
-.Sh SYNOPSIS
-.Nm
-.Op Fl o Ar ofile
-.Ar ifile
-.Sh DESCRIPTION
-.Nm
-creates character classification and upper \*[Lt]-\*[Gt] lower conversion tables for
-single byte files. The
-.Nm
-command is modelled after the Solaris/SVR4 command. The input file is similar
-and contains a keyword per line followed by characters or ranges. Valid
-keywords are:
-.Bl -tag -width indent
-.It Nm LC_CTYPE Ar filename
-Set the filename for the character classification output.
-.It Nm LC_NUMERIC Ar filename
-Set the filename for the numeric formatting output.
-.It Nm isupper Ar begin-char Op - Ar end-char
-Set the attribute of the specified characters range(s) to be upper case.
-.It Nm islower Ar begin-char Op - Ar end-char
-Set the attribute of the specified characters range(s) to be lower case.
-.It Nm isdigit Ar begin-char Op - Ar end-char
-Set the attribute of the specified characters range(s) to be numeric.
-.It Nm isspace Ar begin-char Op - Ar end-char
-Set the attribute of the specified characters range(s) to be space.
-.It Nm ispunct Ar begin-char Op - Ar end-char
-Set the attribute of the specified characters range(s) to be punctuation.
-.It Nm iscntrl Ar begin-char Op - Ar end-char
-Set the attribute of the specified characters range(s) to be control.
-.It Nm isxdigit Ar begin-char Op - Ar end-char
-Set the attribute of the specified characters range(s) to be hexadecimal digits.
-.It Nm isblank Ar begin-char Op - Ar end-char
-Set the attribute of the specified characters range(s) to be blank.
-.It Nm ul Ar \*[Lt]upper-char lower-char\*[Gt] ...
-Specify a case correspondence between upper and lower char.
-.It Nm cswidth Ar n1,s1:n2,s2:n3,s3
-Specify the character set byte width (n1,n2,n3) and the screen width(s1,s2,s3)
-for the 3 character sets.
-.It Nm decimal_point Ar char
-Specify the decimal point numeric formatting character.
-.It Nm thousands_sep Ar char
-Specify the thousands separator numeric formatting character.
-.El
-.Ss Available options
-.Bl -tag -width indent
-.It Fl o Ar ofile
-Print the conversion tables in a human readable (C source) form.
-.El
-.Sh SEE ALSO
-.Xr setlocale 3
-.Sh BUGS
-Preliminary support of LC_NUMERIC is present, but not currently fully
-implemented.
-No support for wide-character locales.
-Support for alternate
-localized character sets and numeric formatting is currently not implemented.
diff -r f220185ad7ff -r 360ac745c19e usr.sbin/chrtbl/chrtbl.c
--- a/usr.sbin/chrtbl/chrtbl.c Thu Mar 17 01:01:15 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,515 +0,0 @@
-/* $NetBSD: chrtbl.c,v 1.13 2010/12/14 02:28:58 joerg Exp $ */
-
-/*
- * Copyright (c) 1997 Christos Zoulas. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <ctype.h>
-#include <err.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "ctypeio.h"
-
-struct chartbl {
- size_t maxchar;
- char *ctypefilename;
- unsigned char *ctype;
- unsigned short *uptab;
- unsigned short *lotab;
- char *numericfilename;
- unsigned char decimal_point;
- unsigned char thousands_sep;
-};
-
-static void usage __P((void));
-static int numeric __P((struct chartbl *, const char *, int, char *, size_t));
-static int cswidth __P((struct chartbl *, const char *, int, char *, size_t));
-static int setfilename __P((struct chartbl *, const char *, int, char *,
- size_t));
-static int addattr __P((struct chartbl *, const char *, int, char *, size_t));
-static int uplow __P((struct chartbl *, const char *, int, char *, size_t));
-static void printctype __P((FILE *, unsigned int));
-static int output_ascii __P((const char *, const struct chartbl *));
-static int output_binary __P((const struct chartbl *));
-
-int main __P((int, char *[]));
-
-static const struct toklist {
- const char *name;
- int (*func) __P((struct chartbl *, const char *, int arg,
- char *, size_t lno));
- int arg;
-} tokens[] = {
- { "LC_CTYPE", setfilename, 0 },
- { "isupper", addattr, _CTYPE_U },
- { "islower", addattr, _CTYPE_L },
- { "isdigit", addattr, _CTYPE_N },
- { "isspace", addattr, _CTYPE_S },
- { "ispunct", addattr, _CTYPE_P },
- { "iscntrl", addattr, _CTYPE_C },
- { "isblank", addattr, _CTYPE_B },
- { "isxdigit", addattr, _CTYPE_X },
- { "ul", uplow, 0 },
- { "cswidth", cswidth, 0 },
- { "LC_NUMERIC", setfilename, 1 },
- { "decimal_point", numeric, 0 },
- { "thousands_sep", numeric, 0 },
- { NULL, NULL, 0 }
-};
-
-/* usage():
- * Print a usage message and exit
- */
-static void
-usage()
-{
-
- (void) fprintf(stderr, "usage: %s [-o <filename>] <description>\n",
- getprogname());
- exit(1);
-}
-
-
-/* numeric():
Home |
Main Index |
Thread Index |
Old Index