PERFORCE change 82439 for review
soc-bushman
soc-bushman at FreeBSD.org
Tue Aug 23 09:43:59 GMT 2005
http://perforce.freebsd.org/chv.cgi?CH=82439
Change 82439 by soc-bushman at soc-bushman_stinger on 2005/08/23 09:43:42
integration made
Affected files ...
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/Makefile#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/Makefile.inc#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/getnetgrent.c#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/getttyent.c#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/sem.c#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/sem_init.3#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/sem_post.3#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/sem_wait.3#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/syslog.c#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/usleep.c#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/include/namespace.h#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/include/un-namespace.h#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/isalnum.3#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/isalpha.3#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/isblank.3#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/iscntrl.3#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/isdigit.3#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/isgraph.3#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/islower.3#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/isprint.3#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/ispunct.3#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/isspace.3#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/isupper.3#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/isxdigit.3#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/nextwctype.3#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/rpmatch.3#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/tolower.3#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/toupper.3#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/wctype.3#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/Makefile.inc#4 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/getaddrinfo.c#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/getprotoent.c#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/getservent.c#14 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/inet6_rth_space.3#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/inet_pton.c#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/ip6opt.c#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/rcmd.3#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/rthdr.c#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/nls/ko_KR.UTF-8.msg#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/nls/ko_KR.eucKR.msg#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/nls/pl_PL.ISO8859-2.msg#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/posix1e/acl_get_entry.3#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/posix1e/mac.3#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/posix1e/mac_prepare.3#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/regex/engine.c#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/regex/regex.3#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/regex/regex2.h#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/ungetwc.c#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/vfprintf.c#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/vfwscanf.c#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdlib/grantpt.c#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdtime/strftime.3#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/string/Makefile.inc#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/string/wcsdup.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/string/wmemchr.3#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/Makefile.inc#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/intro.2#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/kse.2#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/mmap.2#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/read.2#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/recv.2#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/uuidgen.2#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/write.2#2 integrate
Differences ...
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/Makefile#2 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.2 (Berkeley) 2/3/94
-# $FreeBSD: src/lib/libc/Makefile,v 1.56 2005/01/15 05:23:56 das Exp $
+# $FreeBSD: src/lib/libc/Makefile,v 1.57 2005/08/06 16:53:54 phk Exp $
#
# All library objects contain FreeBSD revision strings by default; they may be
# excluded as a space-saving measure. To produce a library that does
@@ -58,7 +58,7 @@
CFLAGS+= -DYP
.include "${.CURDIR}/yp/Makefile.inc"
.endif
-.if !defined(NO_HESIOD_LIBC)
+.if defined(YES_HESIOD)
CFLAGS+= -DHESIOD
.endif
.if defined(NO_FP_LIBC)
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/Makefile.inc#2 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile.inc 8.6 (Berkeley) 5/4/95
-# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.121 2005/05/11 14:07:25 delphij Exp $
+# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.122 2005/08/12 22:46:15 simon Exp $
# machine-independent gen sources
.PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen
@@ -94,7 +94,8 @@
getfsent.3 getfstype.3 getfsent.3 setfsent.3 \
getfsent.3 setfstab.3 getfsent.3 getfstab.3
MLINKS+=getgrent.3 endgrent.3 getgrent.3 getgrgid.3 getgrent.3 getgrnam.3 \
- getgrent.3 setgrent.3 getgrent.3 setgroupent.3
+ getgrent.3 setgrent.3 getgrent.3 setgroupent.3 \
+ getgrent.3 getgrent_r.3 getgrent.3 getgrnam_r.3 getgrent.3 getgrgid_r.3
MLINKS+=gethostname.3 sethostname.3
MLINKS+=getnetgrent.3 endnetgrent.3 getnetgrent.3 innetgr.3 \
getnetgrent.3 setnetgrent.3
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/getnetgrent.c#2 (text+ko) ====
@@ -38,7 +38,7 @@
static char sccsid[] = "@(#)getnetgrent.c 8.2 (Berkeley) 4/27/95";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/getnetgrent.c,v 1.33 2005/01/13 18:33:01 jon Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getnetgrent.c,v 1.34 2005/07/22 22:20:26 jon Exp $");
#include <ctype.h>
#include <stdio.h>
@@ -305,22 +305,44 @@
}
static int
-_buildkey(char *key, const char *str, const char *dom, int *rotation)
+_revnetgr_lookup(char* lookupdom, char* map, const char* str,
+ const char* dom, const char* group)
{
- (*rotation)++;
- if (*rotation > 4)
- return(0);
- switch(*rotation) {
- case(1): sprintf((char *)key, "%s.%s", str, dom ? dom : "*");
- break;
- case(2): sprintf((char *)key, "%s.*", str);
- break;
- case(3): sprintf((char *)key, "*.%s", dom ? dom : "*");
- break;
- case(4): sprintf((char *)key, "*.*");
- break;
+ int y, rv, rot;
+ char key[MAXHOSTNAMELEN];
+ char *result;
+ int resultlen;
+
+ for (rot = 0; ; rot++) {
+ switch (rot) {
+ case(0): snprintf(key, MAXHOSTNAMELEN, "%s.%s",
+ str, dom?dom:lookupdom);
+ break;
+ case(1): snprintf(key, MAXHOSTNAMELEN, "%s.*",
+ str);
+ break;
+ case(2): snprintf(key, MAXHOSTNAMELEN, "*.%s",
+ dom?dom:lookupdom);
+ break;
+ case(3): snprintf(key, MAXHOSTNAMELEN, "*.*");
+ break;
+ default: return(0);
+ }
+ y = yp_match(lookupdom, map, key, strlen(key), &result,
+ &resultlen);
+ if (y == 0) {
+ rv = _listmatch(result, group, resultlen);
+ free(result);
+ if (rv) return(1);
+ } else if (y != YPERR_KEY) {
+ /*
+ * If we get an error other than 'no
+ * such key in map' then something is
+ * wrong and we should stop the search.
+ */
+ return(-1);
+ }
}
- return(1);
}
#endif
@@ -331,11 +353,6 @@
innetgr(const char *group, const char *host, const char *user, const char *dom)
{
char *hst, *usr, *dm;
-#ifdef YP
- char *result;
- int resultlen;
- int rv;
-#endif
/* Sanity check */
if (group == NULL || !strlen(group))
@@ -350,44 +367,36 @@
/*
* If we're in NIS-only mode, do the search using
* NIS 'reverse netgroup' lookups.
+ *
+ * What happens with 'reverse netgroup' lookups:
+ *
+ * 1) try 'reverse netgroup' lookup
+ * 1.a) if host is specified and user is null:
+ * look in netgroup.byhost
+ * (try host.domain, host.*, *.domain or *.*)
+ * if found, return yes
+ * 1.b) if user is specified and host is null:
+ * look in netgroup.byuser
+ * (try host.domain, host.*, *.domain or *.*)
+ * if found, return yes
+ * 1.c) if both host and user are specified,
+ * don't do 'reverse netgroup' lookup. It won't work.
+ * 1.d) if neither host ane user are specified (why?!?)
+ * don't do 'reverse netgroup' lookup either.
+ * 2) if domain is specified and 'reverse lookup' is done:
+ * 'reverse lookup' was authoritative. bye bye.
+ * 3) otherwise, too bad, try it the slow way.
*/
- if (_use_only_yp) {
- char _key[MAXHOSTNAMELEN];
- int rot = 0, y = 0;
-
+ if (_use_only_yp && (host == NULL) != (user == NULL)) {
+ int ret;
if(yp_get_default_domain(&_netgr_yp_domain))
return(0);
- while(_buildkey(_key, user ? user : host, dom, &rot)) {
- y = yp_match(_netgr_yp_domain, user? "netgroup.byuser":
- "netgroup.byhost", _key, strlen(_key), &result,
- &resultlen);
- if (y) {
- /*
- * If we get an error other than 'no
- * such key in map' then something is
- * wrong and we should stop the search.
- */
- if (y != YPERR_KEY)
- break;
- } else {
- rv = _listmatch(result, group, resultlen);
- free(result);
- if (rv)
- return(1);
- else
- return(0);
- }
- }
- /*
- * Couldn't match using NIS-exclusive mode. If the error
- * was YPERR_MAP, then the failure happened because there
- * was no netgroup.byhost or netgroup.byuser map. The odds
- * are we are talking to a Sun NIS+ server in YP emulation
- * mode; if this is the case, then we have to do the check
- * the 'old-fashioned' way by grovelling through the netgroup
- * map and resolving memberships on the fly.
- */
- if (y != YPERR_MAP)
+ ret = _revnetgr_lookup(_netgr_yp_domain,
+ host?"netgroup.byhost":"netgroup.byuser",
+ host?host:user, dom, group);
+ if (ret == 1)
+ return(1);
+ else if (ret == 0 && dom != NULL)
return(0);
}
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/getttyent.c#2 (text+ko) ====
@@ -35,7 +35,7 @@
static char sccsid[] = "@(#)getttyent.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/getttyent.c,v 1.12 2002/02/01 01:32:19 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getttyent.c,v 1.13 2005/07/25 17:57:15 mdodd Exp $");
#include <ttyent.h>
#include <stdio.h>
@@ -105,6 +105,10 @@
zapchar = 0;
tty.ty_name = p;
+ tty.ty_status = 0;
+ tty.ty_window = NULL;
+ tty.ty_group = _TTYS_NOGROUP;
+
p = skip(p);
if (!*(tty.ty_getty = p))
tty.ty_getty = tty.ty_type = NULL;
@@ -121,9 +125,6 @@
p = skip(p);
}
}
- tty.ty_status = 0;
- tty.ty_window = NULL;
- tty.ty_group = _TTYS_NOGROUP;
for (; *p; p = skip(p)) {
if (scmp(_TTYS_OFF))
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/sem.c#2 (text+ko) ====
@@ -26,7 +26,7 @@
* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libc/gen/sem.c,v 1.13 2004/02/06 15:15:44 deischen Exp $
+ * $FreeBSD: src/lib/libc/gen/sem.c,v 1.14 2005/08/20 07:59:13 stefanf Exp $
*/
/*
@@ -57,6 +57,7 @@
* sem_post() may need to be wrapped to be signal-safe.
*/
#include "namespace.h"
+#include <sys/types.h>
#include <sys/queue.h>
#include <errno.h>
#include <fcntl.h>
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/sem_init.3#2 (text+ko) ====
@@ -25,7 +25,7 @@
.\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
.\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/gen/sem_init.3,v 1.17 2004/07/02 16:45:56 ru Exp $
+.\" $FreeBSD: src/lib/libc/gen/sem_init.3,v 1.18 2005/07/13 13:15:21 rwatson Exp $
.\"
.Dd February 15, 2000
.Dt SEM_INIT 3
@@ -83,6 +83,7 @@
.El
.Sh SEE ALSO
.Xr sem_destroy 3 ,
+.Xr sem_getvalue 3 ,
.Xr sem_post 3 ,
.Xr sem_trywait 3 ,
.Xr sem_wait 3 ,
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/sem_post.3#2 (text+ko) ====
@@ -25,7 +25,7 @@
.\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
.\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/gen/sem_post.3,v 1.14 2004/07/02 16:45:56 ru Exp $
+.\" $FreeBSD: src/lib/libc/gen/sem_post.3,v 1.15 2005/07/13 13:15:21 rwatson Exp $
.\"
.Dd February 15, 2000
.Dt SEM_POST 3
@@ -67,6 +67,7 @@
points to an invalid semaphore.
.El
.Sh SEE ALSO
+.Xr sem_getvalue 3 ,
.Xr sem_trywait 3 ,
.Xr sem_wait 3 ,
.Xr sem 4
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/sem_wait.3#2 (text+ko) ====
@@ -25,7 +25,7 @@
.\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
.\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/gen/sem_wait.3,v 1.12 2004/07/02 16:45:56 ru Exp $
+.\" $FreeBSD: src/lib/libc/gen/sem_wait.3,v 1.13 2005/07/13 13:15:22 rwatson Exp $
.\"
.Dd February 15, 2000
.Dt SEM_WAIT 3
@@ -82,6 +82,7 @@
The semaphore value was zero, and thus could not be decremented.
.El
.Sh SEE ALSO
+.Xr sem_getvalue 3 ,
.Xr sem_post 3 ,
.Xr sem 4
.Sh STANDARDS
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/syslog.c#2 (text+ko) ====
@@ -35,7 +35,7 @@
static char sccsid[] = "@(#)syslog.c 8.5 (Berkeley) 4/29/95";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/syslog.c,v 1.35 2005/04/08 21:15:38 stefanf Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/syslog.c,v 1.36 2005/08/03 00:45:58 deischen Exp $");
#include "namespace.h"
#include <sys/types.h>
@@ -285,7 +285,7 @@
connectlog();
}
do {
- usleep(1);
+ _usleep(1);
if (send(LogFile, tbuf, cnt, 0) >= 0) {
THREAD_UNLOCK();
return;
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/usleep.c#2 (text+ko) ====
@@ -35,7 +35,7 @@
static char sccsid[] = "@(#)usleep.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/usleep.c,v 1.28 2002/12/29 00:59:09 mike Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/usleep.c,v 1.29 2005/08/03 00:44:25 deischen Exp $");
#include "namespace.h"
#include <time.h>
@@ -43,7 +43,7 @@
#include "un-namespace.h"
int
-usleep(useconds)
+__usleep(useconds)
useconds_t useconds;
{
struct timespec time_to_sleep;
@@ -52,3 +52,6 @@
time_to_sleep.tv_sec = useconds / 1000000;
return (_nanosleep(&time_to_sleep, NULL));
}
+
+__weak_reference(__usleep, usleep);
+__weak_reference(__usleep, _usleep);
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/include/namespace.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libc/include/namespace.h,v 1.16 2003/05/01 19:03:13 nectar Exp $
+ * $FreeBSD: src/lib/libc/include/namespace.h,v 1.17 2005/08/03 00:43:14 deischen Exp $
*/
#ifndef _NAMESPACE_H_
@@ -124,6 +124,7 @@
#define sigsuspend _sigsuspend
#define socket _socket
#define socketpair _socketpair
+#define usleep _usleep
#define wait4 _wait4
#define waitpid _waitpid
#define write _write
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/include/un-namespace.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libc/include/un-namespace.h,v 1.13 2003/05/01 19:03:13 nectar Exp $
+ * $FreeBSD: src/lib/libc/include/un-namespace.h,v 1.14 2005/08/03 00:43:14 deischen Exp $
*/
#ifndef _UN_NAMESPACE_H_
@@ -105,6 +105,7 @@
#undef sigsuspend
#undef socket
#undef socketpair
+#undef usleep
#undef wait4
#undef waitpid
#undef write
==== //depot/projects/soc2005/nsswitch_cached/src/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.19 2004/08/21 07:37:08 tjr Exp $
+.\" $FreeBSD: src/lib/libc/locale/isalnum.3,v 1.20 2005/07/17 04:11:05 tjr Exp $
.\"
-.Dd August 21, 2004
+.Dd July 17, 2005
.Dt ISALNUM 3
.Os
.Sh NAME
@@ -56,15 +56,11 @@
or
.Xr isdigit 3
is true.
-For single C
-.Va char Ns s
-locales (see
-.Xr multibyte 3 )
-the value of the argument is
-representable as an
-.Li unsigned char
+The value of the argument must be representable as an
+.Vt unsigned char
or the value of
.Dv EOF .
+.Pp
In the ASCII character set, this includes the following characters
(with their numeric values shown in octal):
.Pp
@@ -103,7 +99,6 @@
.Xr isalpha 3 ,
.Xr isdigit 3 ,
.Xr iswalnum 3 ,
-.Xr multibyte 3 ,
.Xr ascii 7
.Sh STANDARDS
The
==== //depot/projects/soc2005/nsswitch_cached/src/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.18 2004/08/21 07:37:08 tjr Exp $
+.\" $FreeBSD: src/lib/libc/locale/isalpha.3,v 1.19 2005/07/17 04:11:05 tjr Exp $
.\"
-.Dd August 21, 2004
+.Dd July 17, 2005
.Dt ISALPHA 3
.Os
.Sh NAME
@@ -56,15 +56,11 @@
or
.Xr islower 3
is true.
-For single C
-.Va char Ns s
-locales (see
-.Xr multibyte 3 )
-the value of the argument is
-representable as an
-.Li unsigned char
+The value of the argument must be representable as an
+.Vt unsigned char
or the value of
.Dv EOF .
+.Pp
In the ASCII character set, this includes the following characters
(with their numeric values shown in octal):
.Pp
@@ -101,7 +97,6 @@
.Xr islower 3 ,
.Xr isupper 3 ,
.Xr iswalpha 3 ,
-.Xr multibyte 3 ,
.Xr ascii 7
.Sh STANDARDS
The
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/isblank.3#2 (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.20 2005/01/20 09:17:03 ru Exp $
+.\" $FreeBSD: src/lib/libc/locale/isblank.3,v 1.21 2005/07/17 04:11:05 tjr Exp $
.\"
-.Dd August 21, 2004
+.Dd July 17, 2005
.Dt ISBLANK 3
.Os
.Sh NAME
@@ -57,13 +57,8 @@
In the "C" locale
.Fn isblank
successful test is limited to this characters only.
-For single C
-.Va char Ns s
-locales (see
-.Xr multibyte 3 )
-the value of the argument is
-representable as an
-.Li unsigned char
+The value of the argument must be representable as an
+.Vt unsigned char
or the value of
.Dv EOF .
.Sh RETURN VALUES
@@ -84,7 +79,6 @@
.Sh SEE ALSO
.Xr ctype 3 ,
.Xr iswblank 3 ,
-.Xr multibyte 3 ,
.Xr ascii 7
.Sh STANDARDS
The
==== //depot/projects/soc2005/nsswitch_cached/src/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.17 2004/08/21 07:37:08 tjr Exp $
+.\" $FreeBSD: src/lib/libc/locale/iscntrl.3,v 1.18 2005/07/17 04:11:05 tjr Exp $
.\"
-.Dd August 21, 2004
+.Dd July 17, 2005
.Dt ISCNTRL 3
.Os
.Sh NAME
@@ -52,15 +52,11 @@
The
.Fn iscntrl
function tests for any control character.
-For single C
-.Va char Ns s
-locales (see
-.Xr multibyte 3 )
-the value of the argument is
-representable as an
-.Li unsigned char
+The value of the argument must be representable as an
+.Vt unsigned char
or the value of
.Dv EOF .
+.Pp
In the ASCII character set, this includes the following characters
(with their numeric values shown in octal):
.Pp
@@ -91,7 +87,6 @@
.Sh SEE ALSO
.Xr ctype 3 ,
.Xr iswcntrl 3 ,
-.Xr multibyte 3 ,
.Xr ascii 7
.Sh STANDARDS
The
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/isdigit.3#2 (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.19 2004/08/21 07:37:08 tjr Exp $
+.\" $FreeBSD: src/lib/libc/locale/isdigit.3,v 1.20 2005/07/17 04:11:05 tjr Exp $
.\"
-.Dd August 21, 2004
+.Dd July 17, 2005
.Dt ISDIGIT 3
.Os
.Sh NAME
@@ -68,13 +68,8 @@
but may recognize additional characters, depending on the current locale
setting.
.Pp
-For single C
-.Va char Ns s
-locales (see
-.Xr multibyte 3 )
-the value of the argument is
-representable as an
-.Li unsigned char
+The value of the argument must be representable as an
+.Vt unsigned char
or the value of
.Dv EOF .
.Sh RETURN VALUES
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/isgraph.3#2 (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.19 2004/08/21 07:37:08 tjr Exp $
+.\" $FreeBSD: src/lib/libc/locale/isgraph.3,v 1.20 2005/07/17 04:11:05 tjr Exp $
.\"
-.Dd August 21, 2004
+.Dd July 17, 2005
.Dt ISGRAPH 3
.Os
.Sh NAME
@@ -55,15 +55,11 @@
.Pq Ql "\ "
and other
locale specific space-like characters.
-For single C
-.Va char Ns s
-locales (see
-.Xr multibyte 3 )
-the value of the argument is
-representable as an
-.Li unsigned char
+The value of the argument must be representable as an
+.Vt unsigned char
or the value of
.Dv EOF .
+.Pp
In the ASCII character set, this includes the following characters
(with their numeric values shown in octal):
.Pp
@@ -106,7 +102,6 @@
.Sh SEE ALSO
.Xr ctype 3 ,
.Xr iswgraph 3 ,
-.Xr multibyte 3 ,
.Xr ascii 7
.Sh STANDARDS
The
==== //depot/projects/soc2005/nsswitch_cached/src/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.17 2004/08/21 07:37:08 tjr Exp $
+.\" $FreeBSD: src/lib/libc/locale/islower.3,v 1.18 2005/07/17 04:11:05 tjr Exp $
.\"
-.Dd August 21, 2004
+.Dd July 17, 2005
.Dt ISLOWER 3
.Os
.Sh NAME
@@ -52,15 +52,11 @@
The
.Fn islower
function tests for any lower-case letters.
-For single C
-.Va char Ns s
-locales (see
-.Xr multibyte 3 )
-the value of the argument is
-representable as an
-.Li unsigned char
+The value of the argument must be representable as an
+.Vt unsigned char
or the value of
.Dv EOF .
+.Pp
In the ASCII character set, this includes the following characters
(with their numeric values shown in octal):
.Pp
@@ -90,7 +86,6 @@
.Sh SEE ALSO
.Xr ctype 3 ,
.Xr iswlower 3 ,
-.Xr multibyte 3 ,
.Xr tolower 3 ,
.Xr ascii 7
.Sh STANDARDS
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/isprint.3#2 (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.20 2004/08/21 07:37:08 tjr Exp $
+.\" $FreeBSD: src/lib/libc/locale/isprint.3,v 1.21 2005/07/17 04:11:05 tjr Exp $
.\"
-.Dd August 21, 2004
+.Dd July 17, 2005
.Dt ISPRINT 3
.Os
.Sh NAME
@@ -53,15 +53,11 @@
.Fn isprint
function tests for any printing character including space
.Pq Ql "\ " .
-For single C
-.Va char Ns s
-locales (see
-.Xr multibyte 3 )
-the value of the argument is
-representable as an
-.Li unsigned char
+The value of the argument must be representable as an
+.Vt unsigned char
or the value of
.Dv EOF .
+.Pp
In the ASCII character set, this includes the following characters
(with their numeric values shown in octal):
.Pp
@@ -104,7 +100,6 @@
.Sh SEE ALSO
.Xr ctype 3 ,
.Xr iswprint 3 ,
-.Xr multibyte 3 ,
.Xr ascii 7
.Sh STANDARDS
The
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/ispunct.3#2 (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.18 2004/08/21 07:37:08 tjr Exp $
+.\" $FreeBSD: src/lib/libc/locale/ispunct.3,v 1.19 2005/07/17 04:11:05 tjr Exp $
.\"
-.Dd August 21, 2004
+.Dd July 17, 2005
.Dt ISPUNCT 3
.Os
.Sh NAME
@@ -57,15 +57,11 @@
character for which
.Xr isalnum 3
is true.
-For single C
-.Va char Ns s
-locales (see
-.Xr multibyte 3 )
-the value of the argument is
-representable as an
-.Li unsigned char
+The value of the argument must be representable as an
+.Vt unsigned char
or the value of
.Dv EOF .
+.Pp
In the ASCII character set, this includes the following characters
(with their numeric values shown in octal):
.Pp
@@ -96,7 +92,6 @@
.Sh SEE ALSO
.Xr ctype 3 ,
.Xr iswpunct 3 ,
-.Xr multibyte 3 ,
.Xr ascii 7
.Sh STANDARDS
The
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/isspace.3#2 (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.17 2004/08/21 07:37:08 tjr Exp $
+.\" $FreeBSD: src/lib/libc/locale/isspace.3,v 1.18 2005/07/17 04:11:06 tjr Exp $
.\"
-.Dd August 21, 2004
+.Dd July 17, 2005
.Dt ISSPACE 3
.Os
.Sh NAME
@@ -61,13 +61,8 @@
In the "C" locale
.Fn isspace
successful test is limited to this characters only.
-For single C
-.Va char Ns s
-locales (see
-.Xr multibyte 3 )
-the value of the argument is
-representable as an
-.Li unsigned char
+The value of the argument must be representable as an
+.Vt unsigned char
or the value of
.Dv EOF .
.Sh RETURN VALUES
==== //depot/projects/soc2005/nsswitch_cached/src/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.18 2004/08/21 07:37:08 tjr Exp $
+.\" $FreeBSD: src/lib/libc/locale/isupper.3,v 1.19 2005/07/17 04:11:06 tjr Exp $
.\"
-.Dd August 21, 2004
+.Dd July 17, 2005
.Dt ISUPPER 3
.Os
.Sh NAME
@@ -52,15 +52,11 @@
The
.Fn isupper
function tests for any upper-case letter.
-For single C
-.Va char Ns s
-locales (see
-.Xr multibyte 3 )
-the value of the argument is
-representable as an
-.Li unsigned char
+The value of the argument must be representable as an
+.Vt unsigned char
or the value of
.Dv EOF .
+.Pp
In the ASCII character set, this includes the following characters
(with their numeric values shown in octal):
.Pp
@@ -90,7 +86,6 @@
.Sh SEE ALSO
.Xr ctype 3 ,
.Xr iswupper 3 ,
-.Xr multibyte 3 ,
.Xr toupper 3 ,
.Xr ascii 7
.Sh STANDARDS
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/isxdigit.3#2 (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.20 2004/08/21 07:37:08 tjr Exp $
+.\" $FreeBSD: src/lib/libc/locale/isxdigit.3,v 1.21 2005/07/17 04:11:06 tjr Exp $
.\"
-.Dd August 21, 2004
+.Dd July 17, 2005
.Dt ISXDIGIT 3
.Os
.Sh NAME
@@ -71,13 +71,8 @@
but may recognize additional characters,
depending on the current locale setting.
.Pp
-For single C
-.Va char Ns s
-locales (see
-.Xr multibyte 3 )
-the value of the argument is
-representable as an
-.Li unsigned char
+The value of the argument must be representable as an
+.Vt unsigned char
or the value of
.Dv EOF .
.Sh RETURN VALUES
@@ -98,7 +93,6 @@
.Sh SEE ALSO
.Xr ctype 3 ,
.Xr iswxdigit 3 ,
-.Xr multibyte 3 ,
.Xr ascii 7
.Sh STANDARDS
The
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/nextwctype.3#2 (text+ko) ====
@@ -23,9 +23,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/locale/nextwctype.3,v 1.2 2005/01/15 11:22:13 ru Exp $
+.\" $FreeBSD: src/lib/libc/locale/nextwctype.3,v 1.3 2005/07/21 10:27:45 tjr Exp $
.\"
-.Dd July 8, 2004
+.Dd July 21, 2005
.Dt NEXTWCTYPE 3
.Os
.Sh NAME
@@ -51,6 +51,17 @@
.Sh RETURN VALUES
The
.Fn nextwctype
-functions returns the next character, or \-1 if there are no more.
+function returns the next character, or \-1 if there are no more.
+.Sh COMPATIBILITY
+This function is a non-standard
+.Fx
+extension and should not be used where the standard
+.Fn iswctype
+function would suffice.
.Sh SEE ALSO
.Xr wctype 3
+.Sh HISTORY
+The
+.Fn nextwctype
+function appeared in
+.Fx 5.4 .
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/rpmatch.3#2 (text+ko) ====
@@ -23,9 +23,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/locale/rpmatch.3,v 1.2 2005/01/15 11:22:13 ru Exp $
+.\" $FreeBSD: src/lib/libc/locale/rpmatch.3,v 1.3 2005/07/21 10:53:27 tjr Exp $
.\"
-.Dd January 6, 2005
+.Dd July 21, 2005
.Dt RPMATCH 3
.Os
.Sh NAME
@@ -59,3 +59,8 @@
.Sh SEE ALSO
.Xr nl_langinfo 3 ,
.Xr setlocale 3
+.Sh HISTORY
+The
+.Fn rpmatch
+function appeared in
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list