BSD 4_3_Net_2 release

[unix-history] / usr / src / libexec / bugfiler / bugfiler.c

diff --git a/usr/src/libexec/bugfiler/bugfiler.c b/usr/src/libexec/bugfiler/bugfiler.c
index a248d52..c9aa4c5 100644 (file)
--- a/usr/src/libexec/bugfiler/bugfiler.c
+++ b/usr/src/libexec/bugfiler/bugfiler.c
@@ -2,19 +2,33 @@
  * Copyright (c) 1983, 1986, 1987 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1983, 1986, 1987 Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that: (1) source distributions retain this entire copyright
- * notice and comment, and (2) distributions including binaries display
- * the following acknowledgement:  ``This product includes software
- * developed by the University of California, Berkeley and its contributors''
- * in the documentation or other materials provided with the distribution
- * and in all advertising materials mentioning features or use of this
- * software. 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 ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * 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


@@ -24,18 +38,23 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)bugfiler.c 5.15 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)bugfiler.c 5.16 (Berkeley) 2/25/91";

 #endif /* not lint */
 
 /*
  * Bug report processing program, designed to be invoked
  * through aliases(5).
  */
 #endif /* not lint */
 
 /*
  * Bug report processing program, designed to be invoked
  * through aliases(5).
  */

-#include <bug.h>
+#include <sys/param.h>

 #include <sys/time.h>
 #include <sys/time.h>

-#include <sys/file.h>
+#include <sys/stat.h>
+#include <dirent.h>

 #include <pwd.h>
 #include <pwd.h>

+#include <unistd.h>

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

+#include <stdlib.h>
+#include <string.h>
+#include "bug.h"

 
 char   bfr[MAXBSIZE],                  /* general I/O buffer */
        tmpname[sizeof(TMP_BUG) + 5];   /* temp bug file */
 
 char   bfr[MAXBSIZE],                  /* general I/O buffer */
        tmpname[sizeof(TMP_BUG) + 5];   /* temp bug file */


@@ -49,9 +68,8 @@ main(argc, argv)
        register int    ch;             /* getopts char */
        int     do_ack,                 /* acknowledge bug report */
                do_redist;              /* redistribut BR */
        register int    ch;             /* getopts char */
        int     do_ack,                 /* acknowledge bug report */
                do_redist;              /* redistribut BR */

-       char    *argversion,            /* folder name provided */
-               *strcpy();
-       struct passwd   *getpwnam();
+       char    *argversion;            /* folder name provided */
+       static void logit(), make_copy();

 
        do_ack = do_redist = YES;
        argversion = NULL;
 
        do_ack = do_redist = YES;
        argversion = NULL;


@@ -92,7 +110,7 @@ main(argc, argv)
 
        process();
 
 
        process();
 

-       if (setuid(0, 0))
+       if (setuid(0))

                error("can't set id to root.", CHN);
        if (do_ack)
                reply();
                error("can't set id to root.", CHN);
        if (do_ack)
                reply();


@@ -106,17 +124,15 @@ main(argc, argv)
  * make_copy --
  *     make a copy of bug report in error folder
  */
  * make_copy --
  *     make a copy of bug report in error folder
  */

-static
+static void

 make_copy()
 {
        register int    cnt,                    /* read return value */
                        tfd;                    /* temp file descriptor */
        char    *strcpy();
 
 make_copy()
 {
        register int    cnt,                    /* read return value */
                        tfd;                    /* temp file descriptor */
        char    *strcpy();
 

-       if (access(TMP_DIR, F_OK)) {
-               (void)mkdir(TMP_DIR);
-               (void)chmod(TMP_DIR, 0775);
-       }
+       if (access(TMP_DIR, F_OK))
+               (void)mkdir(TMP_DIR, S_IRWXU|S_IRWXG|S_IROTH|S_IXOTH);

        (void)strcpy(tmpname, TMP_BUG);
        if (tfd = mkstemp(tmpname)) {
                while ((cnt = read(fileno(stdin), bfr, sizeof(bfr))) != ERR && cnt)
        (void)strcpy(tmpname, TMP_BUG);
        if (tfd = mkstemp(tmpname)) {
                while ((cnt = read(fileno(stdin), bfr, sizeof(bfr))) != ERR && cnt)


@@ -131,7 +147,7 @@ make_copy()
  * logit --
  *     log this run of the bugfiler
  */
  * logit --
  *     log this run of the bugfiler
  */

-static
+static void

 logit()
 {
        struct timeval  tp;
 logit()
 {
        struct timeval  tp;