From: deraadt Date: Wed, 12 Feb 1997 20:44:47 +0000 (+0000) Subject: more XXXX for mktemp X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=9a23e4f5089d0050f4ee719262dc2b5f1994e839;p=openbsd more XXXX for mktemp --- diff --git a/lib/libc/stdio/tempnam.c b/lib/libc/stdio/tempnam.c index 9e5b71177f5..d2060b0d18e 100644 --- a/lib/libc/stdio/tempnam.c +++ b/lib/libc/stdio/tempnam.c @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: tempnam.c,v 1.7 1997/01/20 07:46:57 graichen Exp $"; +static char rcsid[] = "$OpenBSD: tempnam.c,v 1.8 1997/02/12 20:44:47 deraadt Exp $"; #endif /* LIBC_SCCS and not lint */ #include @@ -62,26 +62,26 @@ tempnam(dir, pfx) pfx = "tmp."; if (issetugid() == 0 && (f = getenv("TMPDIR"))) { - (void)snprintf(name, MAXPATHLEN, "%s%s%sXXXXXX", f, + (void)snprintf(name, MAXPATHLEN, "%s%s%sXXXXXXXXX", f, *(f + strlen(f) - 1) == '/'? "": "/", pfx); if (f = _mktemp(name)) return(f); } if (f = (char *)dir) { - (void)snprintf(name, MAXPATHLEN, "%s%s%sXXXXXX", f, + (void)snprintf(name, MAXPATHLEN, "%s%s%sXXXXXXXXX", f, *(f + strlen(f) - 1) == '/'? "": "/", pfx); if (f = _mktemp(name)) return(f); } f = P_tmpdir; - (void)snprintf(name, MAXPATHLEN, "%s%sXXXXXX", f, pfx); + (void)snprintf(name, MAXPATHLEN, "%s%sXXXXXXXXX", f, pfx); if (f = _mktemp(name)) return(f); f = _PATH_TMP; - (void)snprintf(name, MAXPATHLEN, "%s%sXXXXXX", f, pfx); + (void)snprintf(name, MAXPATHLEN, "%s%sXXXXXXXXX", f, pfx); if (f = _mktemp(name)) return(f); diff --git a/lib/libc/stdio/tmpfile.c b/lib/libc/stdio/tmpfile.c index fdf116c538e..5f558efee99 100644 --- a/lib/libc/stdio/tmpfile.c +++ b/lib/libc/stdio/tmpfile.c @@ -35,7 +35,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: tmpfile.c,v 1.2 1996/08/19 08:33:09 tholo Exp $"; +static char rcsid[] = "$OpenBSD: tmpfile.c,v 1.3 1997/02/12 20:44:49 deraadt Exp $"; #endif /* LIBC_SCCS and not lint */ #include @@ -52,7 +52,7 @@ tmpfile() sigset_t set, oset; FILE *fp; int fd, sverrno; -#define TRAILER "tmp.XXXXXX" +#define TRAILER "tmp.XXXXXXXXX" char buf[sizeof(_PATH_TMP) + sizeof(TRAILER)]; (void)memcpy(buf, _PATH_TMP, sizeof(_PATH_TMP) - 1);