 @@ -1,14 +1,14 @@
-/*	$NetBSD: string.h,v 1.38 2009/05/01 20:01:23 perry Exp $	*/
+/*	$NetBSD: string.h,v 1.39 2009/07/22 19:48:27 kleink Exp $	*/
 /*-
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  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.
 @@ -74,33 +74,36 @@ int	 strerror_r(int, char *, size_t);
 #endif /* _POSIX_C_SOURCE >= 199506 || XOPEN_SOURCE >= 500 || ... */
 size_t	 strxfrm(char * __restrict, const char * __restrict, size_t);
 #if defined(_XOPEN_SOURCE) || defined(_NETBSD_SOURCE)
 void	*memccpy(void *, const void *, int, size_t);
 char	*strdup(const char *);
 #endif
 #if (_POSIX_C_SOURCE - 0 >= 200809L) || (_XOPEN_SOURCE - 0 >= 700) || \
     defined(_NETBSD_SOURCE)
 char	*stpcpy(char * __restrict, const char * __restrict);
 char	*stpncpy(char * __restrict, const char * __restrict, size_t);
 size_t	strnlen(const char *, size_t);
 #ifndef __STRSIGNAL_DECLARED
 #define __STRSIGNAL_DECLARED
 /* also in unistd.h */
 __aconst char *strsignal(int);
 #endif /* __STRSIGNAL_DECLARED */
 /*
  * For POSIX compliance, we still need:
  * strcoll_l
  * strerror_l
  * strxfrm_l
  * and strsignal needs to be moved from unistd.h to here.
  */
 #endif
 #if defined(_NETBSD_SOURCE)
 #include <strings.h>		/* for backwards-compatibilty */
 void	*memmem(const void *, size_t, const void *, size_t);
 char	*strcasestr(const char *, const char *);
 size_t	 strlcat(char *, const char *, size_t);
 size_t	 strlcpy(char *, const char *, size_t);
 char	*strsep(char **, const char *);
 char	*stresep(char **, const char *, int);
 char	*strndup(const char *, size_t);
 void	*memrchr(const void *, int, size_t);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: unistd.h,v 1.120 2009/01/11 03:04:12 christos Exp $	*/
+/*	$NetBSD: unistd.h,v 1.121 2009/07/22 19:48:27 kleink Exp $	*/
 /*-
  * Copyright (c) 1998, 1999, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Klaus Klein.
+ *
  * 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.
 @@ -317,27 +317,31 @@ int	 reboot(int, char *);
 int	 revoke(const char *);
 int	 rresvport(int *);
 int	 ruserok(const char *, int, const char *, const char *);
 int	 setdomainname(const char *, size_t);
 int	 setgroups(int, const gid_t *);
 int	 sethostid(long);
 int	 sethostname(const char *, size_t);
 int	 setlogin(const char *);
 void	*setmode(const char *);
 int	 setrgid(gid_t);
 int	 setruid(uid_t);
 void	 setusershell(void);
 void	 strmode(mode_t, char *);
 #ifndef __STRSIGNAL_DECLARED
 #define __STRSIGNAL_DECLARED
 /* backwards-compatibility; also in string.h */
 __aconst char *strsignal(int);
 #endif /* __STRSIGNAL_DECLARED */
 int	 swapctl(int, void *, int);
 int	 swapon(const char *);			/* obsoleted by swapctl() */
 int	 syscall(int, ...);
 quad_t	 __syscall(quad_t, ...);
 int	 undelete(const char *);
 #if 1 /*INET6*/
 int	 rcmd_af(char **, int, const char *,
 	    const char *, const char *, int *, int);
 int	 rresvport_af(int *, int);
 int	 iruserok_sa(const void *, int, int, const char *, const char *);
 #endif

 @@ -20,40 +20,45 @@
 .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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.
 .\"
 .\"     from: @(#)strerror.3	6.9 (Berkeley) 6/29/91
-.\"	$NetBSD: strsignal.3,v 1.9 2003/08/07 16:43:52 agc Exp $
+.\"	$NetBSD: strsignal.3,v 1.10 2009/07/22 19:48:27 kleink Exp $
 .\"
-.Dd June 29, 1991
+.Dd July 22, 2009
 .Dt STRSIGNAL 3
 .Os
 .Sh NAME
 .Nm strsignal
 .Nd get signal description string
 .Sh LIBRARY
 .Lb libc
 .Sh SYNOPSIS
-.In unistd.h
+.In string.h
 .Ft char *
 .Fn strsignal "int sig"
 .Sh DESCRIPTION
 The
 .Fn strsignal
 function returns a pointer to the language-dependent string describing
 a signal.
 .Pp
 The array pointed to is not to be modified by the program, but may be
 overwritten by subsequent calls to
 .Fn strsignal .
 .Sh SEE ALSO
 .Xr intro 2 ,
 .Xr psignal 3 ,
 .Xr setlocale 3
 .\" .Sh STANDARDS
 .\" The
 .\" .Fn strsignal
 .\" function conforms to
 .\" .St -p1003.1-2008 .

 @@ -1,14 +1,14 @@
-/*	$NetBSD: strsignal.c,v 1.13 2005/11/29 03:12:00 christos Exp $	*/
+/*	$NetBSD: strsignal.c,v 1.14 2009/07/22 19:48:27 kleink Exp $	*/
 /*
  * Copyright (c) 1988 Regents of the University of California.
  * 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.
 @@ -24,32 +24,32 @@
  * 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 <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 static char *sccsid = "@(#)strerror.c	5.6 (Berkeley) 5/4/91";
 #else
-__RCSID("$NetBSD: strsignal.c,v 1.13 2005/11/29 03:12:00 christos Exp $");
+__RCSID("$NetBSD: strsignal.c,v 1.14 2009/07/22 19:48:27 kleink Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 #include "namespace.h"
-#include <unistd.h>
+#include <string.h>
 #include <limits.h>
 #include "extern.h"
 #ifdef __weak_alias
 __weak_alias(strsignal,_strsignal)
 #endif
 __aconst char *
 strsignal(sig)
 	int sig;
+{
 	static char buf[NL_TEXTMAX];