Module Name: src
Committed By: kleink
Date: Wed Jul 22 19:48:27 UTC 2009
Modified Files:
src/include: string.h unistd.h
src/lib/libc/string: strsignal.3 strsignal.c
Log Message:
Declare strsignal(3) in <string.h>, per POSIX-2008, and adjust
documentation accordingly.
Fixes PR standards/41325 from Perry E. Metzger.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/include/string.h
cvs rdiff -u -r1.120 -r1.121 src/include/unistd.h
cvs rdiff -u -r1.9 -r1.10 src/lib/libc/string/strsignal.3
cvs rdiff -u -r1.13 -r1.14 src/lib/libc/string/strsignal.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/include/string.h
diff -u src/include/string.h:1.38 src/include/string.h:1.39
--- src/include/string.h:1.38 Fri May 1 20:01:23 2009
+++ src/include/string.h Wed Jul 22 19:48:27 2009
@@ -1,4 +1,4 @@
-/* $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
@@ -84,13 +84,16 @@
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
Index: src/include/unistd.h
diff -u src/include/unistd.h:1.120 src/include/unistd.h:1.121
--- src/include/unistd.h:1.120 Sun Jan 11 03:04:12 2009
+++ src/include/unistd.h Wed Jul 22 19:48:27 2009
@@ -1,4 +1,4 @@
-/* $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.
@@ -327,7 +327,11 @@
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, ...);
Index: src/lib/libc/string/strsignal.3
diff -u src/lib/libc/string/strsignal.3:1.9 src/lib/libc/string/strsignal.3:1.10
--- src/lib/libc/string/strsignal.3:1.9 Thu Aug 7 16:43:52 2003
+++ src/lib/libc/string/strsignal.3 Wed Jul 22 19:48:27 2009
@@ -30,9 +30,9 @@
.\" 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
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.In unistd.h
+.In string.h
.Ft char *
.Fn strsignal "int sig"
.Sh DESCRIPTION
@@ -57,3 +57,8 @@
.Xr intro 2 ,
.Xr psignal 3 ,
.Xr setlocale 3
+.\" .Sh STANDARDS
+.\" The
+.\" .Fn strsignal
+.\" function conforms to
+.\" .St -p1003.1-2008 .
Index: src/lib/libc/string/strsignal.c
diff -u src/lib/libc/string/strsignal.c:1.13 src/lib/libc/string/strsignal.c:1.14
--- src/lib/libc/string/strsignal.c:1.13 Tue Nov 29 03:12:00 2005
+++ src/lib/libc/string/strsignal.c Wed Jul 22 19:48:27 2009
@@ -1,4 +1,4 @@
-/* $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.
@@ -34,12 +34,12 @@
#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"
