X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=dfa%2Fagrep.c;h=179a49522cb5b3a1a8f14ce39438c677fd47ff71;hb=e63cb633d580e1a364de81d4f24fb2c9fa70e279;hp=2214fb5addeadcfc1beadca8d74d74a1d73dc1e1;hpb=5f8ba9f35bd3c9aeafe26613021f2edd141b8611;p=idzebra-moved-to-github.git

diff --git a/dfa/agrep.c b/dfa/agrep.c
index 2214fb5..179a495 100644
--- a/dfa/agrep.c
+++ b/dfa/agrep.c
@@ -1,43 +1,26 @@
-/*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: agrep.c,v $
- * Revision 1.10  1997-09-09 13:37:57  adam
- * Partial port to WIN95/NT.
- *
- * Revision 1.9  1996/10/29 13:57:18  adam
- * Include of zebrautl.h instead of alexutil.h.
- *
- * Revision 1.8  1996/01/08 09:09:16  adam
- * Function dfa_parse got 'const' string argument.
- * New functions to define char mappings made public.
- *
- * Revision 1.7  1995/10/16  09:31:24  adam
- * Bug fix.
- *
- * Revision 1.6  1995/09/28  09:18:51  adam
- * Removed various preprocessor defines.
- *
- * Revision 1.5  1995/09/04  12:33:25  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/09/27  16:31:18  adam
- * First version of grepper: grep with error correction.
- *
- * Revision 1.2  1994/09/26  16:30:56  adam
- * Minor changes. imalloc uses xmalloc now.
- *
- * Revision 1.1  1994/09/26  10:16:52  adam
- * First version of dfa module in alex. This version uses yacc to parse
- * regular expressions. This should be hand-made instead.
- *
- */
+/* $Id: agrep.c,v 1.15 2005-03-30 09:25:23 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 <stdio.h>
 #include <assert.h>
 #include <stdlib.h>
@@ -46,14 +29,17 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <fcntl.h>
-#ifdef WINDOWS
-#include <io.h>
+#include <fcntl.h>
+
+#ifdef WIN32
+
+#include <io.h>
+
 #else
 #include <unistd.h>
 #endif
 
-#include <zebrautl.h>
+#include <idzebra/util.h>
 #include <dfa.h>
 #include "imalloc.h"
 
@@ -277,6 +263,7 @@ char **argv;
         return i;
     while (--argc > 0)
         if (**++argv != '-' && **argv)
+        {
             if (!pattern)
             {
                 pattern = *argv;
@@ -302,6 +289,7 @@ char **argv;
                 if (i)
                     return i;
             }
+        }
     if (!no)
     {
         fprintf (stderr, "usage:\n "