[BusyBox-cvs] svn commit: branches/busybox_1_00_stable/busybox/networking

landley at busybox.net landley at busybox.net
Fri Aug 12 06:08:41 UTC 2005


Author: landley
Date: 2005-08-12 00:08:41 -0600 (Fri, 12 Aug 2005)
New Revision: 11120

Log:
Backport 10864 and 10999.


Modified:
   branches/busybox_1_00_stable/busybox/networking/inetd.c


Changeset:
Modified: branches/busybox_1_00_stable/busybox/networking/inetd.c
===================================================================
--- branches/busybox_1_00_stable/busybox/networking/inetd.c	2005-08-12 06:06:54 UTC (rev 11119)
+++ branches/busybox_1_00_stable/busybox/networking/inetd.c	2005-08-12 06:08:41 UTC (rev 11120)
@@ -447,7 +447,7 @@
 
 static void setproctitle(char *a, int s)
 {
-	size_t size;
+	socklen_t size;
 	char *cp;
 	struct sockaddr_in sn;
 	char buf[80];
@@ -1021,7 +1021,7 @@
 {
 	char buffer[BUFSIZE];
 	int i;
-	size_t size;
+	socklen_t size;
 	struct sockaddr sa;
 
 	(void)sep;
@@ -1092,10 +1092,10 @@
 	text[LINESIZ + 1] = '\n';
 	for (rs = ring;;) {
 		if ((len = endring - rs) >= LINESIZ)
-			memcpy(rs, text, LINESIZ);
+			memcpy(text, rs,  LINESIZ);
 		else {
-			memcpy(rs, text, len);
-			memcpy(ring, text + len, LINESIZ - len);
+			memcpy(text, rs, len);
+			memcpy(text + len, ring, LINESIZ - len);
 		}
 		if (++rs == endring)
 			rs = ring;
@@ -1110,7 +1110,8 @@
 {
 	struct sockaddr sa;
 	static char *rs;
-	size_t len, size;
+	size_t len;
+	socklen_t size;
 	char text[LINESIZ+2];
 
 	(void)sep;
@@ -1125,10 +1126,10 @@
 		return;
 
 	if ((len = endring - rs) >= LINESIZ)
-		memcpy(rs, text, LINESIZ);
+		memcpy(text, rs, LINESIZ);
 	else {
-		memcpy(rs, text, len);
-		memcpy(ring, text + len, LINESIZ - len);
+		memcpy(text, rs, len);
+		memcpy(text + len, ring, LINESIZ - len);
 	}
 	if (++rs == endring)
 		rs = ring;
@@ -1172,7 +1173,7 @@
 {
 	long result;
 	struct sockaddr sa;
-	size_t size;
+	socklen_t size;
 	(void)sep;
 
 	size = sizeof(sa);
@@ -1208,7 +1209,7 @@
 {
 	char buffer[256];
 	struct sockaddr sa;
-	size_t size;
+	socklen_t size;
 
 	(void)sep;
 




More information about the busybox-cvs mailing list