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 73fc9b7..6988584 100644 (file)
--- a/usr/src/libexec/bugfiler/process.c
+++ b/usr/src/libexec/bugfiler/process.c
@@ -1,18 +1,49 @@
 /*
 /*

- * Copyright (c) 1986 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1986, 1987 Regents of the University of California.
+ * All rights reserved.
+ *
+ * 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.3 (Berkeley) 87/04/11";
-#endif not lint
+static char sccsid[] = "@(#)process.c  5.9 (Berkeley) 2/25/91";
+#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 */
 


@@ -26,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);


@@ -47,7 +78,7 @@ process()
                error("can't append to summary file %s.", bfr);
        if (gettimeofday(&tp, (struct timezone *)NULL))
                error("can't get time of day.", CHN);
                error("can't append to summary file %s.", bfr);
        if (gettimeofday(&tp, (struct timezone *)NULL))
                error("can't get time of day.", CHN);

-       printf("\n%s\t\t%s\t%s\t%s\tOwner: Bugs Bunny\n\tComment: Received\n", pfile, ctime(&tp.tv_sec), mailhead[INDX_TAG].line, mailhead[SUBJ_TAG].found ? mailhead[SUBJ_TAG].line : "Subject:\n");
+       printf("\n%s\t\t%s\t%s\t%s\tOwner: Bugs Bunny\n\tStatus: Received\n", pfile, ctime(&tp.tv_sec), mailhead[INDX_TAG].line, mailhead[SUBJ_TAG].found ? mailhead[SUBJ_TAG].line : "Subject:\n");

        (void)flock(lfd, LOCK_UN);
        (void)fclose(stdout);
 }
        (void)flock(lfd, LOCK_UN);
        (void)fclose(stdout);
 }


@@ -56,27 +87,22 @@ 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 DIR    *dirp;                  /* directory pointer */
-       register int    highval,
-                       newval;
-       register char   *C;
+       register struct dirent *d;              /* directory structure */
+       register DIR *dirp;                     /* directory pointer */
+       register int highval, newval;
+       register char *p;

 
 

-       sprintf(bfr, "%s/%s", dir, folder);
+       (void)sprintf(bfr, "%s/%s", dir, folder);

        if (!(dirp = opendir(bfr)))
                error("can't read folder directory %s.", bfr);
        if (!(dirp = opendir(bfr)))
                error("can't read folder directory %s.", bfr);

-       for (highval = 0;d = readdir(dirp);)
-               for (C = d->d_name;;++C)
-                       if (!*C) {
-                               if ((newval = atoi(d->d_name)) > highval)
-                                       highval = newval;
-                               break;
-                       }
-                       else if (!isdigit(*C))
-                               break;
+       for (highval = -1; d = readdir(dirp);) {
+               for (p = d->d_name; *p && isdigit(*p); ++p);
+               if (!*p && (newval = atoi(d->d_name)) > highval)
+                       highval = newval;
+       }

        closedir(dirp);
        return(++highval);
 }
        closedir(dirp);
        return(++highval);
 }