X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=util%2Fyaz-util.c;h=76c33d9ccd563d7b44d53649ccb407fe100e72ac;hp=87fb1d5bdc2d8712d8371fe781e7a42635e31af1;hb=eb0f67241481fb645a377b1c5df9683f8f1bd2fb;hpb=7826e2c92b1a07182ba5bfb94c304f1fa7d27387

diff --git a/util/yaz-util.c b/util/yaz-util.c
index 87fb1d5..76c33d9 100644
--- a/util/yaz-util.c
+++ b/util/yaz-util.c
@@ -1,10 +1,26 @@
 /*
- * 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.1  1996-02-20 16:33:06  quinn
+ * 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
  * Moved matchstr to global util
  *
  * Revision 1.1  1995/11/01  11:56:08  quinn
@@ -14,19 +30,21 @@
  */
 
 #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
  * the various subsystems if we get a bottleneck here.
  */
 
-int yaz_matchstr(char *s1, char *s2)
+int yaz_matchstr(const char *s1, const char *s2)
 {
     while (*s1 && *s2)
     {
 	char c1, c2;
 
+        if (*s2 == '?')
+            return 0;
 	if (*s1 == '-')
 	    s1++;
 	if (*s2 == '-')