BSD 4_3_Net_2 release

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

diff --git a/usr/src/libexec/bugfiler/process.c b/usr/src/libexec/bugfiler/process.c
index 18dbcc0..6988584 100644 (file)
--- a/usr/src/libexec/bugfiler/process.c
+++ b/usr/src/libexec/bugfiler/process.c
@@ -2,30 +2,48 @@
  * Copyright (c) 1986, 1987 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 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

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

 #endif /* not lint */
 
 #endif /* not lint */
 

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

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

+#include <fcntl.h>
+#include <dirent.h>
+#include <unistd.h>

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

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

 
 char   pfile[MAXPATHLEN];                      /* permanent file name */
 
 
 char   pfile[MAXPATHLEN];                      /* permanent file name */
 


@@ -39,7 +57,7 @@ process()
        register int    rval;                   /* read return value */
        struct timeval  tp;                     /* time of day */
        int     lfd;                            /* lock file descriptor */
        register int    rval;                   /* read return value */
        struct timeval  tp;                     /* time of day */
        int     lfd;                            /* lock file descriptor */

-       char    *ctime();
+       static int getnext();

 
        if (access(LOCK_FILE, R_OK) || (lfd = open(LOCK_FILE, O_RDONLY, 0)) < 0)
                error("can't find lock file %s.", LOCK_FILE);
 
        if (access(LOCK_FILE, R_OK) || (lfd = open(LOCK_FILE, O_RDONLY, 0)) < 0)
                error("can't find lock file %s.", LOCK_FILE);


@@ -69,10 +87,10 @@ process()
  * getnext --
  *     get next file name (number)
  */
  * getnext --
  *     get next file name (number)
  */

-static
+static int

 getnext()
 {
 getnext()
 {

-       register struct direct *d;              /* directory structure */
+       register struct dirent *d;              /* directory structure */

        register DIR *dirp;                     /* directory pointer */
        register int highval, newval;
        register char *p;
        register DIR *dirp;                     /* directory pointer */
        register int highval, newval;
        register char *p;