[cvslog] Module eggdrop1.7: Change committed

cvslog cvs at tsss.org
Sun Oct 14 05:24:01 CST 2001


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.7
Commit time: 2001-10-14 10:23:01 UTC
Commited by: Tothwolf <tothwolf at techmonkeys.org>

Modified files:
     Makefile.am src/Makefile.am src/adns/Makefile.am
     src/compat/Makefile.am src/mod/compress.mod/Makefile.am
     src/mod/server.mod/servmsg.c

Added files:
     src/mod/tclscript.mod/.cvsignore

Log message:

* more minor Makefile.am cleanups
* added .cvsignore for tclscript.mod
* detect_flood() needed to be called in gotnotice() *after* checking that a notice is not from a server

---------------------- diff included ----------------------
Index: eggdrop1.7/Makefile.am
diff -u eggdrop1.7/Makefile.am:1.1 eggdrop1.7/Makefile.am:1.2
--- eggdrop1.7/Makefile.am:1.1	Tue Oct  9 20:20:08 2001
+++ eggdrop1.7/Makefile.am	Sun Oct 14 05:22:49 2001
@@ -1,9 +1,9 @@
-# $Id: Makefile.am,v 1.1 2001/10/10 01:20:08 ite Exp $
+# $Id: Makefile.am,v 1.2 2001/10/14 10:22:49 tothwolf Exp $
 
 AUX_DIST                = $(ac_aux_dir)/install-sh \
 			$(ac_aux_dir)/ltmain.sh \
 			$(ac_aux_dir)/missing \
-                        $(ac_aux_dir)/mkinstalldirs \
+			$(ac_aux_dir)/mkinstalldirs \
 			$(ac_aux_dir)/depcomp 
 AUX_DIST_EXTRA		= $(ac_aux_dir)/codeset.m4 \
 			$(ac_aux_dir)/gettext.m4 \
@@ -20,7 +20,7 @@
 DISTCLEANFILES		= lush.h
 MAINTAINERCLEANFILES    = Makefile.in aclocal.m4 configure config-h.in \
 			config.cache config.log config.status \
-                        config.h.in stamp-h.in $(AUX_DIST)
+			config.h.in stamp-h.in $(AUX_DIST)
 			 
 ACLOCAL                 = aclocal -I $(ac_aux_dir)
 
Index: eggdrop1.7/src/Makefile.am
diff -u eggdrop1.7/src/Makefile.am:1.8 eggdrop1.7/src/Makefile.am:1.9
--- eggdrop1.7/src/Makefile.am:1.8	Sat Oct 13 23:44:36 2001
+++ eggdrop1.7/src/Makefile.am	Sun Oct 14 05:22:50 2001
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.8 2001/10/14 04:44:36 stdarg Exp $
+# $Id: Makefile.am,v 1.9 2001/10/14 10:22:50 tothwolf Exp $
 
 # FIXME: optionally allow a system wide install by ignoring the line below.
 bindir    = $(exec_prefix)
@@ -93,10 +93,10 @@
 		"-dlopen" mod/transfer.mod/transfer.la \
 		"-dlopen" mod/uptime.mod/uptime.la \
 		"-dlopen" mod/woobie.mod/woobie.la \
-                compat/libcompat.la \
-                adns/libadns.la \
-                egglib/libegg.la \
-                $(XLIBS)
+		compat/libcompat.la \
+		adns/libadns.la \
+		egglib/libegg.la \
+		$(XLIBS)
 eggdrop_DEPENDENCIES= $(XREQS)
 			src/mod/assoc.mod/assoc.la \
 			src/mod/blowflish/blowfish.la \
Index: eggdrop1.7/src/adns/Makefile.am
diff -u eggdrop1.7/src/adns/Makefile.am:1.1 eggdrop1.7/src/adns/Makefile.am:1.2
--- eggdrop1.7/src/adns/Makefile.am:1.1	Tue Oct  9 20:20:10 2001
+++ eggdrop1.7/src/adns/Makefile.am	Sun Oct 14 05:22:50 2001
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.1 2001/10/10 01:20:10 ite Exp $
+# $Id: Makefile.am,v 1.2 2001/10/14 10:22:50 tothwolf Exp $
 
 ## libcompat is built as convenience library
 
@@ -9,7 +9,7 @@
 
 noinst_LTLIBRARIES = libadns.la
 libadns_la_SOURCES = adns.h \
-                  check.c \
+		  check.c \
 		  dlist.h \
 		  event.c \
 		  general.c \
Index: eggdrop1.7/src/compat/Makefile.am
diff -u eggdrop1.7/src/compat/Makefile.am:1.2 eggdrop1.7/src/compat/Makefile.am:1.3
--- eggdrop1.7/src/compat/Makefile.am:1.2	Wed Oct 10 05:44:04 2001
+++ eggdrop1.7/src/compat/Makefile.am	Sun Oct 14 05:22:50 2001
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.2 2001/10/10 10:44:04 tothwolf Exp $
+# $Id: Makefile.am,v 1.3 2001/10/14 10:22:50 tothwolf Exp $
 
 ## libcompat is built as convenience library
 
@@ -8,17 +8,17 @@
 
 noinst_LTLIBRARIES = libcompat.la
 libcompat_la_SOURCES = compat.h \
-                  gnu_strftime.c \
-                  inet_aton.c \
-		  inet_aton.h \
-		  inet_ntop.c \
-		  inet_ntop.h \
-		  inet_pton.c \
-		  inet_pton.h \
-		  snprintf.c \
-		  snprintf.h \
-		  strcasecmp.c \
-		  strcasecmp.h \
-		  strftime.c \
-		  strftime.h
+		gnu_strftime.c \
+		inet_aton.c \
+		inet_aton.h \
+		inet_ntop.c \
+		inet_ntop.h \
+		inet_pton.c \
+		inet_pton.h \
+		snprintf.c \
+		snprintf.h \
+		strcasecmp.c \
+		strcasecmp.h \
+		strftime.c \
+		strftime.h
 
Index: eggdrop1.7/src/mod/compress.mod/Makefile.am
diff -u eggdrop1.7/src/mod/compress.mod/Makefile.am:1.2 eggdrop1.7/src/mod/compress.mod/Makefile.am:1.3
--- eggdrop1.7/src/mod/compress.mod/Makefile.am:1.2	Sat Oct 13 16:36:59 2001
+++ eggdrop1.7/src/mod/compress.mod/Makefile.am	Sun Oct 14 05:22:50 2001
@@ -1,8 +1,9 @@
-# $Id: Makefile.am,v 1.2 2001/10/13 21:36:59 tothwolf Exp $
+# $Id: Makefile.am,v 1.3 2001/10/14 10:22:50 tothwolf Exp $
 
 # FIXME: optionally allow a system wide install by ignoring the line below.
 pkglibdir = $(exec_prefix)/modules
 
+# FIXME: dependency on gnu make
 if EGG_COMPRESS
   EGG_CMP = compress.la
 else
Index: eggdrop1.7/src/mod/server.mod/servmsg.c
diff -u eggdrop1.7/src/mod/server.mod/servmsg.c:1.72 eggdrop1.7/src/mod/server.mod/servmsg.c:1.73
--- eggdrop1.7/src/mod/server.mod/servmsg.c:1.72	Sat Oct 13 10:55:34 2001
+++ eggdrop1.7/src/mod/server.mod/servmsg.c	Sun Oct 14 05:22:50 2001
@@ -1,7 +1,7 @@
 /*
  * servmsg.c -- part of server.mod
  *
- * $Id: servmsg.c,v 1.72 2001/10/13 15:55:34 tothwolf Exp $
+ * $Id: servmsg.c,v 1.73 2001/10/14 10:22:50 tothwolf Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -568,14 +568,14 @@
       putlog(LOG_MSGS | LOG_SERV, "*", "-%s (%s) to %s- %s",
 	     nick, uhost, to, msg);
     } else {
-      detect_flood(nick, uhost, from, FLOOD_NOTICE);
-      u = get_user_by_host(from);
       /* Server notice? */
       if ((from[0] == 0) || (nick[0] == 0)) {
 	/* Hidden `250' connection count message from server */
 	if (strncmp(msg, "Highest connection count:", 25))
 	  putlog(LOG_SERV, "*", "-NOTICE- %s", msg);
       } else {
+        detect_flood(nick, uhost, from, FLOOD_NOTICE);
+        u = get_user_by_host(from);
         if (!ignoring || trigger_on_ignore)
           check_tcl_notc(nick, uhost, u, botname, msg);
         if (!ignoring)
Index: eggdrop1.7/src/mod/tclscript.mod/.cvsignore
diff -u /dev/null eggdrop1.7/src/mod/tclscript.mod/.cvsignore:1.1
--- /dev/null	Sun Oct 14 05:23:01 2001
+++ eggdrop1.7/src/mod/tclscript.mod/.cvsignore	Sun Oct 14 05:22:51 2001
@@ -0,0 +1,8 @@
+Makefile
+Makefile.in
+.deps
+.libs
+*.o
+*.lo
+*.la
+*.obj
----------------------- End of diff -----------------------



More information about the Changes mailing list