[eggheads-patches] PATCH: misc.patch

Arty arthur2 at demoniak.hay-france.com
Wed Oct 20 11:52:33 CST 1999


1) Fixes for the osf warnings.
2) Fix for the tcldcc.c strncpy lenghth mismatch.
3) Fix for MISC_USERFEXISTS every language usage.

arthur2
-------------- next part --------------
Index: doc/UPDATES1.3
===================================================================
RCS file: /usr/local/cvsroot/eggdrop1.3/doc/UPDATES1.3,v
retrieving revision 1.189
diff -u -r1.189 UPDATES1.3
--- doc/UPDATES1.3	1999/10/20 01:36:20	1.189
+++ doc/UPDATES1.3	1999/10/20 08:01:13
@@ -3,7 +3,9 @@
 ----------------------------------
 
 1.3.29
-Foundby   Fixedby   What....
+Foundby   Fixedby   What...
+SuperS	  arthur2   Fixed some osf warnings.
+	  arthur2   tcldcc.c strncpy length mismatch.
           Tothwolf  updated doc/BUG-REPORT
 	  Fabian    bot was deop'ing itsself in got_op()
           rtc       tcl chpt binding could call the proc with chan -1
Index: language/core.english.lang
===================================================================
RCS file: /usr/local/cvsroot/eggdrop1.3/language/core.english.lang,v
retrieving revision 1.13
diff -u -r1.13 core.english.lang
--- language/core.english.lang	1999/10/12 22:09:59	1.13
+++ language/core.english.lang	1999/10/20 08:01:13
@@ -138,7 +138,7 @@
 Telnet to the bot and enter 'NEW' as your nickname.
 0x537,OR Go to IRC and:  /msg %s hello\n
 0x538,This will make the bot recognize you as the master.
-0x539,USERFILE ALREADY EXISTS (drop the '-m')\n
+0x539,USERFILE ALREADY EXISTS (drop the '-m')
 0x53a,CAN'T WRITE TO TEMP DIR
 0x53b,Can't reload user file!
 0x53c,User file is missing!
Index: src/chanprog.c
===================================================================
RCS file: /usr/local/cvsroot/eggdrop1.3/src/chanprog.c,v
retrieving revision 1.9
diff -u -r1.9 chanprog.c
--- src/chanprog.c	1999/10/17 20:27:29	1.9
+++ src/chanprog.c	1999/10/20 08:01:13
@@ -431,7 +431,7 @@
     printf("%s\n\n", MISC_USERFCREATE2);
   } else if (make_userfile) {
      make_userfile = 0;
-     printf(MISC_USERFEXISTS);
+     printf("%s\n", MISC_USERFEXISTS);
   }
   context;
   if (helpdir[0])
Index: src/tcldcc.c
===================================================================
RCS file: /usr/local/cvsroot/eggdrop1.3/src/tcldcc.c,v
retrieving revision 1.8
diff -u -r1.8 tcldcc.c
--- src/tcldcc.c	1999/10/17 20:27:29	1.8
+++ src/tcldcc.c	1999/10/20 08:01:14
@@ -469,7 +469,7 @@
   dcc[idx].u.script->type = dcc[idx].type;
   dcc[idx].type = &DCC_SCRIPT;
   strncpy(dcc[idx].u.script->command, argv[2], 120);
-  dcc[idx].u.script->command[119] = 0;
+  dcc[idx].u.script->command[120] = 0;
   return TCL_OK;
 }
 
Index: src/mod/blowfish.mod/blowfish.h
===================================================================
RCS file: /usr/local/cvsroot/eggdrop1.3/src/mod/blowfish.mod/blowfish.h,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 blowfish.h
--- src/mod/blowfish.mod/blowfish.h	1999/06/23 19:51:34	1.1.1.1
+++ src/mod/blowfish.mod/blowfish.h	1999/10/20 08:01:14
@@ -8,7 +8,7 @@
 #define DATAERROR        -1
 #define KEYBYTES         8
 
-#define UBYTE_08bits  unsigned char
+#define UBYTE_08bits  char
 #define UWORD_16bits  unsigned short
 
 #if SIZEOF_INT==4
Index: src/mod/server.mod/server.c
===================================================================
RCS file: /usr/local/cvsroot/eggdrop1.3/src/mod/server.mod/server.c,v
retrieving revision 1.15
diff -u -r1.15 server.c
--- src/mod/server.mod/server.c	1999/10/17 20:27:32	1.15
+++ src/mod/server.mod/server.c	1999/10/20 08:01:14
@@ -77,7 +77,7 @@
  H_ctcr, H_ctcp;
 
 static void empty_msgq(void);
-static void next_server(int *, char *, int *, char *);
+static void next_server(int *, char *, unsigned int *, char *);
 static char *get_altbotnick(void);
 
 #include "servmsg.c"
@@ -355,7 +355,7 @@
 
 /* set botserver to the next available server
  * -> if (*ptr == -1) then jump to that particular server */
-static void next_server(int *ptr, char *serv, int *port, char *pass)
+static void next_server(int *ptr, char *serv, unsigned int *port, char *pass)
 {
   struct server_list *x = serverlist;
   int i = 0;
Index: src/mod/transfer.mod/transfer.c
===================================================================
RCS file: /usr/local/cvsroot/eggdrop1.3/src/mod/transfer.mod/transfer.c,v
retrieving revision 1.9
diff -u -r1.9 transfer.c
--- src/mod/transfer.mod/transfer.c	1999/10/14 00:59:23	1.9
+++ src/mod/transfer.mod/transfer.c	1999/10/20 08:01:15
@@ -64,9 +64,9 @@
  * Features:  Forward, case-sensitive, ?, *                               *
  * Best use:  File mask matching, as it is case-sensitive                 *
  *========================================================================*/
-static int wild_match_file(register unsigned char *m, register unsigned char *n)
+static int wild_match_file(register char *m, register char *n)
 {
-  unsigned char *ma = m, *lsm = 0, *lsn = 0;
+  char *ma = m, *lsm = 0, *lsn = 0;
   int match = 1;
   register unsigned int sofar = 0;
 
@@ -451,7 +451,8 @@
 
 static void dcc_get(int idx, char *buf, int len)
 {
-  unsigned char bbuf[4], xnick[NICKLEN], *bf;
+  char xnick[NICKLEN];
+  unsigned char bbuf[4], *bf;
   unsigned long cmp, l;
   int w = len + dcc[idx].u.xfer->sofar, p = 0;
 


More information about the Patches mailing list