Update m4

[idzebra-moved-to-github.git] / dfa / agrep.c

diff --git a/dfa/agrep.c b/dfa/agrep.c
index 2214fb5..0d671ef 100644 (file)
--- 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.
- *
- */
+/* This file is part of the Zebra server.
+   Copyright (C) 1994-2011 Index Data
+
+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
+
+*/
+
+
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdio.h>
 #include <assert.h>
 #include <stdlib.h>
@@ -46,14 +29,16 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <fcntl.h>\r
-#ifdef WINDOWS\r
-#include <io.h>\r
-#else
+#include <fcntl.h>
+
+#ifdef WIN32
+#include <io.h>
+#endif
+#if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
-#include <zebrautl.h>
+#include <idzebra/util.h>
 #include <dfa.h>
 #include "imalloc.h"
 
@@ -75,9 +60,7 @@ void error (const char *format, ...)
 
 static int show_lines = 0;
 
-int agrep_options (argc, argv)
-int argc;
-char **argv;
+int agrep_options (int argc, char **argv)
 {
     while (--argc > 0)
         if (**++argv == '-')
@@ -127,8 +110,7 @@ static char *inf_buf;
 static char *inf_ptr, *inf_flsh;
 static int inf_eof, line_no;
 
-static int inf_flush (fd)
-int fd;
+static int inf_flush (int fd)
 {
     char *p;
     unsigned b, r;
@@ -158,8 +140,7 @@ int fd;
     return 0;
 }
 
-static char *prline (p)
-char *p;
+static char *prline (char *p)
 {
     char *p0;
 
@@ -178,9 +159,7 @@ char *p;
     return p;
 }
 
-static int go (fd, dfaar)
-int fd;
-struct DFA_state **dfaar;
+static int go (int fd, struct DFA_state **dfaar)
 {
     struct DFA_state *s = dfaar[0];
     struct DFA_tran *t;
@@ -235,9 +214,7 @@ struct DFA_state **dfaar;
     return 0;
 }
 
-int agrep (dfas, fd)
-struct DFA_state **dfas;
-int fd;
+int agrep (struct DFA_state **dfas, int fd)
 {
     inf_buf = imalloc (sizeof(char)*INF_BUF_SIZE);
     inf_eof = 0;
@@ -252,9 +229,7 @@ int fd;
 }
 
 
-int main (argc, argv)
-int argc;
-char **argv;
+int main (int argc, char **argv)
 {
     const char *pattern = NULL;
     char outbuf[BUFSIZ];
@@ -277,6 +252,7 @@ char **argv;
         return i;
     while (--argc > 0)
         if (**++argv != '-' && **argv)
+        {
             if (!pattern)
             {
                 pattern = *argv;
@@ -302,6 +278,7 @@ char **argv;
                 if (i)
                     return i;
             }
+        }
     if (!no)
     {
         fprintf (stderr, "usage:\n "
@@ -312,3 +289,12 @@ char **argv;
     dfa_delete (&dfa);
     return 0;
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+