---- mktemp.3 2004-11-25 11:38:35.000000000 -0800
-+++ mktemp.3.edit 2006-07-12 11:24:49.000000000 -0700
-@@ -36,20 +36,33 @@
+--- mktemp.3.orig 2010-04-28 23:38:47.000000000 -0700
++++ mktemp.3 2010-04-29 11:05:28.000000000 -0700
+@@ -32,6 +32,9 @@
.Dt MKTEMP 3
.Os
.Sh NAME
--.Nm mktemp
+.Nm mkdtemp ,
+.Nm mkstemp ,
-+.Nm mktemp ,
-+.Nm mktemps
++.Nm mkstemps ,
+ .Nm mktemp
.Nd make temporary file name (unique)
.Sh LIBRARY
- .Lb libc
+@@ -39,13 +42,23 @@
.Sh SYNOPSIS
.In unistd.h
.Ft char *
.Sh DESCRIPTION
The
.Fn mktemp
-@@ -137,7 +150,7 @@
+@@ -133,7 +146,7 @@ The pathname portion of the template is
.Pp
The
.Fn mkstemp ,
and
.Fn mkdtemp
functions
-@@ -171,7 +184,7 @@
+@@ -167,7 +180,7 @@ A common problem that results in a core
passes in a read-only string to
.Fn mktemp ,
.Fn mkstemp ,
or
.Fn mkdtemp .
This is common with programs that were developed before
-@@ -226,12 +239,19 @@
- You must provide your own locking around this and other consumers of the
- .Xr arc4random 3
- API.
+@@ -186,12 +199,19 @@ so that it will store string constants i
+ See
+ .Xr gcc 1
+ for more information.
+.Sh LEGACY SYNOPSIS
+.Fd #include <unistd.h>
+.Pp
.Sh HISTORY
A
.Fn mktemp
+@@ -242,10 +262,3 @@ and the return status of the call should
+ This will ensure that the program does not continue blindly
+ in the event that an attacker has already created the file
+ with the intention of manipulating or reading its contents.
+-.Pp
+-The implementation of these functions calls
+-.Xr arc4random 3 ,
+-which is not reentrant.
+-You must provide your own locking around this and other consumers of the
+-.Xr arc4random 3
+-API.