BSD 4_4 release

[unix-history] / usr / src / lib / libc / stdio / tempnam.c

diff --git a/usr/src/lib/libc/stdio/tempnam.c b/usr/src/lib/libc/stdio/tempnam.c
index 76f6444..6644ae5 100644 (file)
--- a/usr/src/lib/libc/stdio/tempnam.c
+++ b/usr/src/lib/libc/stdio/tempnam.c
@@ -1,69 +1,86 @@
 /*
 /*

- * Copyright (c) 1988 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * 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.

  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)tempnam.c  4.8 (Berkeley) %G%";
+static char sccsid[] = "@(#)tempnam.c  8.1 (Berkeley) 6/4/93";

 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>

+#include <errno.h>

 #include <stdio.h>
 #include <stdio.h>

-
-#define        P_tmpdir        "/usr/tmp"
-
-FILE *
-tmpfile()
-{
-       FILE *fp;
-       char *f, *tmpnam();
-
-       if (!(f = tmpnam((char *)NULL)) || !(fp = fopen(f, "w+"))) {
-               fprintf(stderr, "tmpfile: cannot open %s.\n", f);
-               return(NULL);
-       }
-       (void)unlink(f);
-       return(fp);
-}
-
-char *
-tmpnam(s)
-       char *s;
-{
-       char *malloc(), *mktemp();
-
-       if (!s && !(s = malloc((u_int)MAXPATHLEN)))
-               return(NULL);
-       (void)sprintf(s, "%s/XXXXXX", P_tmpdir);
-       return(mktemp(s));
-}
+#include <stdlib.h>
+#include <unistd.h>
+#include <paths.h>

 
 char *
 tempnam(dir, pfx)
 
 char *
 tempnam(dir, pfx)

-       char *dir, *pfx;
+       const char *dir, *pfx;

 {
 {

-       char *f, *name, *getenv(), *malloc(), *mktemp();
+       int sverrno;
+       char *f, *name;

 
 

-       if (!(name = malloc((u_int)MAXPATHLEN)))
+       if (!(name = malloc(MAXPATHLEN)))

                return(NULL);
 
                return(NULL);
 

+       if (!pfx)
+               pfx = "tmp.";
+

        if (f = getenv("TMPDIR")) {
        if (f = getenv("TMPDIR")) {

-               (void)sprintf(name, "%s/%sXXXXXX", f, pfx ? "" : pfx);
+               (void)snprintf(name, MAXPATHLEN, "%s%s%sXXXXXX", f,
+                   *(f + strlen(f) - 1) == '/'? "": "/", pfx);

                if (f = mktemp(name))
                        return(f);
        }
                if (f = mktemp(name))
                        return(f);
        }

-       if (dir) {
-               (void)sprintf(name, "%s/%sXXXXXX", dir, pfx ? "" : pfx);
+
+       if (f = (char *)dir) {
+               (void)snprintf(name, MAXPATHLEN, "%s%s%sXXXXXX", f,
+                   *(f + strlen(f) - 1) == '/'? "": "/", pfx);

                if (f = mktemp(name))
                        return(f);
        }
                if (f = mktemp(name))
                        return(f);
        }

-       (void)sprintf(name, "%s/%sXXXXXX", P_tmpdir, pfx ? "" : pfx);
+
+       f = P_tmpdir;
+       (void)snprintf(name, MAXPATHLEN, "%s%sXXXXXX", f, pfx);

        if (f = mktemp(name))
                return(f);
        if (f = mktemp(name))
                return(f);

-       (void)sprintf(name, "/tmp/%sXXXXXX", pfx ? "" : pfx);
-       if (!(f = mktemp(name)))
-               (void)free(name);
-       return(f);
+
+       f = _PATH_TMP;
+       (void)snprintf(name, MAXPATHLEN, "%s%sXXXXXX", f, pfx);
+       if (f = mktemp(name))
+               return(f);
+
+       sverrno = errno;
+       free(name);
+       errno = sverrno;
+       return(NULL);

 }
 }