svn commit: trunk/busybox/sysklogd

vodz at busybox.net vodz at busybox.net
Sat Oct 15 13:49:22 UTC 2005


Author: vodz
Date: 2005-10-15 06:49:21 -0700 (Sat, 15 Oct 2005)
New Revision: 11869

Log:
complex RESERVE_CONFIG_BUFFER --> bb_common_bufsiz1

Modified:
   trunk/busybox/sysklogd/syslogd.c


Changeset:
Modified: trunk/busybox/sysklogd/syslogd.c
===================================================================
--- trunk/busybox/sysklogd/syslogd.c	2005-10-15 13:45:32 UTC (rev 11868)
+++ trunk/busybox/sysklogd/syslogd.c	2005-10-15 13:49:21 UTC (rev 11869)
@@ -600,16 +600,19 @@
 
 		if (FD_ISSET(sock_fd, &fds)) {
 			int i;
+#if MAXLINE > BUFSIZ
+# define TMP_BUF_SZ BUFSIZ
+#else
+# define TMP_BUF_SZ MAXLINE
+#endif
+#define tmpbuf bb_common_bufsiz1
 
-			RESERVE_CONFIG_BUFFER(tmpbuf, MAXLINE + 1);
-
-			memset(tmpbuf, '\0', MAXLINE + 1);
-			if ((i = recv(sock_fd, tmpbuf, MAXLINE, 0)) > 0) {
+			if ((i = recv(sock_fd, tmpbuf, TMP_BUF_SZ, 0)) > 0) {
+				tmpbuf[i] = '\0';
 				serveConnection(tmpbuf, i);
 			} else {
 				bb_perror_msg_and_die("UNIX socket error");
 			}
-			RELEASE_CONFIG_BUFFER(tmpbuf);
 		}				/* FD_ISSET() */
 	}					/* for main loop */
 }




More information about the busybox-cvs mailing list