svn commit: r315124 - stable/10/usr.sbin/syslogd

[Ngie Cooper]

Author: ngie
Date: Sun Mar 12 04:55:02 2017
New Revision: 315124
URL: https://svnweb.freebsd.org/changeset/base/315124

Log:
  MFC r314233:
  
  Parameterize out the length of struct filed->f_lasttime as `MAXDATELEN`
  
  This removes the hardcoded value for the field (16) and the equivalent
  hardcoded lengths in logmsg(..).
  
  This change is being done to help stage future work to add RFC5424/RFC5434
  support to syslogd(8).
  
  Obtained from:	Isilon OneFS (dcd33d13da) (as part of a larger change)

Modified:
  stable/10/usr.sbin/syslogd/syslogd.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/syslogd/syslogd.c
==============================================================================
--- stable/10/usr.sbin/syslogd/syslogd.c	Sun Mar 12 04:53:48 2017	(r315123)
+++ stable/10/usr.sbin/syslogd/syslogd.c	Sun Mar 12 04:55:02 2017	(r315124)
@@ -68,6 +68,8 @@ __FBSDID("$FreeBSD$");
  * Priority comparison code by Harlan Stenn.
  */
 
+/* Maximum number of characters in time of last occurrence */
+#define	MAXDATELEN	16
 #define	MAXLINE		1024		/* maximum line length */
 #define	MAXSVLINE	MAXLINE		/* maximum saved line length */
 #define	DEFUPRI		(LOG_USER|LOG_NOTICE)
@@ -185,7 +187,7 @@ struct filed {
 		} f_pipe;
 	} f_un;
 	char	f_prevline[MAXSVLINE];		/* last message logged */
-	char	f_lasttime[16];			/* time of last occurrence */
+	char	f_lasttime[MAXDATELEN];		/* time of last occurrence */
 	char	f_prevhost[MAXHOSTNAMELEN];	/* host from which recd. */
 	int	f_prevpri;			/* pri of f_prevline */
 	int	f_prevlen;			/* length of f_prevline */
@@ -939,7 +941,7 @@ logmsg(int pri, const char *msg, const c
 	 * Check to see if msg looks non-standard.
 	 */
 	msglen = strlen(msg);
-	if (msglen < 16 || msg[3] != ' ' || msg[6] != ' ' ||
+	if (msglen < MAXDATELEN || msg[3] != ' ' || msg[6] != ' ' ||
 	    msg[9] != ':' || msg[12] != ':' || msg[15] != ' ')
 		flags |= ADDDATE;
 
@@ -948,8 +950,8 @@ logmsg(int pri, const char *msg, const c
 		timestamp = ctime(&now) + 4;
 	} else {
 		timestamp = msg;
-		msg += 16;
-		msglen -= 16;
+		msg += MAXDATELEN;
+		msglen -= MAXDATELEN;
 	}
 
 	/* skip leading blanks */