When listing the async-signal-safe functions, don't split out "ANSI C"

functions; the concept comes from POSIX anyway.

With tweaks from schwarze@
ok deraadt@, jmc@, millert@, schwarze@

2 files changed, 22 insertions, 30 deletions

diff --git a/lib/libc/gen/signal.3 b/lib/libc/gen/signal.3
index 690c8fc96d8..2aabe8bc4d4 100644
--- a/lib/libc/gen/signal.3
+++ b/lib/libc/gen/signal.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: signal.3,v 1.51 2014/09/15 06:18:36 guenther Exp $
+.\"	$OpenBSD: signal.3,v 1.52 2014/11/17 00:11:05 guenther Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: September 15 2014 $
+.Dd $Mdocdate: November 17 2014 $
 .Dt SIGNAL 3
 .Os
 .Sh NAME
@@ -239,9 +239,10 @@ by signals and are async-signal-safe.
 Therefore applications may
 invoke them, without restriction, from signal-catching functions:
 .Pp
-Base Interfaces:
+Standard Interfaces:
 .Pp
 .Fn _exit ,
+.Fn _Exit ,
 .Fn abort ,
 .Fn accept ,
 .Fn access ,
@@ -271,6 +272,7 @@ Base Interfaces:
 .Fn fchown ,
 .Fn fchownat ,
 .Fn fcntl ,
+.Fn fdatasync ,
 .Fn fork ,
 .Fn fpathconf ,
 .Fn fstat ,
@@ -346,6 +348,10 @@ Base Interfaces:
 .Fn socket ,
 .Fn socketpair ,
 .Fn stat ,
+.Fn strcat ,
+.Fn strcpy ,
+.Fn strncat ,
+.Fn strncpy ,
 .Fn symlink ,
 .Fn symlinkat ,
 .Fn sysconf ,
@@ -368,8 +374,8 @@ Base Interfaces:
 .Fn utimes ,
 .Fn wait ,
 .Fn waitpid ,
-.Fn write .
-.Pp
+.Fn write ,
+and perhaps some others.
 .\" unimplemented functions that should be async-sig-safe, if we had them
 .\" POSIX Issue 7 additions
 .\" .Pp
@@ -380,21 +386,11 @@ Base Interfaces:
 .\" .Fn aio_error ,
 .\" .Fn aio_return ,
 .\" .Fn aio_suspend ,
-.\" .Fn fdatasync ,
 .\" .Fn sem_post ,
 .\" .Fn sigqueue ,
 .\" .Fn timer_getoverrun ,
 .\" .Fn timer_gettime ,
 .\" .Fn timer_settime .
-ANSI C Interfaces:
-.Pp
-.Fn _Exit ,
-.Fn raise ,
-.Fn strcat ,
-.Fn strcpy ,
-.Fn strncat ,
-.Fn strncpy ,
-and perhaps some others.
 .Pp
 Extension Interfaces:
 .Pp
diff --git a/lib/libc/sys/sigaction.2 b/lib/libc/sys/sigaction.2
index e7f1bed1aab..799cec5ade1 100644
--- a/lib/libc/sys/sigaction.2
+++ b/lib/libc/sys/sigaction.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sigaction.2,v 1.66 2014/09/15 06:18:36 guenther Exp $
+.\"	$OpenBSD: sigaction.2,v 1.67 2014/11/17 00:11:05 guenther Exp $
 .\"	$NetBSD: sigaction.2,v 1.7 1995/10/12 15:41:16 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)sigaction.2	8.2 (Berkeley) 4/3/94
 .\"
-.Dd $Mdocdate: September 15 2014 $
+.Dd $Mdocdate: November 17 2014 $
 .Dt SIGACTION 2
 .Os
 .Sh NAME
@@ -463,9 +463,10 @@ by signals and are async-signal-safe.
 Therefore applications may
 invoke them, without restriction, from signal-catching functions:
 .Pp
-Base Interfaces:
+Standard Interfaces:
 .Pp
 .Fn _exit ,
+.Fn _Exit ,
 .Fn abort ,
 .Fn accept ,
 .Fn access ,
@@ -571,6 +572,10 @@ Base Interfaces:
 .Fn socket ,
 .Fn socketpair ,
 .Fn stat ,
+.Fn strcat ,
+.Fn strcpy ,
+.Fn strncat ,
+.Fn strncpy ,
 .Fn symlink ,
 .Fn symlinkat ,
 .Fn sysconf ,
@@ -589,12 +594,12 @@ Base Interfaces:
 .Fn unlink ,
 .Fn unlinkat ,
 .Fn utime ,
-.Fn utimensat .
+.Fn utimensat ,
 .Fn utimes ,
 .Fn wait ,
 .Fn waitpid ,
-.Fn write .
-.Pp
+.Fn write ,
+and perhaps some others.
 .\" unimplemented functions that should be async-sig-safe, if we had them
 .\" POSIX Issue 7 additions
 .\" .Pp
@@ -610,15 +615,6 @@ Base Interfaces:
 .\" .Fn timer_getoverrun ,
 .\" .Fn timer_gettime ,
 .\" .Fn timer_settime .
-ANSI C Interfaces:
-.Pp
-.Fn _Exit ,
-.Fn raise ,
-.Fn strcat ,
-.Fn strcpy ,
-.Fn strncat ,
-.Fn strncpy ,
-and perhaps some others.
 .Pp
 Extension Interfaces:
 .Pp