X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=dfa%2Fgrepper.c;h=cdcb7c2210b986c2054a3d60c547a5a1a00a5ad4;hb=0e56fa84bb4a5985c19a21926e86862c08d84689;hp=14bd7e9da7a0fe0832818c78336fa7daf5e7b806;hpb=b879b04a092d5b00cc866cf16f755e55053d2e89;p=idzebra-moved-to-github.git

diff --git a/dfa/grepper.c b/dfa/grepper.c
index 14bd7e9..cdcb7c2 100644
--- a/dfa/grepper.c
+++ b/dfa/grepper.c
@@ -1,33 +1,33 @@
-/*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: grepper.c,v $
- * Revision 1.5  1995-09-04 12:33:26  adam
- * Various cleanup. YAZ util used instead.
- *
- * 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.11 2004-11-19 10:26:54 heikki Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+   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 Zebra; see the file LICENSE.zebra.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+*/
+
+
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <assert.h>
 
-#include <alexutil.h>
+#include <zebrautl.h>
 #include <dfa.h>
 #include "imalloc.h"
 
@@ -329,7 +329,7 @@ static int grep_file (struct DFA *dfa, const char *fname, int range)
         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);
         }
     }
@@ -350,7 +350,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();
 
@@ -379,7 +379,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')
         {
@@ -401,7 +401,7 @@ int main (int argc, char **argv)
         }
         else
         {
-            logf (LOG_FATAL, "Unknown option '-%s'", arg);
+            yaz_log (YLOG_FATAL, "Unknown option '-%s'", arg);
             exit (1);
         }
     }