NMEM thread safe. NMEM must be initialized before use (sigh) -

[yaz-moved-to-github.git] / util / yaz-util.c

diff --git a/util/yaz-util.c b/util/yaz-util.c
index e16750e..76c33d9 100644 (file)
--- a/util/yaz-util.c
+++ b/util/yaz-util.c
@@ -1,10 +1,23 @@
 /*
- * Copyright (c) 1995, Index Data.
+ * Copyright (c) 1995-1997, Index Data.
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: yaz-util.c,v $
- * Revision 1.2  1996-02-20 17:58:42  adam
+ * Revision 1.6  1997-09-04 07:54:34  adam
+ * Right hande side operand of yaz_matchstr may include a ? in
+ * which case it returns "match ok".
+ *
+ * Revision 1.5  1997/07/21 12:48:11  adam
+ * Removed windows DLL stubs.
+ *
+ * Revision 1.4  1997/05/01 15:07:55  adam
+ * Added DLL entry point routines.
+ *
+ * Revision 1.3  1996/10/29 13:36:28  adam
+ * Added header.
+ *
+ * Revision 1.2  1996/02/20 17:58:42  adam
  * Added const to yaz_matchstr.
  *
  * Revision 1.1  1996/02/20  16:33:06  quinn
@@ -17,7 +30,7 @@
  */
 
 #include <ctype.h>
-
+#include <yaz-util.h>
 /*
  * Match strings, independently of case and occurences of '-'.
  * fairly inefficient - will be replaced with an indexing scheme for
@@ -30,6 +43,8 @@ int yaz_matchstr(const char *s1, const char *s2)
     {
        char c1, c2;
 
+        if (*s2 == '?')
+            return 0;
        if (*s1 == '-')
            s1++;
        if (*s2 == '-')