projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make equivalent work with trunc=104, 105. Added test for it.
[idzebra-moved-to-github.git]
/
dfa
/
grepper.c
diff --git
a/dfa/grepper.c
b/dfa/grepper.c
index
d8830a1
..
94a13ad
100644
(file)
--- a/
dfa/grepper.c
+++ b/
dfa/grepper.c
@@
-1,6
+1,6
@@
-/* $Id: grepper.c,v 1.10 2002-08-02 19:26:55 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
- Index Data Aps
+/* $Id: grepper.c,v 1.14 2005-04-15 10:47:47 adam Exp $
+ Copyright (C) 1995-2005
+ Index Data ApS
This file is part of the Zebra server.
This file is part of the Zebra server.
@@
-27,7
+27,8
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <ctype.h>
#include <assert.h>
#include <ctype.h>
#include <assert.h>
-#include <zebrautl.h>
+#include <idzebra/util.h>
+#include <yaz/yaz-util.h>
#include <dfa.h>
#include "imalloc.h"
#include <dfa.h>
#include "imalloc.h"
@@
-329,7
+330,7
@@
static int grep_file (struct DFA *dfa, const char *fname, int range)
inf = fopen (fname, "r");
if (!inf)
{
inf = fopen (fname, "r");
if (!inf)
{
- logf (LOG_FATAL|LOG_ERRNO, "cannot open `%s'", fname);
+ yaz_log (YLOG_FATAL|YLOG_ERRNO, "cannot open `%s'", fname);
exit (1);
}
}
exit (1);
}
}
@@
-401,7
+402,7
@@
int main (int argc, char **argv)
}
else
{
}
else
{
- logf (LOG_FATAL, "Unknown option '-%s'", arg);
+ yaz_log (YLOG_FATAL, "Unknown option '-%s'", arg);
exit (1);
}
}
exit (1);
}
}