Attachment 185161 Details for Bug 275031 – sysklogd-syslogd_unixaf.patch

[patch] sysklogd-syslogd_unixaf.patch

sysklogd-syslogd_unixaf.patch (text/plain), 992 bytes, created by Jose Plans on 2007-09-03 09:20:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jose Plans

Created: 2007-09-03 09:20:54 UTC

Size: 992 bytes

patch

obsolete

>--- sysklogd-1.4.1rh/syslogd.c.org	2007-08-15 11:45:22.000000000 +0900
>+++ sysklogd-1.4.1rh/syslogd.c	2007-08-15 11:47:46.000000000 +0900
>@@ -797,6 +797,7 @@
> 	char **argv;
> {
> 	register int i;
>+	int recv_r;
> 	register char *p;
> #if !defined(__GLIBC__)
> 	int len, num_fds;
>@@ -1133,12 +1134,12 @@
> 		for (i = 0; i < nfunix; i++) {
> 		    if ((fd = funix[i]) != -1 && FD_ISSET(fd, &readfds)) {
> 			memset(line, '\0', sizeof(line));
>-			i = recv(fd, line, MAXLINE - 2, 0);
>+			recv_r = recv(fd, line, MAXLINE - 2, 0);
> 			dprintf("Message from UNIX socket: #%d\n", fd);
>-			if (i > 0) {
>-				line[i] = line[i+1] = '\0';
>-				printchopped(LocalHostName, line, i + 2,  fd);
>-			} else if (i < 0 && errno != EINTR) {
>+			if (recv_r > 0) {
>+				line[recv_r] = line[recv_r+1] = '\0';
>+				printchopped(LocalHostName, line, recv_r + 2,  fd);
>+			} else if (recv_r < 0 && errno != EINTR) {
> 				dprintf("UNIX socket error: %d = %s.\n", \
> 					errno, strerror(errno));
> 				logerror("recvfrom UNIX");

Actions: View | Diff

Attachments on bug 275031: 185161