X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=dfa%2Fgrepper.c;h=5e77428cd8f97905f0aae0567adda26cd129738d;hb=c51d8a82aae537ffa1ad29aecea5cb6e7a9be37a;hp=1c515548da5a88ec6b58539c06163c717c1a2fb6;hpb=6f5101be21e854a5125b489a03814cc7509236cc;p=idzebra-moved-to-github.git

diff --git a/dfa/grepper.c b/dfa/grepper.c
index 1c51554..5e77428 100644
--- a/dfa/grepper.c
+++ b/dfa/grepper.c
@@ -1,30 +1,34 @@
-/*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: grepper.c,v $
- * Revision 1.4  1995-01-24 16:00:21  adam
- * Added -ansi to CFLAGS.
- * Some changes to the dfa module.
- *
- * Revision 1.3  1994/10/04  17:46:43  adam
- * Function options now returns arg with error option.
- *
- * Revision 1.2  1994/10/03  17:22:18  adam
- * Optimization of grepper.
- *
- * Revision 1.1  1994/09/27  16:31:18  adam
- * First version of grepper: grep with error correction.
- *
- */
+/* $Id: grepper.c,v 1.17 2007-01-15 15:10:15 adam Exp $
+   Copyright (C) 1995-2007
+   Index Data ApS
+
+This file is part of the Zebra server.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <assert.h>
 
-#include <util.h>
+#include <idzebra/util.h>
+#include <yaz/yaz-util.h>
 #include <dfa.h>
 #include "imalloc.h"
 
@@ -326,7 +330,7 @@ static int grep_file (struct DFA *dfa, const char *fname, int range)
         inf = fopen (fname, "r");
         if (!inf)
         {
-            log (LOG_FATAL|LOG_ERRNO, "cannot open `%s'", fname);
+            yaz_log (YLOG_FATAL|YLOG_ERRNO, "cannot open `%s'", fname);
             exit (1);
         }
     }
@@ -347,7 +351,7 @@ int main (int argc, char **argv)
     int ret;
     int range = 0;
     char *arg;
-    char *pattern = NULL;
+    const char *pattern = NULL;
     int no_files = 0;
     struct DFA *dfa = dfa_init();
 
@@ -376,7 +380,7 @@ int main (int argc, char **argv)
         }
         else if (ret == 'v')
         {
-            log_init (log_mask_str(arg), prog, NULL);
+            yaz_log_init (yaz_log_mask_str(arg), prog, NULL);
         }
         else if (ret == 's')
         {
@@ -398,7 +402,7 @@ int main (int argc, char **argv)
         }
         else
         {
-            log (LOG_FATAL, "Unknown option '-%s'", arg);
+            yaz_log (YLOG_FATAL, "Unknown option '-%s'", arg);
             exit (1);
         }
     }
@@ -415,3 +419,11 @@ int main (int argc, char **argv)
     dfa_delete (&dfa);
     return 0;
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+