[cvslog] (2003-11-27 03:25:20 UTC) Module eggdrop1.6: Change committed

cvslog cvs at tsss.org
Wed Nov 26 21:25:20 CST 2003


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2003-11-27 03:25:20 UTC
Commited by: Will Buckner <wcc at techmonkeys.org>

Modified files:
     doc/UPDATES1.6 src/chanprog.c src/modules.c src/patch.h
     src/mod/irc.mod/irc.c

Log message:

* Cosmetic fixes to .status.

---------------------- diff included ----------------------
Index: eggdrop1.6/doc/UPDATES1.6
diff -u eggdrop1.6/doc/UPDATES1.6:1.515 eggdrop1.6/doc/UPDATES1.6:1.516
--- eggdrop1.6/doc/UPDATES1.6:1.515	Wed Nov 26 10:01:10 2003
+++ eggdrop1.6/doc/UPDATES1.6	Wed Nov 26 21:25:10 2003
@@ -1,10 +1,12 @@
-$Id: UPDATES1.6,v 1.515 2003/11/26 16:01:10 wcc Exp $
+$Id: UPDATES1.6,v 1.516 2003/11/27 03:25:10 wcc Exp $
 
 Changes in Eggdrop: (since v1.6.0)
 ----------------------------------
 
 1.6.16
 Found by     Fixed by  What...
+             Wcc       coxmetic fixes to .status
+             Wcc       coxmetic fixes to .who
 R. Ramos     dw        fixed a getdesc segfault when a file has no desc
 various      Wcc       removed IPv6 for now, will be implemented in a more
                        proper way in an upcoming release
Index: eggdrop1.6/src/chanprog.c
diff -u eggdrop1.6/src/chanprog.c:1.42 eggdrop1.6/src/chanprog.c:1.43
--- eggdrop1.6/src/chanprog.c:1.42	Fri Mar  7 22:29:43 2003
+++ eggdrop1.6/src/chanprog.c	Wed Nov 26 21:25:10 2003
@@ -7,7 +7,7 @@
  *   telling the current programmed settings
  *   initializing a lot of stuff and loading the tcl scripts
  *
- * $Id: chanprog.c,v 1.42 2003/03/08 04:29:43 wcc Exp $
+ * $Id: chanprog.c,v 1.43 2003/11/27 03:25:10 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -286,7 +286,7 @@
 #endif
 
   i = count_users(userlist);
-  dprintf(idx, "I am %s, running %s:  %d user%s (mem: %uk)\n",
+  dprintf(idx, "I am %s, running %s: %d user%s (mem: %uk)\n",
           botnetnick, ver, i, i == 1 ? "" : "s",
           (int) (expected_memory() / 1024));
 
@@ -319,18 +319,18 @@
   getrusage(RUSAGE_SELF, &ru);
   hr = (int) ((ru.ru_utime.tv_sec + ru.ru_stime.tv_sec) / 60);
   min = (int) ((ru.ru_utime.tv_sec + ru.ru_stime.tv_sec) - (hr * 60));
-  sprintf(s2, "CPU %02d:%02d", (int) hr, (int) min);    /* Actally min/sec */
+  sprintf(s2, "CPU: %02d:%02d", (int) hr, (int) min);    /* Actally min/sec */
 #else
 # if HAVE_CLOCK
   cl = (clock() / CLOCKS_PER_SEC);
   hr = (int) (cl / 60);
   min = (int) (cl - (hr * 60));
-  sprintf(s2, "CPU %02d:%02d", (int) hr, (int) min);    /* Actually min/sec */
+  sprintf(s2, "CPU: %02d:%02d", (int) hr, (int) min);    /* Actually min/sec */
 # else
-  sprintf(s2, "CPU ???");
+  sprintf(s2, "CPU: unknown");
 # endif
 #endif
-  dprintf(idx, "%s %s  (%s)  %s  %s %4.1f%%\n", MISC_ONLINEFOR,
+  dprintf(idx, "%s %s (%s) - %s - %s: %4.1f%%\n", MISC_ONLINEFOR,
           s, s1, s2, MISC_CACHEHIT,
           100.0 * ((float) cache_hit) / ((float) (cache_hit + cache_miss)));
 
Index: eggdrop1.6/src/mod/irc.mod/irc.c
diff -u eggdrop1.6/src/mod/irc.mod/irc.c:1.93 eggdrop1.6/src/mod/irc.mod/irc.c:1.94
--- eggdrop1.6/src/mod/irc.mod/irc.c:1.93	Sun Aug 17 22:27:06 2003
+++ eggdrop1.6/src/mod/irc.mod/irc.c	Wed Nov 26 21:25:10 2003
@@ -2,7 +2,7 @@
  * irc.c -- part of irc.mod
  *   support for channels within the bot
  *
- * $Id: irc.c,v 1.93 2003/08/18 03:27:06 wcc Exp $
+ * $Id: irc.c,v 1.94 2003/11/27 03:25:10 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -948,8 +948,8 @@
       l = simple_sprintf(ch, "%s%s%s%s, ", chan->dname, p ? " (" : "",
                          p ? p : "", p ? ")" : "");
       if ((k + l) > 70) {
-        dprintf(idx, "   %s\n", q);
-        strcpy(q, "          ");
+        dprintf(idx, "    %s\n", q);
+        strcpy(q, "           ");
         k = 10;
       }
       k += my_strcpy(q + k, ch);
Index: eggdrop1.6/src/modules.c
diff -u eggdrop1.6/src/modules.c:1.87 eggdrop1.6/src/modules.c:1.88
--- eggdrop1.6/src/modules.c:1.87	Sat Nov  1 17:26:57 2003
+++ eggdrop1.6/src/modules.c	Wed Nov 26 21:25:10 2003
@@ -4,7 +4,7 @@
  * 
  * by Darrin Smith (beldin at light.iinet.net.au)
  * 
- * $Id: modules.c,v 1.87 2003/11/01 23:26:57 wcc Exp $
+ * $Id: modules.c,v 1.88 2003/11/27 03:25:10 wcc Exp $
  */
 /* 
  * Copyright (C) 1997 Robey Pointer
@@ -1070,8 +1070,8 @@
 {
   module_entry *p = module_list;
 
-  if (p && !which && details)
-    dprintf(idx, "MODULES LOADED:\n");
+  if (p && !which)
+    dprintf(idx, "Loaded module information:\n");
   for (; p; p = p->next) {
     if (!which || !egg_strcasecmp(which, p->name)) {
       dependancy *d;
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.1014 eggdrop1.6/src/patch.h:1.1015
--- eggdrop1.6/src/patch.h:1.1014	Wed Nov 26 21:20:24 2003
+++ eggdrop1.6/src/patch.h	Wed Nov 26 21:25:10 2003
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.1014 2003/11/27 03:20:24 wcc Exp $
+ * $Id: patch.h,v 1.1015 2003/11/27 03:25:10 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1069903199");            /* current unixtime */
+patch("1069903456");            /* current unixtime */
 /*
  *
  *
  */
-patch("who-cosmetic");
+patch("status-cosmetic1");
 /*
  *
  *
----------------------- End of diff -----------------------


More information about the Changes mailing list