From owner-p4-projects Sun Oct 6 5:43:21 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E9DA37B404; Sun, 6 Oct 2002 05:42:53 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9BD4837B401 for ; Sun, 6 Oct 2002 05:42:52 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id ABB2E43E3B for ; Sun, 6 Oct 2002 05:42:51 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g96CgpCo079311 for ; Sun, 6 Oct 2002 05:42:51 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g96Cgo36079308 for perforce@freebsd.org; Sun, 6 Oct 2002 05:42:50 -0700 (PDT) Date: Sun, 6 Oct 2002 05:42:50 -0700 (PDT) Message-Id: <200210061242.g96Cgo36079308@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 18801 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=18801 Change 18801 by rwatson@rwatson_tislabs on 2002/10/06 05:42:26 Integ base 5.0-CURRENT into TrustedBSD base. Mostly loop-back of MAC features that I've been merging. Affected files ... .. //depot/projects/trustedbsd/base/bin/pax/Makefile#4 integrate .. //depot/projects/trustedbsd/base/bin/pax/ar_io.c#4 integrate .. //depot/projects/trustedbsd/base/bin/pax/cpio.c#4 integrate .. //depot/projects/trustedbsd/base/bin/pax/gen_subs.c#4 integrate .. //depot/projects/trustedbsd/base/bin/pax/pax.1#5 integrate .. //depot/projects/trustedbsd/base/bin/pax/tar.1#5 integrate .. //depot/projects/trustedbsd/base/bin/pax/tty_subs.c#4 integrate .. //depot/projects/trustedbsd/base/bin/rcp/Makefile#5 integrate .. //depot/projects/trustedbsd/base/bin/rcp/rcp.c#7 integrate .. //depot/projects/trustedbsd/base/bin/sh/parser.c#9 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/grep/grep.c#3 integrate .. //depot/projects/trustedbsd/base/include/string.h#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/isalnum.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/isalpha.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/isascii.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/isblank.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/iscntrl.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/isdigit.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/isgraph.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/islower.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/isprint.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/ispunct.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/isspace.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/isupper.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/isxdigit.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/multibyte.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/rune.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getaddrinfo.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/name6.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/disklabel/disklabel.c#12 integrate .. //depot/projects/trustedbsd/base/sys/alpha/include/cpu.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/mcd/mcd.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/mcd/mcd_isa.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/mcd/mcdvar.h#2 integrate .. //depot/projects/trustedbsd/base/sys/fs/portalfs/portal_vfsops.c#7 integrate .. //depot/projects/trustedbsd/base/sys/fs/umapfs/umap_vfsops.c#6 integrate .. //depot/projects/trustedbsd/base/sys/fs/unionfs/union_vfsops.c#8 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_disk.c#11 integrate .. //depot/projects/trustedbsd/base/sys/ia64/include/cpu.h#4 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_acct.c#10 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mac.c#16 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_socket.c#20 integrate .. //depot/projects/trustedbsd/base/sys/libkern/iconv.c#3 integrate .. //depot/projects/trustedbsd/base/sys/modules/Makefile#25 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/conf/GENERIC#11 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_biba/mac_biba.c#8 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_mls/mac_mls.c#8 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_none/mac_none.c#7 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_test/mac_test.c#7 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/clock.h#4 integrate .. //depot/projects/trustedbsd/base/sys/sys/mac.h#8 integrate .. //depot/projects/trustedbsd/base/sys/sys/mac_policy.h#10 integrate .. //depot/projects/trustedbsd/base/sys/sys/mbuf.h#13 integrate Differences ... ==== //depot/projects/trustedbsd/base/bin/pax/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/pax/Makefile,v 1.9 2002/02/04 03:06:50 kris Exp $ +# $FreeBSD: src/bin/pax/Makefile,v 1.10 2002/10/06 03:20:27 tjr Exp $ # To install on versions prior to BSD 4.4 the following may have to be # defined with CFLAGS += @@ -29,7 +29,6 @@ SRCS= ar_io.c ar_subs.c buf_subs.c cache.c cpio.c file_subs.c ftree.c \ gen_subs.c getoldopt.c options.c pat_rep.c pax.c sel_subs.c \ tables.c tar.c tty_subs.c -WARNS= 0 WFORMAT=0 #XXX NOTYET #MAN= pax.1 tar.1 cpio.1 ==== //depot/projects/trustedbsd/base/bin/pax/ar_io.c#4 (text+ko) ==== @@ -41,7 +41,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/ar_io.c,v 1.20 2002/06/30 05:15:01 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/ar_io.c,v 1.21 2002/10/06 03:20:27 tjr Exp $"); #include #include @@ -52,6 +52,7 @@ #include #include #include +#include #include #include #include @@ -384,25 +385,29 @@ if (frmt == NULL) { # ifdef NET2_STAT (void)fprintf(listf, "%s: unknown format, %lu bytes skipped.\n", + argv0, rdcnt); # else - (void)fprintf(listf, "%s: unknown format, %qu bytes skipped.\n", + (void)fprintf(listf, "%s: unknown format, %ju bytes skipped.\n", + argv0, (uintmax_t)rdcnt); # endif - argv0, rdcnt); (void)fflush(listf); flcnt = 0; return; } if (strcmp(NM_CPIO, argv0) == 0) - (void)fprintf(listf, "%qu blocks\n", (rdcnt ? rdcnt : wrcnt) / 5120); + (void)fprintf(listf, "%llu blocks\n", + (unsigned long long)((rdcnt ? rdcnt : wrcnt) / 5120)); else if (strcmp(NM_TAR, argv0) != 0) (void)fprintf(listf, # ifdef NET2_STAT "%s: %s vol %d, %lu files, %lu bytes read, %lu bytes written.\n", + argv0, frmt->name, arvol-1, flcnt, rdcnt, wrcnt); # else - "%s: %s vol %d, %lu files, %qu bytes read, %qu bytes written.\n", + "%s: %s vol %d, %ju files, %ju bytes read, %ju bytes written.\n", + argv0, frmt->name, arvol-1, (uintmax_t)flcnt, + (uintmax_t)rdcnt, (uintmax_t)wrcnt); # endif - argv0, frmt->name, arvol-1, flcnt, rdcnt, wrcnt); (void)fflush(listf); flcnt = 0; } ==== //depot/projects/trustedbsd/base/bin/pax/cpio.c#4 (text+ko) ==== @@ -41,12 +41,13 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/cpio.c,v 1.18 2002/06/30 05:15:01 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/cpio.c,v 1.19 2002/10/06 03:20:27 tjr Exp $"); #include #include #include #include +#include #include #include #include @@ -223,8 +224,8 @@ paxwarn(1, "Cpio link name length is invalid: %lu", arcn->sb.st_size); # else - paxwarn(1, "Cpio link name length is invalid: %qu", - arcn->sb.st_size); + paxwarn(1, "Cpio link name length is invalid: %ju", + (uintmax_t)arcn->sb.st_size); # endif return(-1); } ==== //depot/projects/trustedbsd/base/bin/pax/gen_subs.c#4 (text+ko) ==== @@ -41,12 +41,13 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/gen_subs.c,v 1.20 2002/06/30 05:15:01 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/gen_subs.c,v 1.21 2002/10/06 03:20:27 tjr Exp $"); #include #include #include #include +#include #include #include #include @@ -138,7 +139,7 @@ # ifdef NET2_STAT (void)fprintf(fp, "%9lu ", sbp->st_size); # else - (void)fprintf(fp, "%9qu ", sbp->st_size); + (void)fprintf(fp, "%9ju ", (uintmax_t)sbp->st_size); # endif } ==== //depot/projects/trustedbsd/base/bin/pax/pax.1#5 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)pax.1 8.4 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/pax/pax.1,v 1.27 2002/08/21 17:32:37 trhodes Exp $ +.\" $FreeBSD: src/bin/pax/pax.1,v 1.28 2002/10/06 07:56:27 tjr Exp $ .\" .Dd April 18, 1994 .Dt PAX 1 @@ -1054,9 +1054,9 @@ than the file to which it is compared. .Sh EXAMPLES The command: -.Dl "pax -w -f /dev/rst0 ." +.Dl "pax -w -f /dev/sa0 ." copies the contents of the current directory to the device -.Pa /dev/rst0 . +.Pa /dev/sa0 . .Pp The command: .Dl pax -v -f filename ==== //depot/projects/trustedbsd/base/bin/pax/tar.1#5 (text+ko) ==== @@ -27,7 +27,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/bin/pax/tar.1,v 1.5 2002/08/21 17:32:37 trhodes Exp $ +.\" $FreeBSD: src/bin/pax/tar.1,v 1.6 2002/10/06 07:56:27 tjr Exp $ .\" $OpenBSD: tar.1,v 1.33 2001/05/01 17:58:01 aaron Exp $ .\" .Dd February 7, 2001 @@ -106,7 +106,7 @@ .It Fl f Ar archive Filename where the archive is stored. Defaults to -.Pa /dev/rst0 . +.Pa /dev/sa0 . .It Fl h Follow symbolic links as if they were normal files or directories. @@ -245,11 +245,11 @@ Path in which to store temporary files. .It Ev TAPE Default tape device to use instead of -.Pa /dev/rst0 . +.Pa /dev/sa0 . .El .Sh FILES -.Bl -tag -width "/dev/rst0" -.It Pa /dev/rst0 +.Bl -tag -width "/dev/sa0" +.It Pa /dev/sa0 default archive name .El .Sh DIAGNOSTICS ==== //depot/projects/trustedbsd/base/bin/pax/tty_subs.c#4 (text+ko) ==== @@ -41,7 +41,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/tty_subs.c,v 1.18 2002/06/30 05:15:01 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/tty_subs.c,v 1.19 2002/10/06 09:23:58 tjr Exp $"); #include #include @@ -99,9 +99,9 @@ tty_prnt(const char *fmt, ...) { va_list ap; - va_start(ap, fmt); if (ttyoutf == NULL) return; + va_start(ap, fmt); (void)vfprintf(ttyoutf, fmt, ap); va_end(ap); (void)fflush(ttyoutf); ==== //depot/projects/trustedbsd/base/bin/rcp/Makefile#5 (text+ko) ==== @@ -1,11 +1,9 @@ # @(#)Makefile 8.1 (Berkeley) 7/19/93 -# $FreeBSD: src/bin/rcp/Makefile,v 1.20 2002/04/18 07:01:34 ru Exp $ +# $FreeBSD: src/bin/rcp/Makefile,v 1.21 2002/10/06 03:50:06 tjr Exp $ PROG= rcp SRCS= rcp.c util.c CFLAGS+=-DBINDIR=${BINDIR} -WARNS= 0 -WFORMAT=0 .if defined(MAKE_KERBEROS4) && !defined(NO_OPENSSL) && !defined(NOCRYPT) SRCS+= krcmd.c kcmd.c rcmd_util.c ==== //depot/projects/trustedbsd/base/bin/rcp/rcp.c#7 (text+ko) ==== @@ -44,13 +44,14 @@ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ +#if 0 #ifndef lint -#if 0 static char sccsid[] = "@(#)rcp.c 8.2 (Berkeley) 4/2/94"; +#endif /* not lint */ #endif -#endif /* not lint */ + #include -__FBSDID("$FreeBSD: src/bin/rcp/rcp.c,v 1.35 2002/08/09 16:12:08 ume Exp $"); +__FBSDID("$FreeBSD: src/bin/rcp/rcp.c,v 1.37 2002/10/06 09:09:27 charnier Exp $"); #include #include @@ -71,6 +72,7 @@ #include #include #include +#include #include #include #include @@ -489,8 +491,8 @@ goto next; } #define MODEMASK (S_ISUID|S_ISGID|S_ISTXT|S_IRWXU|S_IRWXG|S_IRWXO) - (void)snprintf(buf, sizeof(buf), "C%04o %qd %s\n", - stb.st_mode & MODEMASK, stb.st_size, last); + (void)snprintf(buf, sizeof(buf), "C%04o %jd %s\n", + stb.st_mode & MODEMASK, (intmax_t)stb.st_size, last); (void)write(rem, buf, strlen(buf)); if (response() < 0) goto next; @@ -589,7 +591,7 @@ off_t i, j, size; int amt, count, exists, first, mask, mode, ofd, omode; int setimes, targisdir, wrerrno = 0; - char ch, *cp, *np, *targ, *why, *vect[1], buf[BUFSIZ]; + char ch, *cp, *np, *targ, *why, *vect[1], buf[BUFSIZ], path[PATH_MAX]; #define atime tv[0] #define mtime tv[1] @@ -686,21 +688,15 @@ if (*cp++ != ' ') SCREWUP("size not delimited"); if (targisdir) { - static char *namebuf = NULL; - static size_t cursize; - size_t need; - - need = strlen(targ) + strlen(cp) + 250; - if (need > cursize) { - if (namebuf != NULL) - free(namebuf); - if (!(namebuf = malloc(need))) - run_err("%s", strerror(errno)); - cursize = need; + if (strlen(targ) + (*targ ? 1 : 0) + strlen(cp) + >= sizeof(path)) { + run_err("%s%s%s: name too long", targ, + *targ ? "/" : "", cp); + exit(1); } - (void)snprintf(namebuf, need, "%s%s%s", targ, + (void)snprintf(path, sizeof(path), "%s%s%s", targ, *targ ? "/" : "", cp); - np = namebuf; + np = path; } else np = targ; exists = stat(np, &stb) == 0; ==== //depot/projects/trustedbsd/base/bin/sh/parser.c#9 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.47 2002/10/01 00:54:14 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.48 2002/10/06 06:35:51 tjr Exp $"); #include @@ -323,7 +323,8 @@ case TIF: n1 = (union node *)stalloc(sizeof (struct nif)); n1->type = NIF; - n1->nif.test = list(0); + if ((n1->nif.test = list(0)) == NULL) + synexpect(-1); if (readtoken() != TTHEN) synexpect(TTHEN); n1->nif.ifpart = list(0); @@ -332,7 +333,8 @@ n2->nif.elsepart = (union node *)stalloc(sizeof (struct nif)); n2 = n2->nif.elsepart; n2->type = NIF; - n2->nif.test = list(0); + if ((n2->nif.test = list(0)) == NULL) + synexpect(-1); if (readtoken() != TTHEN) synexpect(TTHEN); n2->nif.ifpart = list(0); @@ -352,7 +354,8 @@ int got; n1 = (union node *)stalloc(sizeof (struct nbinary)); n1->type = (lasttoken == TWHILE)? NWHILE : NUNTIL; - n1->nbinary.ch1 = list(0); + if ((n1->nbinary.ch1 = list(0)) == NULL) + synexpect(-1); if ((got=readtoken()) != TDO) { TRACE(("expecting DO got %s %s\n", tokname[got], got == TWORD ? wordtext : "")); synexpect(TDO); ==== //depot/projects/trustedbsd/base/gnu/usr.bin/grep/grep.c#3 (text+ko) ==== @@ -19,7 +19,7 @@ /* Written July 1992 by Mike Haertel. */ /* Builtin decompression 1997 by Wolfram Schneider . */ -/* $FreeBSD: src/gnu/usr.bin/grep/grep.c,v 1.22 2002/09/16 04:27:29 obrien Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/grep/grep.c,v 1.23 2002/10/06 07:02:30 obrien Exp $ */ #ifdef HAVE_CONFIG_H # include @@ -66,7 +66,7 @@ /* Short options. */ static char const short_options[] = -"0123456789A:B:C::EFGHIRUVX:abcd:e:f:hiLlnqrsuvwxyZz"; +"0123456789A:B:C::EFGHIJRUVX:abcd:e:f:hiLlnqrsuvwxyZz"; /* Non-boolean long options that have no corresponding short equivalents. */ enum @@ -490,14 +490,26 @@ { ssize_t bytesread; do - if (BZflag) + if (BZflag && bzbufdesc) { - bytesread = BZ2_bzread (bzbufdesc, buffer + bufsalloc, readsize); - /* gzread() will return "non-error" when given input that isn't - its type of compression. So we need to mimic that behavor - for the bzgrep case. */ - if (bytesread == -1) - bytesread = 0; + int bzerr; + bytesread = BZ2_bzRead (&bzerr, bzbufdesc, buffer + bufsalloc, readsize); + + switch (bzerr) + { + case BZ_OK: + case BZ_STREAM_END: + /* ok */ + break; + case BZ_DATA_ERROR_MAGIC: + BZ2_bzReadClose (&bzerr, bzbufdesc); bzbufdesc = NULL; + lseek (bufdesc, 0, SEEK_SET); + bytesread = read (bufdesc, buffer + bufsalloc, readsize); + break; + default: + bytesread = 0; + break; + } } else #if HAVE_LIBZ > 0 @@ -747,7 +759,7 @@ { /* Close fd now, so that we don't open a lot of file descriptors when we recurse deeply. */ - if (BZflag) + if (BZflag && bzbufdesc) BZ2_bzclose(bzbufdesc); else #if HAVE_LIBZ > 0 @@ -923,7 +935,7 @@ if (list_files == 1 - 2 * status) printf ("%s%c", filename, '\n' & filename_mask); - if (BZflag) + if (BZflag && bzbufdesc) BZ2_bzclose(bzbufdesc); else #if HAVE_LIBZ > 0 @@ -1321,6 +1333,11 @@ binary_files = WITHOUT_MATCH_BINARY_FILES; break; case 'J': + if (Zflag) + { + printf (_("Cannot mix -Z and -J.\n")); + usage (2); + } BZflag = 1; break; case 'U': @@ -1431,6 +1448,11 @@ break; case 'Z': #if HAVE_LIBZ > 0 + if (BZflag) + { + printf (_("Cannot mix -J and -Z.\n")); + usage (2); + } Zflag = 1; #else filename_mask = 0; ==== //depot/projects/trustedbsd/base/include/string.h#7 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)string.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/string.h,v 1.16 2002/10/03 19:51:04 obrien Exp $ + * $FreeBSD: src/include/string.h,v 1.17 2002/10/05 22:07:28 obrien Exp $ */ #ifndef _STRING_H_ @@ -68,7 +68,6 @@ int strcmp(const char *, const char *); int strcoll(const char *, const char *); char *strcpy(char * __restrict, const char * __restrict); -char *stpcpy(char *, const char *); size_t strcspn(const char *, const char *); char *strerror(int); size_t strlen(const char *); @@ -93,6 +92,7 @@ #endif #if __BSD_VISIBLE +char *stpcpy(char *, const char *); char *strcasestr(const char *, const char *); size_t strlcat(char *, const char *, size_t); size_t strlcpy(char *, const char *, size_t); ==== //depot/projects/trustedbsd/base/lib/libc/locale/isalnum.3#2 (text+ko) ==== @@ -34,9 +34,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)isalnum.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/locale/isalnum.3,v 1.16 2001/10/01 16:08:54 ru Exp $ +.\" $FreeBSD: src/lib/libc/locale/isalnum.3,v 1.17 2002/10/06 10:15:38 tjr Exp $ .\" -.Dd June 4, 1993 +.Dd October 6, 2002 .Dt ISALNUM 3 .Os .Sh NAME @@ -88,10 +88,22 @@ .Fn isalnum function returns zero if the character tests false and returns non-zero if the character tests true. +.Sh COMPATIBILITY +Although +.Fn isalnum +accepts arguments outside of the range of the +.Vt "unsigned char" +type in locales with large character sets, +this is a +.Bx 4.4 +extension and the +.Fn iswalnum +function should be used instead for maximum portability. .Sh SEE ALSO .Xr ctype 3 , .Xr isalpha 3 , .Xr isdigit 3 , +.Xr iswalnum 3 , .Xr multibyte 3 , .Xr ascii 7 .Sh STANDARDS ==== //depot/projects/trustedbsd/base/lib/libc/locale/isalpha.3#2 (text+ko) ==== @@ -34,9 +34,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)isalpha.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/locale/isalpha.3,v 1.15 2001/10/01 16:08:54 ru Exp $ +.\" $FreeBSD: src/lib/libc/locale/isalpha.3,v 1.16 2002/10/06 10:15:38 tjr Exp $ .\" -.Dd June 4, 1993 +.Dd October 6, 2002 .Dt ISALPHA 3 .Os .Sh NAME @@ -86,10 +86,22 @@ .Fn isalpha function returns zero if the character tests false and returns non-zero if the character tests true. +.Sh COMPATIBILITY +Although +.Fn isalpha +accepts arguments outside of the range of the +.Vt "unsigned char" +type in locales with large character sets, +this is a +.Bx 4.4 +extension and the +.Fn iswalpha +function should be used instead for maximum portability. .Sh SEE ALSO .Xr ctype 3 , .Xr islower 3 , .Xr isupper 3 , +.Xr iswalpha 3 , .Xr multibyte 3 , .Xr ascii 7 .Sh STANDARDS ==== //depot/projects/trustedbsd/base/lib/libc/locale/isascii.3#3 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)isascii.3 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/lib/libc/locale/isascii.3,v 1.12 2002/01/09 13:43:31 nik Exp $ +.\" $FreeBSD: src/lib/libc/locale/isascii.3,v 1.13 2002/10/06 10:15:38 tjr Exp $ .\" -.Dd December 11, 1993 +.Dd October 6, 2002 .Dt ISASCII 3 .Os .Sh NAME @@ -53,4 +53,5 @@ between 0 and octal 0177 inclusive. .Sh SEE ALSO .Xr ctype 3 , +.Xr iswascii 3 , .Xr ascii 7 ==== //depot/projects/trustedbsd/base/lib/libc/locale/isblank.3#6 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)isblank.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/locale/isblank.3,v 1.15 2002/03/15 17:50:21 ru Exp $ +.\" $FreeBSD: src/lib/libc/locale/isblank.3,v 1.16 2002/10/06 10:15:38 tjr Exp $ .\" -.Dd June 4, 1993 +.Dd October 6, 2002 .Dt ISBLANK 3 .Os .Sh NAME @@ -66,6 +66,17 @@ .Li unsigned char or the value of .Dv EOF . +.Sh COMPATIBILITY +Although +.Fn isblank +accepts arguments outside of the range of the +.Vt "unsigned char" +type in locales with large character sets, +this is a +.Bx 4.4 +extension and the +.Fn iswblank +function should be used instead for maximum portability. .Sh RETURN VALUES The .Fn isblank @@ -73,6 +84,7 @@ returns non-zero if the character tests true. .Sh SEE ALSO .Xr ctype 3 , +.Xr iswblank 3 , .Xr multibyte 3 , .Xr ascii 7 .Sh STANDARDS ==== //depot/projects/trustedbsd/base/lib/libc/locale/iscntrl.3#2 (text+ko) ==== @@ -34,9 +34,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)iscntrl.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/locale/iscntrl.3,v 1.13 2001/10/01 16:08:54 ru Exp $ +.\" $FreeBSD: src/lib/libc/locale/iscntrl.3,v 1.14 2002/10/06 10:15:38 tjr Exp $ .\" -.Dd June 4, 1993 +.Dd October 6, 2002 .Dt ISCNTRL 3 .Os .Sh NAME @@ -78,8 +78,20 @@ .Fn iscntrl function returns zero if the character tests false and returns non-zero if the character tests true. +.Sh COMPATIBILITY +Although +.Fn iscntrl +accepts arguments outside of the range of the +.Vt "unsigned char" +type in locales with large character sets, +this is a +.Bx 4.4 +extension and the +.Fn iwcntrl +function should be used instead for maximum portability. .Sh SEE ALSO .Xr ctype 3 , +.Xr iswcntrl 3 , .Xr multibyte 3 , .Xr ascii 7 .Sh STANDARDS ==== //depot/projects/trustedbsd/base/lib/libc/locale/isdigit.3#4 (text+ko) ==== @@ -34,9 +34,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)isdigit.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/locale/isdigit.3,v 1.15 2002/01/09 13:43:31 nik Exp $ +.\" $FreeBSD: src/lib/libc/locale/isdigit.3,v 1.16 2002/10/06 10:15:38 tjr Exp $ .\" -.Dd June 4, 1993 +.Dd October 6, 2002 .Dt ISDIGIT 3 .Os .Sh NAME @@ -76,8 +76,20 @@ .Fn isdigit function returns zero if the character tests false and returns non-zero if the character tests true. +.Sh COMPATIBILITY +Although +.Fn isdigit +accepts arguments outside of the range of the +.Vt "unsigned char" +type in locales with large character sets, +this is a +.Bx 4.4 +extension and the +.Fn iswdigit +function should be used instead for maximum portability. .Sh SEE ALSO .Xr ctype 3 , +.Xr iswdigit 3 , .Xr multibyte 3 , .Xr ascii 7 .Sh STANDARDS ==== //depot/projects/trustedbsd/base/lib/libc/locale/isgraph.3#3 (text+ko) ==== @@ -34,9 +34,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)isgraph.3 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/lib/libc/locale/isgraph.3,v 1.16 2001/12/12 13:42:25 ru Exp $ +.\" $FreeBSD: src/lib/libc/locale/isgraph.3,v 1.17 2002/10/06 10:15:38 tjr Exp $ .\" -.Dd December 11, 1993 +.Dd October 6, 2002 .Dt ISGRAPH 3 .Os .Sh NAME @@ -93,8 +93,20 @@ .Fn isgraph function returns zero if the character tests false and returns non-zero if the character tests true. +.Sh COMPATIBILITY +Although +.Fn isgraph +accepts arguments outside of the range of the +.Vt "unsigned char" +type in locales with large character sets, +this is a +.Bx 4.4 +extension and the +.Fn iswgraph +function should be used instead for maximum portability. .Sh SEE ALSO .Xr ctype 3 , +.Xr iswgraph 3 , .Xr multibyte 3 , .Xr ascii 7 .Sh STANDARDS ==== //depot/projects/trustedbsd/base/lib/libc/locale/islower.3#2 (text+ko) ==== @@ -34,9 +34,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)islower.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/locale/islower.3,v 1.14 2001/10/01 16:08:55 ru Exp $ +.\" $FreeBSD: src/lib/libc/locale/islower.3,v 1.15 2002/10/06 10:15:38 tjr Exp $ .\" -.Dd June 4, 1993 +.Dd October 6, 2002 .Dt ISLOWER 3 .Os .Sh NAME @@ -77,8 +77,20 @@ .Fn islower function returns zero if the character tests false and returns non-zero if the character tests true. +.Sh COMPATIBILITY +Although +.Fn islower +accepts arguments outside of the range of the +.Vt "unsigned char" +type in locales with large character sets, +this is a +.Bx 4.4 +extension and the +.Fn iswlower +function should be used instead for maximum portability. .Sh SEE ALSO .Xr ctype 3 , +.Xr iswlower 3 , .Xr multibyte 3 , .Xr tolower 3 , .Xr ascii 7 ==== //depot/projects/trustedbsd/base/lib/libc/locale/isprint.3#4 (text+ko) ==== @@ -34,9 +34,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)isprint.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/locale/isprint.3,v 1.17 2001/12/12 13:45:35 ru Exp $ +.\" $FreeBSD: src/lib/libc/locale/isprint.3,v 1.18 2002/10/06 10:15:38 tjr Exp $ .\" -.Dd June 4, 1993 +.Dd October 6, 2002 .Dt ISPRINT 3 .Os .Sh NAME @@ -91,8 +91,20 @@ .Fn isprint function returns zero if the character tests false and returns non-zero if the character tests true. +.Sh COMPATIBILITY +Although +.Fn isprint +accepts arguments outside of the range of the +.Vt "unsigned char" +type in locales with large character sets, +this is a +.Bx 4.4 +extension and the +.Fn iswprint +function should be used instead for maximum portability. .Sh SEE ALSO .Xr ctype 3 , +.Xr iswprint 3 , .Xr multibyte 3 , .Xr ascii 7 .Sh STANDARDS ==== //depot/projects/trustedbsd/base/lib/libc/locale/ispunct.3#3 (text+ko) ==== @@ -34,9 +34,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ispunct.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/locale/ispunct.3,v 1.15 2001/12/12 13:46:15 ru Exp $ +.\" $FreeBSD: src/lib/libc/locale/ispunct.3,v 1.16 2002/10/06 10:15:38 tjr Exp $ .\" -.Dd June 4, 1993 +.Dd October 6, 2002 .Dt ISPUNCT 3 .Os .Sh NAME @@ -83,8 +83,20 @@ .Fn ispunct function returns zero if the character tests false and returns non-zero if the character tests true. +.Sh COMPATIBILITY +Although +.Fn ispunct +accepts arguments outside of the range of the +.Vt "unsigned char" +type in locales with large character sets, +this is a +.Bx 4.4 +extension and the +.Fn iswpunct +function should be used instead for maximum portability. .Sh SEE ALSO .Xr ctype 3 , +.Xr iswpunct 3 , .Xr multibyte 3 , .Xr ascii 7 .Sh STANDARDS ==== //depot/projects/trustedbsd/base/lib/libc/locale/isspace.3#3 (text+ko) ==== @@ -34,9 +34,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)isspace.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/locale/isspace.3,v 1.14 2001/11/30 02:01:32 ache Exp $ +.\" $FreeBSD: src/lib/libc/locale/isspace.3,v 1.15 2002/10/06 10:15:38 tjr Exp $ .\" -.Dd June 4, 1993 +.Dd October 6, 2002 .Dt ISSPACE 3 .Os .Sh NAME @@ -75,8 +75,20 @@ .Fn isspace function returns zero if the character tests false and returns non-zero if the character tests true. +.Sh COMPATIBILITY +Although +.Fn isspace +accepts arguments outside of the range of the +.Vt "unsigned char" +type in locales with large character sets, +this is a +.Bx 4.4 +extension and the +.Fn iswspace +function should be used instead for maximum portability. .Sh SEE ALSO .Xr ctype 3 , +.Xr iswspace 3 , .Xr multibyte 3 , .Xr ascii 7 .Sh STANDARDS ==== //depot/projects/trustedbsd/base/lib/libc/locale/isupper.3#2 (text+ko) ==== @@ -34,9 +34,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)isupper.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/locale/isupper.3,v 1.15 2001/10/01 16:08:55 ru Exp $ +.\" $FreeBSD: src/lib/libc/locale/isupper.3,v 1.16 2002/10/06 10:15:38 tjr Exp $ .\" -.Dd June 4, 1993 +.Dd October 6, 2002 .Dt ISUPPER 3 .Os .Sh NAME @@ -77,8 +77,20 @@ .Fn isupper function returns zero if the character tests false and returns non-zero if the character tests true. +.Sh COMPATIBILITY +Although +.Fn isupper +accepts arguments outside of the range of the +.Vt "unsigned char" +type in locales with large character sets, +this is a +.Bx 4.4 +extension and the +.Fn iswupper +function should be used instead for maximum portability. .Sh SEE ALSO .Xr ctype 3 , +.Xr iswupper 3 , .Xr multibyte 3 , .Xr toupper 3 , .Xr ascii 7 ==== //depot/projects/trustedbsd/base/lib/libc/locale/isxdigit.3#4 (text+ko) ==== @@ -34,9 +34,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)isxdigit.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/locale/isxdigit.3,v 1.15 2002/01/09 13:43:31 nik Exp $ +.\" $FreeBSD: src/lib/libc/locale/isxdigit.3,v 1.16 2002/10/06 10:15:38 tjr Exp $ .\" -.Dd June 4, 1993 +.Dd October 6, 2002 .Dt ISXDIGIT 3 .Os .Sh NAME @@ -78,8 +78,24 @@ .Fn isxdigit function returns zero if the character tests false and returns non-zero if the character tests true. +.Sh COMPATIBILITY +Although +.Fn isxdigit +and +.Fn ishexnumber +accept arguments outside of the range of the +.Vt "unsigned char" +type in locales with large character sets, +this is a +.Bx 4.4 +extension and the +.Fn isxwdigit +and +.Fn iswhexnumber +functions should be used instead for maximum portability. .Sh SEE ALSO .Xr ctype 3 , +.Xr iswxdigit 3 , .Xr multibyte 3 , .Xr ascii 7 >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message