From 5eb8ccf583a57a41a819a4fc2abb5175247fb418 Mon Sep 17 00:00:00 2001 From: "Andrey A. Chernov" Date: Sun, 24 Oct 1999 11:57:24 +0000 Subject: [PATCH] Remove UNSAFE_WARN ifdef for mktemp warning (never defined) Use _mktemp internally --- lib/libc/stdio/mktemp.c | 2 -- lib/libc/stdio/tempnam.c | 6 +++--- lib/libc/stdio/tmpnam.c | 4 +++- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libc/stdio/mktemp.c b/lib/libc/stdio/mktemp.c index ec03f714433..0d1712e9e4e 100644 --- a/lib/libc/stdio/mktemp.c +++ b/lib/libc/stdio/mktemp.c @@ -85,10 +85,8 @@ _mktemp(path) return(_gettemp(path, (int *)NULL, 0, 0) ? path : (char *)NULL); } -#ifdef UNSAFE_WARN __warn_references(mktemp, "warning: mktemp() possibly used unsafely; consider using mkstemp()"); -#endif char * mktemp(path) diff --git a/lib/libc/stdio/tempnam.c b/lib/libc/stdio/tempnam.c index 5572654fa12..dc34c7d2500 100644 --- a/lib/libc/stdio/tempnam.c +++ b/lib/libc/stdio/tempnam.c @@ -75,18 +75,18 @@ tempnam(dir, pfx) if ((f = (char *)dir)) { (void)snprintf(name, MAXPATHLEN, "%s%s%sXXXXXX", f, *(f + strlen(f) - 1) == '/'? "": "/", pfx); - if ((f = mktemp(name))) + if ((f = _mktemp(name))) return(f); } f = P_tmpdir; (void)snprintf(name, MAXPATHLEN, "%s%sXXXXXX", f, pfx); - if ((f = mktemp(name))) + if ((f = _mktemp(name))) return(f); f = _PATH_TMP; (void)snprintf(name, MAXPATHLEN, "%s%sXXXXXX", f, pfx); - if ((f = mktemp(name))) + if ((f = _mktemp(name))) return(f); sverrno = errno; diff --git a/lib/libc/stdio/tmpnam.c b/lib/libc/stdio/tmpnam.c index d0aed481387..ff1c0385770 100644 --- a/lib/libc/stdio/tmpnam.c +++ b/lib/libc/stdio/tmpnam.c @@ -32,6 +32,8 @@ * 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. + * + * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) @@ -59,5 +61,5 @@ tmpnam(s) s = buf; (void)snprintf(s, L_tmpnam, "%stmp.%lu.XXXXXX", P_tmpdir, tmpcount); ++tmpcount; - return (mktemp(s)); + return (_mktemp(s)); }