[cvslog] (2003-11-27 05:45:16 UTC) Module eggdrop1.6: Change committed

cvslog cvs at tsss.org
Wed Nov 26 23:45:16 CST 2003


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

Modified files:
     src/chanprog.c src/patch.h src/mod/irc.mod/irc.c
     src/mod/irc.mod/msgcmds.c

Log message:

* Continued.

---------------------- diff included ----------------------
Index: eggdrop1.6/src/chanprog.c
diff -u eggdrop1.6/src/chanprog.c:1.44 eggdrop1.6/src/chanprog.c:1.45
--- eggdrop1.6/src/chanprog.c:1.44	Wed Nov 26 23:10:30 2003
+++ eggdrop1.6/src/chanprog.c	Wed Nov 26 23:45:06 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.44 2003/11/27 05:10:30 wcc Exp $
+ * $Id: chanprog.c,v 1.45 2003/11/27 05:45:06 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -277,11 +277,11 @@
   if (!uname(&un) < 0) {
 #endif
     vers_t = " ";
-    uni_t = "*unknown*";
+    uni_t  = "*unknown*";
 #ifdef HAVE_UNAME
   } else {
     vers_t = un.release;
-    uni_t = un.sysname;
+    uni_t  = un.sysname;
   }
 #endif
 
Index: eggdrop1.6/src/mod/irc.mod/irc.c
diff -u eggdrop1.6/src/mod/irc.mod/irc.c:1.94 eggdrop1.6/src/mod/irc.mod/irc.c:1.95
--- eggdrop1.6/src/mod/irc.mod/irc.c:1.94	Wed Nov 26 21:25:10 2003
+++ eggdrop1.6/src/mod/irc.mod/irc.c	Wed Nov 26 23:45:06 2003
@@ -2,7 +2,7 @@
  * irc.c -- part of irc.mod
  *   support for channels within the bot
  *
- * $Id: irc.c,v 1.94 2003/11/27 03:25:10 wcc Exp $
+ * $Id: irc.c,v 1.95 2003/11/27 05:45:06 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -25,12 +25,14 @@
 
 #define MODULE_NAME "irc"
 #define MAKING_IRC
+
 #include "src/mod/module.h"
 #include "irc.h"
 #include "server.mod/server.h"
 #include "channels.mod/channels.h"
+
 #ifdef HAVE_UNAME
-#include <sys/utsname.h>
+# include <sys/utsname.h>
 #endif
 
 static p_tcl_bind_list H_topc, H_splt, H_sign, H_rejn, H_part, H_pub, H_pubm;
@@ -949,7 +951,7 @@
                          p ? p : "", p ? ")" : "");
       if ((k + l) > 70) {
         dprintf(idx, "    %s\n", q);
-        strcpy(q, "           ");
+        strcpy(q, "            ");
         k = 10;
       }
       k += my_strcpy(q + k, ch);
Index: eggdrop1.6/src/mod/irc.mod/msgcmds.c
diff -u eggdrop1.6/src/mod/irc.mod/msgcmds.c:1.44 eggdrop1.6/src/mod/irc.mod/msgcmds.c:1.45
--- eggdrop1.6/src/mod/irc.mod/msgcmds.c:1.44	Wed Nov 26 23:17:02 2003
+++ eggdrop1.6/src/mod/irc.mod/msgcmds.c	Wed Nov 26 23:45:06 2003
@@ -2,7 +2,7 @@
  * msgcmds.c -- part of irc.mod
  *   all commands entered via /MSG
  *
- * $Id: msgcmds.c,v 1.44 2003/11/27 05:17:02 wcc Exp $
+ * $Id: msgcmds.c,v 1.45 2003/11/27 05:45:06 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -787,7 +787,7 @@
 
 static int msg_status(char *nick, char *host, struct userrec *u, char *par)
 {
-  char s[256], *ve_t, *un_t, *pass;
+  char s[256], *vers_t, *uni_t, *pass;
   int i;
   struct chanset_t *chan;
   time_t now2 = now - online_since, hr, min;
@@ -795,14 +795,14 @@
 #ifdef HAVE_UNAME
   struct utsname un;
 
-  if (uname(&un) >= 0) {
+  if (!uname(&un) < 0) {
 #endif
-    ve_t = " ";
-    un_t = "*unknown*";
+    vers_t = " ";
+    uni_t  = "*unknown*";
 #ifdef HAVE_UNAME
   } else {
-    ve_t = un.release;
-    un_t = un.sysname;
+    vers_t = un.release;
+    uni_t  = un.sysname;
   }
 #endif
 
@@ -826,7 +826,7 @@
 
   i = count_users(userlist);
   dprintf(DP_HELP, "NOTICE %s :I am %s, running %s: %d user%s  (mem: %uk).\n",
-          nick, botnetnick, Version, i, i == 1 ? "" : "s",
+          nick, botnetnick, ver, i, i == 1 ? "" : "s",
          (int) (expected_memory() / 1024));
 
   s[0] = 0;
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.1016 eggdrop1.6/src/patch.h:1.1017
--- eggdrop1.6/src/patch.h:1.1016	Wed Nov 26 23:10:30 2003
+++ eggdrop1.6/src/patch.h	Wed Nov 26 23:45:06 2003
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.1016 2003/11/27 05:10:30 wcc Exp $
+ * $Id: patch.h,v 1.1017 2003/11/27 05:45:06 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1069909823");            /* current unixtime */
+patch("1069911897");            /* current unixtime */
 /*
  *
  *
  */
-patch("status-cosmetic2");
+patch("status-cosmetic3");
 /*
  *
  *
----------------------- End of diff -----------------------


More information about the Changes mailing list