[cvslog] (2002-07-26 17:55:29 UTC) Module eggdrop1.6: Change committed

cvslog cvs at tsss.org
Fri Jul 26 12:56:02 CST 2002


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2002-07-26 17:55:29 UTC
Commited by: Jeff Fisher <guppy at techmonkeys.org>

Modified files:
     doc/UPDATES1.6 src/net.c src/patch.h

Log message:

reverted the sockfix patches, time to release 1.6.12

---------------------- diff included ----------------------
Index: eggdrop1.6/doc/UPDATES1.6
diff -u eggdrop1.6/doc/UPDATES1.6:1.381 eggdrop1.6/doc/UPDATES1.6:1.382
--- eggdrop1.6/doc/UPDATES1.6:1.381	Fri Jul 26 11:28:30 2002
+++ eggdrop1.6/doc/UPDATES1.6	Fri Jul 26 12:55:18 2002
@@ -1,10 +1,11 @@
-$Id: UPDATES1.6,v 1.381 2002/07/26 16:28:30 guppy Exp $
+$Id: UPDATES1.6,v 1.382 2002/07/26 17:55:18 guppy Exp $
 
 Changes in Eggdrop: (since v1.6.0)
 ----------------------------------
 
-1.6.22
+1.6.12
 Found by  Fixed by  What...
+Segfault            reverted the sockfix patches from 1.6.11
 
 1.6.11 (26 July 2002)
 Found by  Fixed by  What...
Index: eggdrop1.6/src/net.c
diff -u eggdrop1.6/src/net.c:1.41 eggdrop1.6/src/net.c:1.42
--- eggdrop1.6/src/net.c:1.41	Thu Jul 25 15:00:18 2002
+++ eggdrop1.6/src/net.c	Fri Jul 26 12:55:18 2002
@@ -2,7 +2,7 @@
  * net.c -- handles:
  *   all raw network i/o
  * 
- * $Id: net.c,v 1.41 2002/07/25 20:00:18 wcc Exp $
+ * $Id: net.c,v 1.42 2002/07/26 17:55:18 guppy Exp $
  */
 /* 
  * This is hereby released into the public domain.
@@ -747,7 +747,6 @@
 {
   char xx[514], *p, *px;
   int ret, i, data = 0;
-  int chk = 0;
 
   for (i = 0; i < MAXSOCKS; i++) {
     /* Check for stored-up data waiting to be processed */
@@ -755,51 +754,29 @@
 	!(socklist[i].flags & SOCK_BUFFER) && (socklist[i].inbuf != NULL)) {
       if (!(socklist[i].flags & SOCK_BINARY)) {
 	/* look for \r too cos windows can't follow RFCs */
-        while (chk == 0) {
-	  p = strchr(socklist[i].inbuf, '\n');
-	  if (p == NULL)
-	    p = strchr(socklist[i].inbuf, '\r');
-	  if (p != NULL) {
-	    *p = 0;
-	    if (strlen(socklist[i].inbuf) > 510)
-	      socklist[i].inbuf[510] = 0;
-	    strcpy(s, socklist[i].inbuf);
-	    px = (char *) nmalloc(strlen(p + 1) + 1);
-	    strcpy(px, p + 1);
-	    nfree(socklist[i].inbuf);
-	    if (px[0])
-	      socklist[i].inbuf = px;
-	    else {
-	      nfree(px);
-	      socklist[i].inbuf = NULL;
-	    }
-	    /* Strip CR if this was CR/LF combo */
-	    if (s[strlen(s) - 1] == '\r')
-	      s[strlen(s) - 1] = 0;
-            /* if s is null, we can't use it... */
-	    if ((s[0] == 0) || (s == NULL)) {
-              if (socklist[i].inbuf == NULL)
-                chk = 1;
-            } else
-              chk = 1;
-            if (chk) {
-              *len = strlen(s);
-       	      return socklist[i].sock;
-  	    }
-          } else {
-            if ((s[0] == 0) || (s == NULL)) {
-              if (socklist[i].inbuf != NULL) {
-                strcpy(s, socklist[i].inbuf);
-                *len = strlen(s);
-                nfree(socklist[i].inbuf);
-                socklist[i].inbuf = NULL;
-                socklist[i].inbuflen = 0;
-                return socklist[i].sock;
-              }
-            }
-            chk = 1;
-          }
-        }
+	p = strchr(socklist[i].inbuf, '\n');
+	if (p == NULL)
+	  p = strchr(socklist[i].inbuf, '\r');
+	if (p != NULL) {
+	  *p = 0;
+	  if (strlen(socklist[i].inbuf) > 510)
+	    socklist[i].inbuf[510] = 0;
+	  strcpy(s, socklist[i].inbuf);
+	  px = (char *) nmalloc(strlen(p + 1) + 1);
+	  strcpy(px, p + 1);
+	  nfree(socklist[i].inbuf);
+	  if (px[0])
+	    socklist[i].inbuf = px;
+	  else {
+	    nfree(px);
+	    socklist[i].inbuf = NULL;
+	  }
+	  /* Strip CR if this was CR/LF combo */
+	  if (s[strlen(s) - 1] == '\r')
+	    s[strlen(s) - 1] = 0;
+	  *len = strlen(s);
+	  return socklist[i].sock;
+	}
       } else {
 	/* Handling buffered binary data (must have been SOCK_BUFFER before). */
 	if (socklist[i].inbuflen <= 510) {
@@ -916,9 +893,9 @@
   *len = strlen(s);
   /* Anything left that needs to be saved? */
   if (!xx[0]) {
-    if (data) {
+    if (data)
       return socklist[ret].sock;
-    } else
+    else
       return -3;
   }
   /* Prepend old data back */
@@ -930,22 +907,11 @@
     strcat(socklist[ret].inbuf, p);
     nfree(p);
   } else {
-    if ((xx[0] || xx[1]) && (data != 1))
-      data = 1;
     socklist[ret].inbuflen = strlen(xx);
     socklist[ret].inbuf = (char *) nmalloc(socklist[ret].inbuflen + 1);
     strcpy(socklist[ret].inbuf, xx);
   }
   if (data) {
-    if ((s[0] == 0) || (s == NULL)) {
-      if (socklist[ret].inbuf != NULL) {
-        strcpy(s, socklist[ret].inbuf);
-        *len = strlen(s);
-        nfree(socklist[ret].inbuf);
-        socklist[ret].inbuf = NULL;
-        socklist[ret].inbuflen = 0;
-      }
-    }
     return socklist[ret].sock;
   } else {
     return -3;
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.792 eggdrop1.6/src/patch.h:1.793
--- eggdrop1.6/src/patch.h:1.792	Fri Jul 26 11:28:31 2002
+++ eggdrop1.6/src/patch.h	Fri Jul 26 12:55:18 2002
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.792 2002/07/26 16:28:31 guppy Exp $
+ * $Id: patch.h,v 1.793 2002/07/26 17:55:18 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1027700860");		/* current unixtime */
+patch("1027706019");		/* current unixtime */
 /*
  *
  *
  */
-patch("none");
+patch("revertsockfix");
 /*
  *
  *
----------------------- End of diff -----------------------



More information about the Changes mailing list