BSD 4_3_Net_2 release

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

diff --git a/usr/src/lib/libc/stdio/tmpfile.c b/usr/src/lib/libc/stdio/tmpfile.c
index 6e729a9..7c54dbb 100644 (file)
--- a/usr/src/lib/libc/stdio/tmpfile.c
+++ b/usr/src/lib/libc/stdio/tmpfile.c
@@ -5,11 +5,37 @@
  * This code is derived from software contributed to Berkeley by
  * Chris Torek.
  *
  * This code is derived from software contributed to Berkeley by
  * Chris Torek.
  *

- * %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[] = "@(#)tmpfile.c  5.3 (Berkeley) %G%";
+static char sccsid[] = "@(#)tmpfile.c  5.4 (Berkeley) 5/27/91";

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


@@ -31,27 +57,23 @@ tmpfile()
        bcopy(_PATH_TMP, buf, sizeof(_PATH_TMP) - 1);
        bcopy(TRAILER, buf + sizeof(_PATH_TMP) - 1, sizeof(TRAILER));
 
        bcopy(_PATH_TMP, buf, sizeof(_PATH_TMP) - 1);
        bcopy(TRAILER, buf + sizeof(_PATH_TMP) - 1, sizeof(TRAILER));
 

-       sigemptyset(&set);
-       sigaddset(&set, SIGHUP);
-       sigaddset(&set, SIGINT);
-       sigaddset(&set, SIGQUIT);
-       sigaddset(&set, SIGTERM);
+       sigfillset(&set);

        (void)sigprocmask(SIG_BLOCK, &set, &oset);
 
        fd = mkstemp(buf);
        if (fd != -1)
                (void)unlink(buf);
 
        (void)sigprocmask(SIG_BLOCK, &set, &oset);
 
        fd = mkstemp(buf);
        if (fd != -1)
                (void)unlink(buf);
 

-       (void)sigprocmask(SIG_SETMASK, &oset, (sigset_t *)NULL);
+       (void)sigprocmask(SIG_SETMASK, &oset, NULL);

 
        if (fd == -1)
 
        if (fd == -1)

-               return(NULL);
+               return (NULL);

 
        if (!(fp = fdopen(fd, "w+"))) {
                sverrno = errno;
                (void)close(fd);
                errno = sverrno;
 
        if (!(fp = fdopen(fd, "w+"))) {
                sverrno = errno;
                (void)close(fd);
                errno = sverrno;

-               return(NULL);
+               return (NULL);

        }
        }

-       return(fp);
+       return (fp);

 }
 }