X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=dfa%2Fgrepper.c;h=48fa465717b6d6163d28a548f13f61e3b8d4ca82;hp=baa9be7dc4be5ad37dfba35cca5d2dda0db302de;hb=6c9fcd3b5d3108702fa1ffc92dab4ab6060f9a19;hpb=a4672c6ad0168d8c39b6806e33b90cba4151ac0d diff --git a/dfa/grepper.c b/dfa/grepper.c index baa9be7..48fa465 100644 --- a/dfa/grepper.c +++ b/dfa/grepper.c @@ -1,39 +1,26 @@ -/* - * Copyright (C) 1994-1999, Index Data - * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss - * - * $Log: grepper.c,v $ - * Revision 1.9 2000-09-05 14:04:05 adam - * Updates for prefix 'yaz_' for YAZ log functions. - * - * Revision 1.8 1999/02/02 14:50:07 adam - * Updated WIN32 code specific sections. Changed header. - * - * Revision 1.7 1996/10/29 13:57:24 adam - * Include of zebrautl.h instead of alexutil.h. - * - * Revision 1.6 1996/01/08 09:09:20 adam - * Function dfa_parse got 'const' string argument. - * New functions to define char mappings made public. - * - * 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.12 2005-01-15 19:38:19 adam Exp $ + Copyright (C) 1995-2005 + 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 #include #include @@ -342,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); } } @@ -414,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); } }