Attachment 7409 Details for Bug 16086 – file.diff

[patch] file.diff

file.diff (text/plain), 1.38 KB, created by ume on 2000-01-12 20:40:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ume

Created: 2000-01-12 20:40:00 UTC

Size: 1.38 KB

patch

obsolete

>--- usr.sbin/inetd/builtins.c.orig	Sat Aug 28 10:16:34 1999
>+++ usr.sbin/inetd/builtins.c	Thu Jan 13 03:45:58 2000
>@@ -345,6 +345,7 @@
> 	char buf[BUFSIZE], *cp = NULL, *p, **av, *osname = NULL;
> 	int len, c, fflag = 0, nflag = 0, rflag = 0, argc = 0;
> 	u_short lport, fport;
>+	int bufsiz = sizeof(buf) - 1, size = 0;
> 
> 	inetd_setproctitle(sep->se_service, s);
> 	/*
>@@ -411,18 +412,22 @@
> 	 * "local_port , foreign_port\r\n" (with local being the
> 	 * server's port and foreign being the client's.)
> 	 */
>-	FD_ZERO(&fdset);
>-	FD_SET(s, &fdset);
>-	if (select(s + 1, &fdset, NULL, NULL, &tv) == -1)
>-		iderror(0, 0, s, errno);
>-	if (ioctl(s, FIONREAD, &len) == -1)
>-		iderror(0, 0, s, errno);
>-	if (len >= sizeof(buf))
>-		len = sizeof(buf) - 1;
>-	len = read(s, buf, len);
>-	if (len == -1)
>-		iderror(0, 0, s, errno);
>-	buf[len] = '\0';
>+	do {
>+		FD_ZERO(&fdset);
>+		FD_SET(s, &fdset);
>+		if (select(s + 1, &fdset, NULL, NULL, &tv) == -1)
>+			iderror(0, 0, s, errno);
>+		if (ioctl(s, FIONREAD, &len) == -1)
>+			iderror(0, 0, s, errno);
>+		if (len > bufsiz)
>+			len = bufsiz;
>+		len = read(s, &buf[size], len);
>+		if (len == -1)
>+			iderror(0, 0, s, errno);
>+		bufsiz -= len;
>+		size += len;
>+	} while ((size < 1 || buf[size - 1] != '\n') && bufsiz > 0);
>+	buf[size] = '\0';
> 	if (sscanf(buf, "%hu , %hu", &lport, &fport) != 2)
> 		iderror(0, 0, s, 0);
> 	if (!rflag) /* Send HIDDEN-USER immediately if not "real" */

Actions: View | Diff

Attachments on bug 16086: 7409