1) Add yet one optional field: pid file to send SIGHUP to if log rotated

(good thing for apache f.e.) This change is backward compatible with old
newsyslog.conf files.

2) Do not compress log if SIGHUP sending failed for some reason
(f.e. pid file deleted). Newcoming messages will be lost
otherwise.

3) Misc cleanup while I am here.

2 files changed, 103 insertions, 39 deletions

diff --git a/usr.sbin/newsyslog/newsyslog.8 b/usr.sbin/newsyslog/newsyslog.8
index e83afccdb06b..c9e4550195e3 100644
--- a/usr.sbin/newsyslog/newsyslog.8
+++ b/usr.sbin/newsyslog/newsyslog.8
@@ -1,7 +1,7 @@
 .\" This file contains changes from the Open Software Foundation.
 .\"
 .\"	from: @(#)newsyslog.8
-.\"	$Id: newsyslog.8,v 1.4 1997/02/22 16:08:25 peter Exp $
+.\"	$Id: newsyslog.8,v 1.5 1997/02/28 07:33:37 mpp Exp $
 .\"
 .\" Copyright 1988, 1989 by the Massachusetts Institute of Technology
 .\" 
@@ -57,7 +57,7 @@ at.  By default, this configuration file is
 Each line of the file contains information about a particular log file
 that should be handled by
 .Nm newsyslog .
-Each line has five mandatory fields and two optional fields, with a
+Each line has five mandatory fields and three optional fields, with a
 whitespace separating each field.  Blank lines or lines beginning with
 ``#'' are ignored.  The fields of the configuration file are as
 follows: 
@@ -113,6 +113,12 @@ message which
 .Nm
 inserts to indicate the fact that the logs have been
 turned over should not be included.
+.It Ar path_to_pid_file
+This optional field specifies
+the file name to read to find the daemon process id.  If this
+field is present, a SIGHUP is sent the process id contained in this
+file.  This field must start with "/" in order to be recognized
+properly.
 .El
 .Sh OPTIONS
 The following options can be used with newsyslog:
diff --git a/usr.sbin/newsyslog/newsyslog.c b/usr.sbin/newsyslog/newsyslog.c
index d1c3232e670f..cacf1f6b1265 100644
--- a/usr.sbin/newsyslog/newsyslog.c
+++ b/usr.sbin/newsyslog/newsyslog.c
@@ -25,11 +25,11 @@ provided "as is" without express or implied warranty.
  *              keeping the a specified number of backup files around.
  *
  *      $Source: /home/ncvs/src/usr.sbin/newsyslog/newsyslog.c,v $
- *      $Author: peter $
+ *      $Author: imp $
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: newsyslog.c,v 1.9 1997/02/22 16:08:26 peter Exp $";
+static char rcsid[] = "$Id: newsyslog.c,v 1.10 1997/03/31 05:10:25 imp Exp $";
 #endif /* not lint */
 
 #ifndef CONF
@@ -77,6 +77,7 @@ static char rcsid[] = "$Id: newsyslog.c,v 1.9 1997/02/22 16:08:26 peter Exp $";
         
 struct conf_entry {
         char    *log;           /* Name of the log */
+	char	*pid_file;	/* PID file */
         int     uid;            /* Owner of log */
         int     gid;            /* Group of log */
         int     numlogs;        /* Number of logs to keep */
@@ -93,8 +94,8 @@ int     needroot = 1;           /* Root privs are necessary */
 int     noaction = 0;           /* Don't do anything, just show it */
 char    *conf = CONF;           /* Configuration file to use */
 time_t  timenow;
-int     syslog_pid;             /* read in from /etc/syslog.pid */
-#define MIN_PID		3
+pid_t   syslog_pid;             /* read in from /etc/syslog.pid */
+#define MIN_PID         5
 #define MAX_PID		30000   /* was 65534, see /usr/include/sys/proc.h */
 char    hostname[MAXHOSTNAMELEN+1]; /* hostname */
 char    *daytime;               /* timenow in human readable form */
@@ -110,11 +111,12 @@ static char *missing_field(char *p,char *errline);
 static void do_entry(struct conf_entry *ent);
 static void PRS(int argc,char **argv);
 static void usage();
-static void dotrim(char *log,int numdays,int falgs,int perm, int owner_uid,int group_gid);
+static void dotrim(char *log,char *pid_file,int numdays,int falgs,int perm, int owner_uid,int group_gid);
 static int log_trim(char *log);
 static void compress_log(char *log);
 static int sizefile(char *file);
 static int age_old_log(char *file);
+static pid_t get_pid(char *pid_file);
 
 int main(argc,argv)
         int argc;
@@ -128,6 +130,9 @@ int main(argc,argv)
                 return(1);
         }
         p = q = parse_file();
+
+	syslog_pid = get_pid(PIDFILE);
+
         while (p) {
                 do_entry(p);
                 p=p->next;
@@ -172,8 +177,8 @@ static void do_entry(ent)
                                         printf("%s <%d>: trimming",
                                                ent->log,ent->numlogs);
                         }
-                        dotrim(ent->log, ent->numlogs, ent->flags,
-                               ent->permissions, ent->uid, ent->gid);
+                        dotrim(ent->log, ent->pid_file, ent->numlogs,
+			    ent->flags, ent->permissions, ent->uid, ent->gid);
                 } else {
                         if (verbose)
                                 printf("--> skipping\n");
@@ -186,8 +191,6 @@ static void PRS(argc,argv)
         char **argv;
 {
         int     c;
-        FILE    *f;
-        char    line[BUFSIZ];
 	char	*p;
 
         progname = argv[0];
@@ -195,14 +198,6 @@ static void PRS(argc,argv)
         daytime = ctime(&timenow) + 4;
         daytime[15] = '\0';
 
-        /* Let's find the pid of syslogd */
-        syslog_pid = 0;
-        f = fopen(PIDFILE,"r");
-        if (f && fgets(line,BUFSIZ,f))
-                syslog_pid = atoi(line);
-	if (f)
-		(void)fclose(f);
-
         /* Let's get our hostname */
         (void) gethostname(hostname, sizeof(hostname));
 
@@ -334,6 +329,7 @@ static struct conf_entry *parse_file()
 
                 q = parse = sob(++parse); /* Optional field */
                 *(parse = son(parse)) = '\0';
+
                 working->flags = 0;
                 while (q && *q && !isspace(*q)) {
                         if ((*q == 'Z') || (*q == 'z'))
@@ -345,6 +341,17 @@ static struct conf_entry *parse_file()
                         q++;
                 }
                 
+		q = parse = sob(++parse); /* Optional field */
+		*(parse = son(parse)) = '\0';
+
+		working->pid_file = NULL;
+		if (q && *q) {
+			if (*q == '/')
+				working->pid_file = strdup(q);
+                        else
+			   errx(1, "Illegal pid file in config file:\n%s", q);
+		}
+
                 free(errline);
         }
         if (working)
@@ -361,8 +368,9 @@ static char *missing_field(p,errline)
         return(p);
 }
 
-static void dotrim(log,numdays,flags,perm,owner_uid,group_gid)
+static void dotrim(log,pid_file,numdays,flags,perm,owner_uid,group_gid)
         char    *log;
+	char    *pid_file;
         int     numdays;
         int     flags;
         int     perm;
@@ -371,8 +379,9 @@ static void dotrim(log,numdays,flags,perm,owner_uid,group_gid)
 {
         char    file1 [MAXPATHLEN+1], file2 [MAXPATHLEN+1];
         char    zfile1[MAXPATHLEN+1], zfile2[MAXPATHLEN+1];
-        int     fd, _numdays;
+	int     notified, need_notification, fd, _numdays;
         struct  stat st;
+	pid_t   pid;
 
 #ifdef _IBMR2
 /* AIX 3.1 has a broken fchown- if the owner_uid is -1, it will actually */
@@ -405,7 +414,7 @@ static void dotrim(log,numdays,flags,perm,owner_uid,group_gid)
                 if (lstat(file1, &st)) {
                         (void) strcat(zfile1, COMPRESS_POSTFIX);
                         (void) strcat(zfile2, COMPRESS_POSTFIX);
-                        if (lstat(zfile1, &st)) continue;
+			if (lstat(zfile1, &st)) continue;
                 }
                 if (noaction) {
                         printf("mv %s %s\n",zfile1,zfile2);
@@ -451,18 +460,43 @@ static void dotrim(log,numdays,flags,perm,owner_uid,group_gid)
                 printf("chmod %o %s...",perm,log);
         else
                 (void) chmod(log,perm);
-        if (noaction)
-                printf("kill -HUP %d (syslogd)\n",syslog_pid);
-        else
-	if (syslog_pid < MIN_PID || syslog_pid > MAX_PID) {
-		warnx("preposterous process number: %d", syslog_pid);
-        } else if (kill(syslog_pid,SIGHUP))
-                warn("could not restart syslogd");
-        if (flags & CE_COMPACT) {
-                if (noaction)
+
+	pid = 0;
+	need_notification = notified = 0;
+	if (pid_file != NULL) {
+		need_notification = 1;
+		pid = get_pid(pid_file);
+	} else if (!(flags & CE_BINARY)) {
+		need_notification = 1;
+		pid = syslog_pid;
+	}
+
+	if (pid) {
+		if (noaction) {
+			notified = 1;
+			printf("kill -HUP %d\n", (int)pid);
+		} else if (kill(pid,SIGHUP))
+			warn("can't notify daemon, pid %d", (int)pid);
+		else {
+			notified = 1;
+			if (verbose)
+				printf("daemon pid %d notified\n", (int)pid);
+		}
+	}
+
+	if ((flags & CE_COMPACT)) {
+		if (need_notification && !notified)
+			warnx("log not compressed because daemon not notified");
+		else if (noaction)
                         printf("Compress %s.0\n",log);
-                else
+		else {
+			if (notified) {
+				if (verbose)
+					printf("small pause to allow daemon to close log\n");
+				sleep(3);
+			}
                         compress_log(log);
+		}
         }
 }
 
@@ -484,16 +518,16 @@ static int log_trim(log)
 static void compress_log(log)
         char    *log;
 {
-        int     pid;
-        char    tmp[128];
+	pid_t   pid;
+	char    tmp[MAXPATHLEN+1];
         
-        pid = fork();
         (void) sprintf(tmp,"%s.0",log);
+	pid = fork();
         if (pid < 0)
                 err(1, "fork");
         else if (!pid) {
-                (void) execl(COMPRESS_PATH,COMPRESS_PROG,"-f",tmp,0);
-                err(1, COMPRESS_PATH);
+		(void) execl(COMPRESS_PATH,COMPRESS_PROG,"-f",tmp,0);
+		err(1, COMPRESS_PATH);
         }
 }
 
@@ -522,6 +556,30 @@ static int age_old_log(file)
         return( (int) (timenow - sb.st_mtime + 1800) / 3600);
 }
 
+static pid_t get_pid(pid_file)
+	char *pid_file;
+{
+	FILE *f;
+	char  line[BUFSIZ];
+	pid_t pid = 0;
+
+	if ((f = fopen(pid_file,"r")) == NULL)
+		warn("can't open %s pid file to restart a daemon",
+			pid_file);
+	else {
+		if (fgets(line,BUFSIZ,f)) {
+			pid = atol(line);
+			if (pid < MIN_PID || pid > MAX_PID) {
+				warnx("preposterous process number: %d", (int)pid);
+				pid = 0;
+			}
+		} else
+			warn("can't read %s pid file to restart a daemon",
+				pid_file);
+		(void)fclose(f);
+	}
+	return pid;
+}
 
 #ifndef OSF
 /* Duplicate a string using malloc */
@@ -539,7 +597,7 @@ register char   *strp;
 
 /* Skip Over Blanks */
 char *sob(p)
-        register char   *p;
+	register char   *p;
 {
         while (p && *p && isspace(*p))
                 p++;
@@ -548,7 +606,7 @@ char *sob(p)
 
 /* Skip Over Non-Blanks */
 char *son(p)
-        register char   *p;
+	register char   *p;
 {
         while (p && *p && !isspace(*p))
                 p++;