Author: ngie
Date: Sat Feb 25 00:12:29 2017
New Revision: 314233
URL: https://svnweb.freebsd.org/changeset/base/314233
Log:
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)
Submitted by: John Bauman <john.bau...@isilon.com>
MFC after: 2 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/usr.sbin/syslogd/syslogd.c
Modified: head/usr.sbin/syslogd/syslogd.c
==============================================================================
--- head/usr.sbin/syslogd/syslogd.c Sat Feb 25 00:09:26 2017
(r314232)
+++ head/usr.sbin/syslogd/syslogd.c Sat Feb 25 00:12:29 2017
(r314233)
@@ -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)
@@ -212,7 +214,7 @@ struct filed {
#define fu_pipe_pname f_un.f_pipe.f_pname
#define fu_pipe_pid f_un.f_pipe.f_pid
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 */
@@ -1034,7 +1036,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;
@@ -1043,8 +1045,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 */
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
