X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fmatchstr.c;h=086378197185008d9320dbc01d5d07a5c47b8aa5;hb=3d18b35078096b9fd1feb8e2d6fd7e9e48755ad5;hp=193a47ee480540f004f1d41dafd78a6f5d26bab5;hpb=8e3a0973e8149ae25f5404395f417761edee1604;p=yaz-moved-to-github.git

diff --git a/util/matchstr.c b/util/matchstr.c
index 193a47e..0863781 100644
--- a/util/matchstr.c
+++ b/util/matchstr.c
@@ -1,10 +1,19 @@
 /*
- * Copyright (c) 1995-1997, Index Data.
+ * Copyright (c) 1995-2000, Index Data.
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: matchstr.c,v $
- * Revision 1.2  1999-10-15 11:35:41  adam
+ * Revision 1.5  2000-02-29 13:44:55  adam
+ * Check for config.h (currently not generated).
+ *
+ * Revision 1.4  1999/11/30 13:47:12  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.3  1999/10/19 12:35:42  adam
+ * Minor bug fix (bug introduced by previous commit).
+ *
+ * Revision 1.2  1999/10/15 11:35:41  adam
  * Character '.' matches any single character.
  *
  * Revision 1.1  1999/06/08 10:10:16  adam
@@ -37,10 +46,14 @@
  *
  *
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <assert.h>
 #include <ctype.h>
-#include <yaz-util.h>
+#include <yaz/yaz-util.h>
 
 /*
  * Match strings, independently of case and occurences of '-'.
@@ -58,9 +71,9 @@ int yaz_matchstr(const char *s1, const char *s2)
         if (c2 == '?')
             return 0;
 	if (c1 == '-')
-	    s1++;
+	    c1 = *++s1;
 	if (c2 == '-')
-	    s2++;
+	    c2 = *++s2;
 	if (!c1 || !c2)
 	    break;
         if (c2 != '.')