[BusyBox-cvs] busybox/sysklogd syslogd.c,1.94,1.95

[Erik Andersen]

Update of /var/cvs/busybox/sysklogd
In directory winder:/tmp/cvs-serv1286

Modified Files:
	syslogd.c 
Log Message:
This patch from Vitezslav Batrla, is a cleaner fix for the
problem with syslogd logging the '<' char.


Index: syslogd.c
===================================================================
RCS file: /var/cvs/busybox/sysklogd/syslogd.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- syslogd.c	16 May 2003 08:34:38 -0000	1.94
+++ syslogd.c	23 May 2003 09:28:01 -0000	1.95
@@ -424,31 +424,21 @@
 	while (p < tmpbuf + n_read) {
 
 		int pri = (LOG_USER | LOG_NOTICE);
+		int num_lt = 0;
 		char line[MAXLINE + 1];
 		unsigned char c;
 		char *q = line;
-		char *p1 = 0;
-		int	 oldpri;
 
 		while ((c = *p) && q < &line[sizeof(line) - 1]) {
-			if (c == '<' && p1 == 0) {
+			if (c == '<' && num_lt == 0) {
 				/* Parse the magic priority number. */
-				p1 = p;
-				oldpri = pri;
+				num_lt++;
 				pri = 0;
 				while (isdigit(*(++p))) {
 					pri = 10 * pri + (*p - '0');
 				}
-				if ( *p != '>') {
-					*q++ = c;
-					p=p1;
-					p1=0;
-					pri=oldpri;
-				} else {
-					if (pri & ~(LOG_FACMASK | LOG_PRIMASK)){
-						pri = (LOG_USER | LOG_NOTICE);
-					}
-  				}
+				if (pri & ~(LOG_FACMASK | LOG_PRIMASK)){
+					pri = (LOG_USER | LOG_NOTICE);
 			} else if (c == '\n') {
 				*q++ = ' ';
 			} else if (iscntrl(c) && (c < 0177)) {