BSD 4_4 release

[unix-history] / usr / src / usr.bin / ranlib / misc.c

diff --git a/usr/src/usr.bin/ranlib/misc.c b/usr/src/usr.bin/ranlib/misc.c
index 0d955b3..d1c8076 100644 (file)
--- a/usr/src/usr.bin/ranlib/misc.c
+++ b/usr/src/usr.bin/ranlib/misc.c
@@ -1,15 +1,41 @@
 /*-
 /*-

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

  *
  * This code is derived from software contributed to Berkeley by
  * Hugh Smith at The University of Guelph.
  *
  *
  * This code is derived from software contributed to Berkeley by
  * Hugh Smith at The University of Guelph.
  *

- * %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.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

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

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


@@ -28,20 +54,19 @@ tmp()
 {
        sigset_t set, oset;
        int fd;
 {
        sigset_t set, oset;
        int fd;

-       char path[MAXPATHLEN];
-
-       bcopy(_PATH_RANTMP, path, sizeof(_PATH_RANTMP));
+       char *envtmp, path[MAXPATHLEN];

 
 

-       sigemptyset(&set);
-       sigaddset(&set, SIGHUP);
-       sigaddset(&set, SIGINT);
-       sigaddset(&set, SIGQUIT);
-       sigaddset(&set, SIGTERM);
+       if ((envtmp = getenv("TMPDIR")) != NULL)
+               (void)sprintf(path, "%s%s", envtmp, strrchr(_PATH_RANTMP, '/'));
+       else
+               bcopy(_PATH_RANTMP, path, sizeof(_PATH_RANTMP));
+       
+       sigfillset(&set);

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

-               error(tname);
+               error(path);

         (void)unlink(path);
         (void)unlink(path);

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

        return(fd);
 }
 
        return(fd);
 }
 


@@ -49,9 +74,9 @@ void *
 emalloc(len)
        int len;
 {
 emalloc(len)
        int len;
 {

-       char *p;
+       void *p;

 
 

-       if (!(p = malloc((u_int)len)))
+       if ((p = malloc((u_int)len)) == NULL)

                error(archive);
        return(p);
 }
                error(archive);
        return(p);
 }