/*
- * 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
*
*
*/
+#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 '-'.
if (c2 == '?')
return 0;
if (c1 == '-')
- s1++;
+ c1 = *++s1;
if (c2 == '-')
- s2++;
+ c2 = *++s2;
if (!c1 || !c2)
break;
if (c2 != '.')