Fix match_ircglob() and globtest

 * Fix a reversed test in match_ircglob() and make globtest compiles again.
git-archimport-id: srvx@srvx.net--2005-srvx/srvx--devo--1.3--patch-23

diff --git a/ChangeLog b/ChangeLog
index 1604fd9dc9d42daf7644e82abe3e54e6536a555c..49f932cd3d4400839ae897bb984b024e0a6849bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,19 @@
 # arch-tag: automatic-ChangeLog--srvx@srvx.net--2005-srvx/srvx--devo--1.3
 #
 
+2005-07-04 00:37:07 GMT        Zoot <zoot@gamesurge.net>       patch-23
+
+    Summary:
+      Fix match_ircglob() and globtest
+    Revision:
+      srvx--devo--1.3--patch-23
+
+     * Fix a reversed test in match_ircglob() and make globtest compiles again.
+
+    modified files:
+     ChangeLog src/globtest.c src/tools.c
+
+
 2005-06-01 19:05:39 GMT        Zoot <zoot@gamesurge.net>       patch-22
 
     Summary:

diff --git a/src/globtest.c b/src/globtest.c
index 99660b999c0eac24d16c7f4bc56d4c6ead1c93ec..9249f8786bc788b07f36db663a47bf4881761927 100644 (file)
--- a/src/globtest.c
+++ b/src/globtest.c
@@ -1,5 +1,6 @@
 #include "hash.h"
 #include "log.h"
+#include "helpfile.h"
 
 struct glob_test {
     const char *glob;
@@ -41,6 +42,7 @@ main(UNUSED_ARG(int argc), UNUSED_ARG(char *argv[]))
 {
     int i, j;
 
+    tools_init();
     for (i = 0; glob_yes[i].glob; i++) {
        for (j=0; glob_yes[i].texts[j]; j++) {
            if (!match_ircglob(glob_yes[i].texts[j], glob_yes[i].glob)) {
@@ -71,7 +73,8 @@ main(UNUSED_ARG(int argc), UNUSED_ARG(char *argv[]))
 }
 
 /* because tools.c likes to log stuff.. */
-void log(UNUSED_ARG(enum log_type lt), UNUSED_ARG(enum log_severity ls), char *format, ...)
+void
+log_module(UNUSED_ARG(struct log_type *type), UNUSED_ARG(enum log_severity sev), const char *format, ...)
 {
     va_list va;
     va_start(va, format);
@@ -79,4 +82,12 @@ void log(UNUSED_ARG(enum log_type lt), UNUSED_ARG(enum log_severity ls), char *f
     va_end(va);
 }
 
+const char *
+language_find_message(UNUSED_ARG(struct language *lang), UNUSED_ARG(const char *msgid))
+{
+    return "Stub -- Not implemented.";
+}
+
+struct language *lang_C = NULL;
+struct log_type *MAIN_LOG = NULL;
 const char *hidden_host_suffix;

diff --git a/src/tools.c b/src/tools.c
index 934c04372297ae56233e673ac4ac055bacd522dc..bea5099f745fefe02279d66a632c5ee680639a27 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -290,7 +290,7 @@ match_ircglob(const char *text, const char *glob)
         /* and fall through */
     default:
         if (!*n)
-            return *m != '\0';
+            return *m == '\0';
         if (tolower(*m) != tolower(*n))
             goto backtrack;
         m++;