[cvslog] Module eggdrop1.7: Change committed

cvslog cvs at tsss.org
Sat Dec 29 15:05:02 CST 2001


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.7
Commit time: 2001-12-29 21:04:32 UTC
Commited by: Jeff Fisher <guppy at techmonkeys.org>

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

Log message:

added the filesizefix from eggdrop1.6.7

---------------------- diff included ----------------------
Index: eggdrop1.7/doc/UPDATES1.6
diff -u eggdrop1.7/doc/UPDATES1.6:1.182 eggdrop1.7/doc/UPDATES1.6:1.183
--- eggdrop1.7/doc/UPDATES1.6:1.182	Sat Dec 29 14:59:49 2001
+++ eggdrop1.7/doc/UPDATES1.6	Sat Dec 29 15:04:21 2001
@@ -1,10 +1,12 @@
-$Id: UPDATES1.6,v 1.182 2001/12/29 20:59:49 guppy Exp $
+$Id: UPDATES1.6,v 1.183 2001/12/29 21:04:21 guppy Exp $
 
 Changes in eggdrop: (since v1.6.0)
 ----------------------------------
 
 1.6.8
 Found by  Fixed by  What...
+          quest/    fixed a problem on osx with files being shown as bytecount/-1
+          stdarg
           BarkerJr  log the remote .who command
           BarkerJr  fixed a small bug in guppy's last patch
 various   guppy     tcl_botisvoice, tcl_botisop, tcl_botonchan, tcl_onchansplit, tcl_isop,
Index: eggdrop1.7/modules/transfer/transfer.c
diff -u eggdrop1.7/modules/transfer/transfer.c:1.3 eggdrop1.7/modules/transfer/transfer.c:1.4
--- eggdrop1.7/modules/transfer/transfer.c:1.3	Mon Dec  3 19:30:35 2001
+++ eggdrop1.7/modules/transfer/transfer.c	Sat Dec 29 15:04:22 2001
@@ -1,7 +1,7 @@
 /*
  * transfer.c -- part of transfer.mod
  *
- * $Id: transfer.c,v 1.3 2001/12/04 01:30:35 ite Exp $
+ * $Id: transfer.c,v 1.4 2001/12/29 21:04:22 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -1359,19 +1359,23 @@
  *
  * Use raw_dcc_resend() and raw_dcc_send() instead of this function.
  */
+
 static int raw_dcc_resend_send(char *filename, char *nick, char *from,
 			       char *dir, int resend, char *addr)
 {
   int zz, port, i;
   char *nfn, *buf = NULL;
-  struct stat ss;
-  FILE *f;
+  long dccfilesize;
+  FILE *f, *dccfile;
 
 debug1("|TRANSFER| raw_dcc_resend_send(... addr=\"%s\")", addr);
   zz = (-1);
-  stat(filename, &ss);
+  dccfile = fopen(filename,"r");
+  fseek(dccfile, 0, SEEK_END);
+  dccfilesize = ftell(dccfile);
+  fclose(dccfile);
   /* File empty?! */
-  if (ss.st_size == 0)
+  if (dccfilesize == 0)
     return DCCSEND_FEMPTY;
   if (reserved_port_min > 0 && reserved_port_min < reserved_port_max) {
     for (port = reserved_port_min; port <= reserved_port_max; port++) {
@@ -1418,14 +1422,14 @@
   strcpy(dcc[i].u.xfer->origname, nfn);
   strcpy(dcc[i].u.xfer->from, from);
   strcpy(dcc[i].u.xfer->dir, dir);
-  dcc[i].u.xfer->length = ss.st_size;
+  dcc[i].u.xfer->length = dccfilesize;
   dcc[i].timeval = now;
   dcc[i].u.xfer->f = f;
   dcc[i].u.xfer->type = resend ? XFER_RESEND_PEND : XFER_SEND;
   if (nick[0] != '*') {
     dprintf(DP_HELP, "PRIVMSG %s :\001DCC %sSEND %s %s %d %lu\001\n", nick,
 	    resend ? "RE" :  "", nfn, addr,
-	    port, ss.st_size);
+	    port, dccfilesize);
     putlog(LOG_FILES, "*", "Begin DCC %ssend %s to %s", resend ? "re" :  "",
 	   nfn, nick);
   }
Index: eggdrop1.7/src/patch.h
diff -u eggdrop1.7/src/patch.h:1.567 eggdrop1.7/src/patch.h:1.568
--- eggdrop1.7/src/patch.h:1.567	Sat Dec 29 14:59:49 2001
+++ eggdrop1.7/src/patch.h	Sat Dec 29 15:04:22 2001
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.567 2001/12/29 20:59:49 guppy Exp $
+ * $Id: patch.h,v 1.568 2001/12/29 21:04:22 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,17 +41,17 @@
  *
  *
  */
-patch("1009659342");		/* current unixtime */
+patch("1009659623");		/* current unixtime */
 /*
  *
  *
  */
-patch("whomsg");
+patch("filesizefix");
 /*
  *
  *
  */
-patch("whomsg");
+patch("filesizefix");
 /*
  *
  *
----------------------- End of diff -----------------------



More information about the Changes mailing list