prettiness police

[unix-history] / usr / src / usr.sbin / syslogd / syslogd.c

diff --git a/usr/src/usr.sbin/syslogd/syslogd.c b/usr/src/usr.sbin/syslogd/syslogd.c
index 88166ca..485c5d7 100644 (file)
--- a/usr/src/usr.sbin/syslogd/syslogd.c
+++ b/usr/src/usr.sbin/syslogd/syslogd.c
@@ -1,18 +1,18 @@
 /*
 /*

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

  *
  * %sccs.include.redist.c%
  */
 
 #ifndef lint
  *
  * %sccs.include.redist.c%
  */
 
 #ifndef lint

-char copyright[] =
-"@(#) Copyright (c) 1983, 1988 Regents of the University of California.\n\
- All rights reserved.\n";
+static char copyright[] =
+"@(#) Copyright (c) 1983, 1988, 1993, 1994\n\
+       The Regents of the University of California.  All rights reserved.\n";

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

-static char sccsid[] = "@(#)syslogd.c  5.45 (Berkeley) %G%";
+static char sccsid[] = "@(#)syslogd.c  8.3 (Berkeley) %G%";

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


@@ -44,28 +44,30 @@ static char sccsid[] = "@(#)syslogd.c       5.45 (Berkeley) %G%";
 #define TIMERINTVL     30              /* interval for checking flush, mark */
 
 #include <sys/param.h>
 #define TIMERINTVL     30              /* interval for checking flush, mark */
 
 #include <sys/param.h>

-#include <sys/errno.h>

 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <sys/socket.h>

-#include <sys/file.h>

 #include <sys/msgbuf.h>
 #include <sys/uio.h>
 #include <sys/un.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <sys/msgbuf.h>
 #include <sys/uio.h>
 #include <sys/un.h>
 #include <sys/time.h>
 #include <sys/resource.h>

-#include <sys/signal.h>

 
 #include <netinet/in.h>
 #include <netdb.h>
 
 #include <netinet/in.h>
 #include <netdb.h>

+#include <arpa/inet.h>

 
 

-#include <utmp.h>
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>

 #include <setjmp.h>
 #include <setjmp.h>

+#include <signal.h>

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

-#include <ctype.h>
+#include <stdlib.h>

 #include <string.h>
 #include <unistd.h>
 #include <string.h>
 #include <unistd.h>

+#include <utmp.h>

 #include "pathnames.h"
 
 #define SYSLOG_NAMES
 #include "pathnames.h"
 
 #define SYSLOG_NAMES


@@ -158,27 +160,35 @@ int       Initialized = 0;        /* set when we have initialized ourselves */
 int    MarkInterval = 20 * 60; /* interval between marks in seconds */
 int    MarkSeq = 0;            /* mark sequence number */
 
 int    MarkInterval = 20 * 60; /* interval between marks in seconds */
 int    MarkSeq = 0;            /* mark sequence number */
 

-extern int errno;
-extern char *ctime(), *index(), *calloc();
-
+void   cfline __P((char *, struct filed *));
+char   *cvthname __P((struct sockaddr_in *));
+int    decode __P((const char *, CODE *));
+void   die __P((int));
+void   domark __P((int));
+void   fprintlog __P((struct filed *, int, char *));
+void   init __P((int));
+void   logerror __P((char *));
+void   logmsg __P((int, char *, char *, int));
+void   printline __P((char *, char *));
+void   printsys __P((char *));
+void   reapchild __P((int));
+char   *ttymsg __P((struct iovec *, int, char *, int));
+void   usage __P((void));
+void   wallmsg __P((struct filed *, struct iovec *));
+
+int

 main(argc, argv)
        int argc;
 main(argc, argv)
        int argc;

-       char **argv;
+       char *argv[];

 {
 {

-       register int i;
-       register char *p;
-       int funix, inetm, fklog, klogm, len;
+       int ch, funix, i, inetm, fklog, klogm, len;

        struct sockaddr_un sunx, fromunix;
        struct sockaddr_in sin, frominet;
        FILE *fp;
        struct sockaddr_un sunx, fromunix;
        struct sockaddr_in sin, frominet;
        FILE *fp;

-       int ch;
-       char line[MSG_BSIZE + 1];
-       extern int optind;
-       extern char *optarg;
-       void die(), domark(), init(), reapchild();
+       char *p, line[MSG_BSIZE + 1];

 
        while ((ch = getopt(argc, argv, "df:m:p:")) != EOF)
 
        while ((ch = getopt(argc, argv, "df:m:p:")) != EOF)

-               switch((char)ch) {
+               switch(ch) {

                case 'd':               /* debug */
                        Debug++;
                        break;
                case 'd':               /* debug */
                        Debug++;
                        break;


@@ -195,38 +205,39 @@ main(argc, argv)
                default:
                        usage();
                }
                default:
                        usage();
                }

-       if (argc -= optind)
+       if ((argc -= optind) != 0)

                usage();
 
        if (!Debug)
                usage();
 
        if (!Debug)

-               daemon(0, 0);
+               (void)daemon(0, 0);

        else
                setlinebuf(stdout);
 
        consfile.f_type = F_CONSOLE;
        else
                setlinebuf(stdout);
 
        consfile.f_type = F_CONSOLE;

-       (void) strcpy(consfile.f_un.f_fname, ctty);
-       (void) gethostname(LocalHostName, sizeof LocalHostName);
-       if (p = index(LocalHostName, '.')) {
+       (void)strcpy(consfile.f_un.f_fname, ctty);
+       (void)gethostname(LocalHostName, sizeof(LocalHostName));
+       if ((p = strchr(LocalHostName, '.')) != NULL) {

                *p++ = '\0';
                LocalDomain = p;
                *p++ = '\0';
                LocalDomain = p;

-       }
-       else
+       } else

                LocalDomain = "";
                LocalDomain = "";

-       (void) signal(SIGTERM, die);
-       (void) signal(SIGINT, Debug ? die : SIG_IGN);
-       (void) signal(SIGQUIT, Debug ? die : SIG_IGN);
-       (void) signal(SIGCHLD, reapchild);
-       (void) signal(SIGALRM, domark);
-       (void) alarm(TIMERINTVL);
-       (void) unlink(LogName);
-
-       bzero((char *)&sunx, sizeof(sunx));
+       (void)signal(SIGTERM, die);
+       (void)signal(SIGINT, Debug ? die : SIG_IGN);
+       (void)signal(SIGQUIT, Debug ? die : SIG_IGN);
+       (void)signal(SIGCHLD, reapchild);
+       (void)signal(SIGALRM, domark);
+       (void)alarm(TIMERINTVL);
+       (void)unlink(LogName);
+
+#ifndef SUN_LEN
+#define SUN_LEN(unp) (strlen((unp)->sun_path) + 2)
+#endif
+       memset(&sunx, 0, sizeof(sunx));

        sunx.sun_family = AF_UNIX;
        sunx.sun_family = AF_UNIX;

-       (void) strncpy(sunx.sun_path, LogName, sizeof sunx.sun_path);
+       (void)strncpy(sunx.sun_path, LogName, sizeof(sunx.sun_path));

        funix = socket(AF_UNIX, SOCK_DGRAM, 0);
        funix = socket(AF_UNIX, SOCK_DGRAM, 0);

-       if (funix < 0 || bind(funix, (struct sockaddr *) &sunx,
-           sizeof(sunx.sun_family)+sizeof(sunx.sun_len)+
-           strlen(sunx.sun_path)) < 0 ||
+       if (funix < 0 ||
+           bind(funix, (struct sockaddr *)&sunx, SUN_LEN(&sunx)) < 0 ||

            chmod(LogName, 0666) < 0) {
                (void) sprintf(line, "cannot create %s", LogName);
                logerror(line);
            chmod(LogName, 0666) < 0) {
                (void) sprintf(line, "cannot create %s", LogName);
                logerror(line);


@@ -234,6 +245,7 @@ main(argc, argv)
                die(0);
        }
        finet = socket(AF_INET, SOCK_DGRAM, 0);
                die(0);
        }
        finet = socket(AF_INET, SOCK_DGRAM, 0);

+       inetm = 0;

        if (finet >= 0) {
                struct servent *sp;
 
        if (finet >= 0) {
                struct servent *sp;
 


@@ -243,6 +255,7 @@ main(argc, argv)
                        logerror("syslog/udp: unknown service");
                        die(0);
                }
                        logerror("syslog/udp: unknown service");
                        die(0);
                }

+               memset(&sin, 0, sizeof(sin));

                sin.sin_family = AF_INET;
                sin.sin_port = LogPort = sp->s_port;
                if (bind(finet, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
                sin.sin_family = AF_INET;
                sin.sin_port = LogPort = sp->s_port;
                if (bind(finet, (struct sockaddr *)&sin, sizeof(sin)) < 0) {


@@ -270,16 +283,15 @@ main(argc, argv)
 
        dprintf("off & running....\n");
 
 
        dprintf("off & running....\n");
 

-       init();
-       (void) signal(SIGHUP, init);
+       init(0);
+       (void)signal(SIGHUP, init);

 
        for (;;) {
                int nfds, readfds = FDMASK(funix) | inetm | klogm;
 
 
        for (;;) {
                int nfds, readfds = FDMASK(funix) | inetm | klogm;
 

-               errno = 0;

                dprintf("readfds = %#x\n", readfds);
                dprintf("readfds = %#x\n", readfds);

-               nfds = select(20, (fd_set *) &readfds, (fd_set *) NULL,
-                   (fd_set *) NULL, (struct timeval *) NULL);
+               nfds = select(20, (fd_set *)&readfds, (fd_set *)NULL,
+                   (fd_set *)NULL, (struct timeval *)NULL);

                if (nfds == 0)
                        continue;
                if (nfds < 0) {
                if (nfds == 0)
                        continue;
                if (nfds < 0) {


@@ -300,9 +312,9 @@ main(argc, argv)
                        }
                }
                if (readfds & FDMASK(funix)) {
                        }
                }
                if (readfds & FDMASK(funix)) {

-                       len = sizeof fromunix;
+                       len = sizeof(fromunix);

                        i = recvfrom(funix, line, MAXLINE, 0,
                        i = recvfrom(funix, line, MAXLINE, 0,

-                           (struct sockaddr *) &fromunix, &len);
+                           (struct sockaddr *)&fromunix, &len);

                        if (i > 0) {
                                line[i] = '\0';
                                printline(LocalHostName, line);
                        if (i > 0) {
                                line[i] = '\0';
                                printline(LocalHostName, line);


@@ -310,12 +322,10 @@ main(argc, argv)
                                logerror("recvfrom unix");
                }
                if (readfds & inetm) {
                                logerror("recvfrom unix");
                }
                if (readfds & inetm) {

-                       len = sizeof frominet;
+                       len = sizeof(frominet);

                        i = recvfrom(finet, line, MAXLINE, 0,
                        i = recvfrom(finet, line, MAXLINE, 0,

-                           (struct sockaddr *) &frominet, &len);
+                           (struct sockaddr *)&frominet, &len);

                        if (i > 0) {
                        if (i > 0) {

-                               extern char *cvthname();
-

                                line[i] = '\0';
                                printline(cvthname(&frominet), line);
                        } else if (i < 0 && errno != EINTR)
                                line[i] = '\0';
                                printline(cvthname(&frominet), line);
                        } else if (i < 0 && errno != EINTR)


@@ -324,9 +334,11 @@ main(argc, argv)
        }
 }
 
        }
 }
 

+void

 usage()
 {
 usage()
 {

-       (void) fprintf(stderr,
+
+       (void)fprintf(stderr,

            "usage: syslogd [-f conffile] [-m markinterval] [-p logpath]\n");
        exit(1);
 }
            "usage: syslogd [-f conffile] [-m markinterval] [-p logpath]\n");
        exit(1);
 }


@@ -335,15 +347,13 @@ usage()
  * Take a raw input line, decode the message, and print the message
  * on the appropriate log files.
  */
  * Take a raw input line, decode the message, and print the message
  * on the appropriate log files.
  */

-
+void

 printline(hname, msg)
        char *hname;
        char *msg;
 {
 printline(hname, msg)
        char *hname;
        char *msg;
 {

-       register char *p, *q;
-       register int c;
-       char line[MAXLINE + 1];
-       int pri;
+       int c, pri;
+       char *p, *q, line[MAXLINE + 1];

 
        /* test for special codes */
        pri = DEFUPRI;
 
        /* test for special codes */
        pri = DEFUPRI;


@@ -385,17 +395,14 @@ printline(hname, msg)
 /*
  * Take a raw input line from /dev/klog, split and format similar to syslog().
  */
 /*
  * Take a raw input line from /dev/klog, split and format similar to syslog().
  */

-
+void

 printsys(msg)
        char *msg;
 {
 printsys(msg)
        char *msg;
 {

-       register char *p, *q;
-       register int c;
-       char line[MAXLINE + 1];
-       int pri, flags;
-       char *lp;
+       int c, pri, flags;
+       char *lp, *p, *q, line[MAXLINE + 1];

 
 

-       (void) strcpy(line, "vmunix: ");
+       (void)strcpy(line, "vmunix: ");

        lp = line + strlen(line);
        for (p = msg; *p != '\0'; ) {
                flags = SYNC_FILE | ADDDATE;    /* fsync file after write */
        lp = line + strlen(line);
        for (p = msg; *p != '\0'; ) {
                flags = SYNC_FILE | ADDDATE;    /* fsync file after write */


@@ -427,17 +434,15 @@ time_t    now;
  * Log a message to the appropriate log files, users, etc. based on
  * the priority.
  */
  * Log a message to the appropriate log files, users, etc. based on
  * the priority.
  */

-
+void

 logmsg(pri, msg, from, flags)
        int pri;
        char *msg, *from;
        int flags;
 {
 logmsg(pri, msg, from, flags)
        int pri;
        char *msg, *from;
        int flags;
 {

-       register struct filed *f;
-       int fac, prilev;
-       int omask, msglen;
+       struct filed *f;
+       int fac, msglen, omask, prilev;

        char *timestamp;
        char *timestamp;

-       time_t time();

 
        dprintf("logmsg: pri %o, flags %x, from %s, msg %s\n",
            pri, flags, from, msg);
 
        dprintf("logmsg: pri %o, flags %x, from %s, msg %s\n",
            pri, flags, from, msg);


@@ -452,7 +457,7 @@ logmsg(pri, msg, from, flags)
            msg[9] != ':' || msg[12] != ':' || msg[15] != ' ')
                flags |= ADDDATE;
 
            msg[9] != ':' || msg[12] != ':' || msg[15] != ' ')
                flags |= ADDDATE;
 

-       (void) time(&now);
+       (void)time(&now);

        if (flags & ADDDATE)
                timestamp = ctime(&now) + 4;
        else {
        if (flags & ADDDATE)
                timestamp = ctime(&now) + 4;
        else {


@@ -475,9 +480,9 @@ logmsg(pri, msg, from, flags)
 
                if (f->f_file >= 0) {
                        fprintlog(f, flags, msg);
 
                if (f->f_file >= 0) {
                        fprintlog(f, flags, msg);

-                       (void) close(f->f_file);
+                       (void)close(f->f_file);

                }
                }

-               (void) sigsetmask(omask);
+               (void)sigsetmask(omask);

                return;
        }
        for (f = Files; f; f = f->f_next) {
                return;
        }
        for (f = Files; f; f = f->f_next) {


@@ -499,7 +504,7 @@ logmsg(pri, msg, from, flags)
                if ((flags & MARK) == 0 && msglen == f->f_prevlen &&
                    !strcmp(msg, f->f_prevline) &&
                    !strcmp(from, f->f_prevhost)) {
                if ((flags & MARK) == 0 && msglen == f->f_prevlen &&
                    !strcmp(msg, f->f_prevline) &&
                    !strcmp(from, f->f_prevhost)) {

-                       (void) strncpy(f->f_lasttime, timestamp, 15);
+                       (void)strncpy(f->f_lasttime, timestamp, 15);

                        f->f_prevcount++;
                        dprintf("msg repeated %d times, %ld sec of %d\n",
                            f->f_prevcount, now - f->f_time,
                        f->f_prevcount++;
                        dprintf("msg repeated %d times, %ld sec of %d\n",
                            f->f_prevcount, now - f->f_time,


@@ -519,13 +524,13 @@ logmsg(pri, msg, from, flags)
                        if (f->f_prevcount)
                                fprintlog(f, 0, (char *)NULL);
                        f->f_repeatcount = 0;
                        if (f->f_prevcount)
                                fprintlog(f, 0, (char *)NULL);
                        f->f_repeatcount = 0;

-                       (void) strncpy(f->f_lasttime, timestamp, 15);
-                       (void) strncpy(f->f_prevhost, from,
+                       (void)strncpy(f->f_lasttime, timestamp, 15);
+                       (void)strncpy(f->f_prevhost, from,

                                        sizeof(f->f_prevhost));
                        if (msglen < MAXSVLINE) {
                                f->f_prevlen = msglen;
                                f->f_prevpri = pri;
                                        sizeof(f->f_prevhost));
                        if (msglen < MAXSVLINE) {
                                f->f_prevlen = msglen;
                                f->f_prevpri = pri;

-                               (void) strcpy(f->f_prevline, msg);
+                               (void)strcpy(f->f_prevline, msg);

                                fprintlog(f, flags, (char *)NULL);
                        } else {
                                f->f_prevline[0] = 0;
                                fprintlog(f, flags, (char *)NULL);
                        } else {
                                f->f_prevline[0] = 0;


@@ -534,17 +539,18 @@ logmsg(pri, msg, from, flags)
                        }
                }
        }
                        }
                }
        }

-       (void) sigsetmask(omask);
+       (void)sigsetmask(omask);

 }
 
 }
 

+void

 fprintlog(f, flags, msg)
 fprintlog(f, flags, msg)

-       register struct filed *f;
+       struct filed *f;

        int flags;
        char *msg;
 {
        struct iovec iov[6];
        int flags;
        char *msg;
 {
        struct iovec iov[6];

-       register struct iovec *v;
-       register int l;
+       struct iovec *v;
+       int l;

        char line[MAXLINE + 1], repbuf[80], greetings[200];
 
        v = iov;
        char line[MAXLINE + 1], repbuf[80], greetings[200];
 
        v = iov;


@@ -601,9 +607,9 @@ fprintlog(f, flags, msg)
                        l = MAXLINE;
                if (sendto(finet, line, l, 0,
                    (struct sockaddr *)&f->f_un.f_forw.f_addr,
                        l = MAXLINE;
                if (sendto(finet, line, l, 0,
                    (struct sockaddr *)&f->f_un.f_forw.f_addr,

-                   sizeof f->f_un.f_forw.f_addr) != l) {
+                   sizeof(f->f_un.f_forw.f_addr)) != l) {

                        int e = errno;
                        int e = errno;

-                       (void) close(f->f_file);
+                       (void)close(f->f_file);

                        f->f_type = F_UNUSED;
                        errno = e;
                        logerror("sendto");
                        f->f_type = F_UNUSED;
                        errno = e;
                        logerror("sendto");


@@ -630,7 +636,7 @@ fprintlog(f, flags, msg)
        again:
                if (writev(f->f_file, iov, 6) < 0) {
                        int e = errno;
        again:
                if (writev(f->f_file, iov, 6) < 0) {
                        int e = errno;

-                       (void) close(f->f_file);
+                       (void)close(f->f_file);

                        /*
                         * Check for errors on TTY's due to loss of tty
                         */
                        /*
                         * Check for errors on TTY's due to loss of tty
                         */


@@ -648,7 +654,7 @@ fprintlog(f, flags, msg)
                                logerror(f->f_un.f_fname);
                        }
                } else if (flags & SYNC_FILE)
                                logerror(f->f_un.f_fname);
                        }
                } else if (flags & SYNC_FILE)

-                       (void) fsync(f->f_file);
+                       (void)fsync(f->f_file);

                break;
 
        case F_USERS:
                break;
 
        case F_USERS:


@@ -668,16 +674,17 @@ fprintlog(f, flags, msg)
  *     Write the specified message to either the entire
  *     world, or a list of approved users.
  */
  *     Write the specified message to either the entire
  *     world, or a list of approved users.
  */

-
+void

 wallmsg(f, iov)
 wallmsg(f, iov)

-       register struct filed *f;
+       struct filed *f;

        struct iovec *iov;
 {
        static int reenter;                     /* avoid calling ourselves */
        struct iovec *iov;
 {
        static int reenter;                     /* avoid calling ourselves */

-       register FILE *uf;
-       register int i;
+       FILE *uf;

        struct utmp ut;
        struct utmp ut;

-       char *p, *ttymsg();
+       int i;
+       char *p;
+       char line[sizeof(ut.ut_line) + 1];

 
        if (reenter++)
                return;
 
        if (reenter++)
                return;


@@ -687,11 +694,13 @@ wallmsg(f, iov)
                return;
        }
        /* NOSTRICT */
                return;
        }
        /* NOSTRICT */

-       while (fread((char *) &ut, sizeof ut, 1, uf) == 1) {
+       while (fread((char *)&ut, sizeof(ut), 1, uf) == 1) {

                if (ut.ut_name[0] == '\0')
                        continue;
                if (ut.ut_name[0] == '\0')
                        continue;

+               strncpy(line, ut.ut_line, sizeof(ut.ut_line));
+               line[sizeof(ut.ut_line)] = '\0';

                if (f->f_type == F_WALL) {
                if (f->f_type == F_WALL) {

-                       if (p = ttymsg(iov, 6, ut.ut_line, 1)) {
+                       if ((p = ttymsg(iov, 6, line, 60*5)) != NULL) {

                                errno = 0;      /* already in msg */
                                logerror(p);
                        }
                                errno = 0;      /* already in msg */
                                logerror(p);
                        }


@@ -703,7 +712,7 @@ wallmsg(f, iov)
                                break;
                        if (!strncmp(f->f_un.f_uname[i], ut.ut_name,
                            UT_NAMESIZE)) {
                                break;
                        if (!strncmp(f->f_un.f_uname[i], ut.ut_name,
                            UT_NAMESIZE)) {

-                               if (p = ttymsg(iov, 6, ut.ut_line, 1)) {
+                               if ((p = ttymsg(iov, 6, line, 60*5)) != NULL) {

                                        errno = 0;      /* already in msg */
                                        logerror(p);
                                }
                                        errno = 0;      /* already in msg */
                                        logerror(p);
                                }


@@ -711,16 +720,17 @@ wallmsg(f, iov)
                        }
                }
        }
                        }
                }
        }

-       (void) fclose(uf);
+       (void)fclose(uf);

        reenter = 0;
 }
 
 void
        reenter = 0;
 }
 
 void

-reapchild()
+reapchild(signo)
+       int signo;

 {
        union wait status;
 
 {
        union wait status;
 

-       while (wait3((int *)&status, WNOHANG, (struct rusage *) NULL) > 0)
+       while (wait3((int *)&status, WNOHANG, (struct rusage *)NULL) > 0)

                ;
 }
 
                ;
 }
 


@@ -732,8 +742,7 @@ cvthname(f)
        struct sockaddr_in *f;
 {
        struct hostent *hp;
        struct sockaddr_in *f;
 {
        struct hostent *hp;

-       register char *p;
-       extern char *inet_ntoa();
+       char *p;

 
        dprintf("cvthname(%s)\n", inet_ntoa(f->sin_addr));
 
 
        dprintf("cvthname(%s)\n", inet_ntoa(f->sin_addr));
 


@@ -748,16 +757,16 @@ cvthname(f)
                        inet_ntoa(f->sin_addr));
                return (inet_ntoa(f->sin_addr));
        }
                        inet_ntoa(f->sin_addr));
                return (inet_ntoa(f->sin_addr));
        }

-       if ((p = index(hp->h_name, '.')) && strcmp(p + 1, LocalDomain) == 0)
+       if ((p = strchr(hp->h_name, '.')) && strcmp(p + 1, LocalDomain) == 0)

                *p = '\0';
        return (hp->h_name);
 }
 
 void
                *p = '\0';
        return (hp->h_name);
 }
 
 void

-domark()
+domark(signo)
+       int signo;

 {
 {

-       register struct filed *f;
-       time_t time();
+       struct filed *f;

 
        now = time((time_t *)NULL);
        MarkSeq += TIMERINTVL;
 
        now = time((time_t *)NULL);
        MarkSeq += TIMERINTVL;


@@ -775,30 +784,33 @@ domark()
                        BACKOFF(f);
                }
        }
                        BACKOFF(f);
                }
        }

-       (void) alarm(TIMERINTVL);
+       (void)alarm(TIMERINTVL);

 }
 
 /*
  * Print syslogd errors some place.
  */
 }
 
 /*
  * Print syslogd errors some place.
  */

+void

 logerror(type)
        char *type;
 {
 logerror(type)
        char *type;
 {

-       char buf[100], *strerror();
+       char buf[100];

 
        if (errno)
 
        if (errno)

-               (void) sprintf(buf, "syslogd: %s: %s", type, strerror(errno));
+               (void)snprintf(buf,
+                   sizeof(buf), "syslogd: %s: %s", type, strerror(errno));

        else
        else

-               (void) sprintf(buf, "syslogd: %s", type);
+               (void)snprintf(buf, sizeof(buf), "syslogd: %s", type);

        errno = 0;
        dprintf("%s\n", buf);
        logmsg(LOG_SYSLOG|LOG_ERR, buf, LocalHostName, ADDDATE);
 }
 
 void
        errno = 0;
        dprintf("%s\n", buf);
        logmsg(LOG_SYSLOG|LOG_ERR, buf, LocalHostName, ADDDATE);
 }
 
 void

-die(sig)
+die(signo)
+       int signo;

 {
 {

-       register struct filed *f;
+       struct filed *f;

        char buf[100];
 
        for (f = Files; f != NULL; f = f->f_next) {
        char buf[100];
 
        for (f = Files; f != NULL; f = f->f_next) {


@@ -806,28 +818,28 @@ die(sig)
                if (f->f_prevcount)
                        fprintlog(f, 0, (char *)NULL);
        }
                if (f->f_prevcount)
                        fprintlog(f, 0, (char *)NULL);
        }

-       if (sig) {
-               dprintf("syslogd: exiting on signal %d\n", sig);
-               (void) sprintf(buf, "exiting on signal %d", sig);
+       if (signo) {
+               dprintf("syslogd: exiting on signal %d\n", signo);
+               (void)sprintf(buf, "exiting on signal %d", signo);

                errno = 0;
                logerror(buf);
        }
                errno = 0;
                logerror(buf);
        }

-       (void) unlink(LogName);
+       (void)unlink(LogName);

        exit(0);
 }
 
 /*
  *  INIT -- Initialize syslogd from configuration table
  */
        exit(0);
 }
 
 /*
  *  INIT -- Initialize syslogd from configuration table
  */

-

 void
 void

-init()
+init(signo)
+       int signo;

 {
 {

-       register int i;
-       register FILE *cf;
-       register struct filed *f, *next, **nextp;
-       register char *p;
-       char cline[BUFSIZ];
+       int i;
+       FILE *cf;
+       struct filed *f, *next, **nextp;
+       char *p;
+       char cline[LINE_MAX];

 
        dprintf("init\n");
 
 
        dprintf("init\n");
 


@@ -841,15 +853,15 @@ init()
                        fprintlog(f, 0, (char *)NULL);
 
                switch (f->f_type) {
                        fprintlog(f, 0, (char *)NULL);
 
                switch (f->f_type) {

-                 case F_FILE:
-                 case F_TTY:
-                 case F_CONSOLE:
-                 case F_FORW:
-                       (void) close(f->f_file);
+               case F_FILE:
+               case F_TTY:
+               case F_CONSOLE:
+               case F_FORW:
+                       (void)close(f->f_file);

                        break;
                }
                next = f->f_next;
                        break;
                }
                next = f->f_next;

-               free((char *) f);
+               free((char *)f);

        }
        Files = NULL;
        nextp = &Files;
        }
        Files = NULL;
        nextp = &Files;


@@ -869,15 +881,17 @@ init()
         *  Foreach line in the conf table, open that file.
         */
        f = NULL;
         *  Foreach line in the conf table, open that file.
         */
        f = NULL;

-       while (fgets(cline, sizeof cline, cf) != NULL) {
+       while (fgets(cline, sizeof(cline), cf) != NULL) {

                /*
                 * check for end-of-section, comments, strip off trailing
                 * spaces and newline character.
                 */
                /*
                 * check for end-of-section, comments, strip off trailing
                 * spaces and newline character.
                 */

-               for (p = cline; isspace(*p); ++p);
+               for (p = cline; isspace(*p); ++p)
+                       continue;

                if (*p == NULL || *p == '#')
                        continue;
                if (*p == NULL || *p == '#')
                        continue;

-               for (p = index(cline, '\0'); isspace(*--p););
+               for (p = strchr(cline, '\0'); isspace(*--p);)
+                       continue;

                *++p = '\0';
                f = (struct filed *)calloc(1, sizeof(*f));
                *nextp = f;
                *++p = '\0';
                f = (struct filed *)calloc(1, sizeof(*f));
                *nextp = f;


@@ -886,7 +900,7 @@ init()
        }
 
        /* close the configuration file */
        }
 
        /* close the configuration file */

-       (void) fclose(cf);
+       (void)fclose(cf);

 
        Initialized = 1;
 
 
        Initialized = 1;
 


@@ -925,17 +939,14 @@ init()
 /*
  * Crack a configuration file line
  */
 /*
  * Crack a configuration file line
  */

-
+void

 cfline(line, f)
        char *line;
 cfline(line, f)
        char *line;

-       register struct filed *f;
+       struct filed *f;

 {
 {

-       register char *p;
-       register char *q;
-       register int i;
-       char *bp;
-       int pri;

        struct hostent *hp;
        struct hostent *hp;

+       int i, pri;
+       char *bp, *p, *q;

        char buf[MAXLINE], ebuf[100];
 
        dprintf("cfline(%s)\n", line);
        char buf[MAXLINE], ebuf[100];
 
        dprintf("cfline(%s)\n", line);


@@ -943,7 +954,7 @@ cfline(line, f)
        errno = 0;      /* keep strerror() stuff out of logerror messages */
 
        /* clear out file entry */
        errno = 0;      /* keep strerror() stuff out of logerror messages */
 
        /* clear out file entry */

-       bzero((char *) f, sizeof *f);
+       memset(f, 0, sizeof(*f));

        for (i = 0; i <= LOG_NFACILITIES; i++)
                f->f_pmask[i] = INTERNAL_NOPRI;
 
        for (i = 0; i <= LOG_NFACILITIES; i++)
                f->f_pmask[i] = INTERNAL_NOPRI;
 


@@ -955,12 +966,12 @@ cfline(line, f)
                        continue;
 
                /* collect priority name */
                        continue;
 
                /* collect priority name */

-               for (bp = buf; *q && !index("\t,;", *q); )
+               for (bp = buf; *q && !strchr("\t,;", *q); )

                        *bp++ = *q++;
                *bp = '\0';
 
                /* skip cruft */
                        *bp++ = *q++;
                *bp = '\0';
 
                /* skip cruft */

-               while (index(", ;", *q))
+               while (strchr(", ;", *q))

                        q++;
 
                /* decode priority name */
                        q++;
 
                /* decode priority name */


@@ -969,7 +980,7 @@ cfline(line, f)
                else {
                        pri = decode(buf, prioritynames);
                        if (pri < 0) {
                else {
                        pri = decode(buf, prioritynames);
                        if (pri < 0) {

-                               (void) sprintf(ebuf,
+                               (void)sprintf(ebuf,

                                    "unknown priority name \"%s\"", buf);
                                logerror(ebuf);
                                return;
                                    "unknown priority name \"%s\"", buf);
                                logerror(ebuf);
                                return;


@@ -977,8 +988,8 @@ cfline(line, f)
                }
 
                /* scan facilities */
                }
 
                /* scan facilities */

-               while (*p && !index("\t.;", *p)) {
-                       for (bp = buf; *p && !index("\t,;.", *p); )
+               while (*p && !strchr("\t.;", *p)) {
+                       for (bp = buf; *p && !strchr("\t,;.", *p); )

                                *bp++ = *p++;
                        *bp = '\0';
                        if (*buf == '*')
                                *bp++ = *p++;
                        *bp = '\0';
                        if (*buf == '*')


@@ -987,7 +998,7 @@ cfline(line, f)
                        else {
                                i = decode(buf, facilitynames);
                                if (i < 0) {
                        else {
                                i = decode(buf, facilitynames);
                                if (i < 0) {

-                                       (void) sprintf(ebuf,
+                                       (void)sprintf(ebuf,

                                            "unknown facility name \"%s\"",
                                            buf);
                                        logerror(ebuf);
                                            "unknown facility name \"%s\"",
                                            buf);
                                        logerror(ebuf);


@@ -1011,26 +1022,24 @@ cfline(line, f)
        case '@':
                if (!InetInuse)
                        break;
        case '@':
                if (!InetInuse)
                        break;

-               (void) strcpy(f->f_un.f_forw.f_hname, ++p);
+               (void)strcpy(f->f_un.f_forw.f_hname, ++p);

                hp = gethostbyname(p);
                if (hp == NULL) {
                hp = gethostbyname(p);
                if (hp == NULL) {

-                       extern int h_errno, h_nerr;
-                       extern char **h_errlist;
+                       extern int h_errno;

 
 

-                       logerror((u_int)h_errno < h_nerr ?
-                           h_errlist[h_errno] : "Unknown error");
+                       logerror(hstrerror(h_errno));

                        break;
                }
                        break;
                }

-               bzero((char *) &f->f_un.f_forw.f_addr,
-                        sizeof f->f_un.f_forw.f_addr);
+               memset(&f->f_un.f_forw.f_addr, 0,
+                        sizeof(f->f_un.f_forw.f_addr));

                f->f_un.f_forw.f_addr.sin_family = AF_INET;
                f->f_un.f_forw.f_addr.sin_port = LogPort;
                f->f_un.f_forw.f_addr.sin_family = AF_INET;
                f->f_un.f_forw.f_addr.sin_port = LogPort;

-               bcopy(hp->h_addr, (char *) &f->f_un.f_forw.f_addr.sin_addr, hp->h_length);
+               memmove(&f->f_un.f_forw.f_addr.sin_addr, hp->h_addr, hp->h_length);

                f->f_type = F_FORW;
                break;
 
        case '/':
                f->f_type = F_FORW;
                break;
 
        case '/':

-               (void) strcpy(f->f_un.f_fname, p);
+               (void)strcpy(f->f_un.f_fname, p);

                if ((f->f_file = open(p, O_WRONLY|O_APPEND, 0)) < 0) {
                        f->f_file = F_UNUSED;
                        logerror(p);
                if ((f->f_file = open(p, O_WRONLY|O_APPEND, 0)) < 0) {
                        f->f_file = F_UNUSED;
                        logerror(p);


@@ -1052,7 +1061,7 @@ cfline(line, f)
                for (i = 0; i < MAXUNAMES && *p; i++) {
                        for (q = p; *q && *q != ','; )
                                q++;
                for (i = 0; i < MAXUNAMES && *p; i++) {
                        for (q = p; *q && *q != ','; )
                                q++;

-                       (void) strncpy(f->f_un.f_uname[i], p, UT_NAMESIZE);
+                       (void)strncpy(f->f_un.f_uname[i], p, UT_NAMESIZE);

                        if ((q - p) > UT_NAMESIZE)
                                f->f_un.f_uname[i][UT_NAMESIZE] = '\0';
                        else
                        if ((q - p) > UT_NAMESIZE)
                                f->f_un.f_uname[i][UT_NAMESIZE] = '\0';
                        else


@@ -1070,22 +1079,24 @@ cfline(line, f)
 /*
  *  Decode a symbolic name to a numeric value
  */
 /*
  *  Decode a symbolic name to a numeric value
  */

-
+int

 decode(name, codetab)
 decode(name, codetab)

-       char *name;
+       const char *name;

        CODE *codetab;
 {
        CODE *codetab;
 {

-       register CODE *c;
-       register char *p;
-       char buf[40];
+       CODE *c;
+       char *p, buf[40];

 
        if (isdigit(*name))
                return (atoi(name));
 
 
        if (isdigit(*name))
                return (atoi(name));
 

-       (void) strcpy(buf, name);
-       for (p = buf; *p; p++)
-               if (isupper(*p))
-                       *p = tolower(*p);
+       for (p = buf; *name && p < &buf[sizeof(buf) - 1]; p++, name++) {
+               if (isupper(*name))
+                       *p = tolower(*name);
+               else
+                       *p = *name;
+       }
+       *p = '\0';

        for (c = codetab; c->c_name; c++)
                if (!strcmp(buf, c->c_name))
                        return (c->c_val);
        for (c = codetab; c->c_name; c++)
                if (!strcmp(buf, c->c_name))
                        return (c->c_val);