X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=dfa%2Fagrep.c;h=22894a1f21520b453ad3af4e82faeb3f924ed294;hp=405104d57ff8d1a4c71485adef5e5bb05e5a5aa4;hb=4478d785b7769691261005c98063b98a5a5971b3;hpb=a825e22395e14761bcb2f88177d1a86f3da2843a

diff --git a/dfa/agrep.c b/dfa/agrep.c
index 405104d..22894a1 100644
--- a/dfa/agrep.c
+++ b/dfa/agrep.c
@@ -1,33 +1,26 @@
-/*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: agrep.c,v $
- * 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.18 2006-08-14 10:40:08 adam Exp $
+   Copyright (C) 1995-2006
+   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 <stdio.h>
 #include <assert.h>
 #include <stdlib.h>
@@ -37,10 +30,15 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <unistd.h>
 
+#ifdef WIN32
+#include <io.h>
+#endif
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 
-#include <alexutil.h>
+#include <idzebra/util.h>
 #include <dfa.h>
 #include "imalloc.h"
 
@@ -174,6 +172,7 @@ struct DFA_state **dfaar;
     char *p;
     int i;
     unsigned char c;
+    int start_line = 1;
 
     while (1)
     {
@@ -183,7 +182,8 @@ struct DFA_state **dfaar;
                 p = inf_ptr;
                 do
                 {
-                    if ((s = dfaar[t->to])->rule_no)
+                    if ((s = dfaar[t->to])->rule_no &&
+                        (start_line || s->rule_nno))
                     {
                         inf_ptr = prline (inf_ptr);
                         c = '\n';
@@ -200,6 +200,7 @@ struct DFA_state **dfaar;
             }
         if (c == '\n')
         {
+            start_line = 1;
             ++line_no;
             if (inf_ptr == inf_flsh)
             {
@@ -213,6 +214,8 @@ struct DFA_state **dfaar;
                 }
             }
         }
+        else
+            start_line = 0;
     }
     return 0;
 }
@@ -238,18 +241,28 @@ int main (argc, argv)
 int argc;
 char **argv;
 {
-    char *pattern = NULL;
+    const char *pattern = NULL;
     char outbuf[BUFSIZ];
     int fd, i, no = 0;
     struct DFA *dfa = dfa_init();
 
     prog = *argv;
+    if (argc < 2)
+    {
+        fprintf (stderr, "usage: agrep [options] pattern file..\n");
+        fprintf (stderr, " -v   dfa verbose\n");
+        fprintf (stderr, " -n   show lines\n");
+        fprintf (stderr, " -d   debug\n");
+        fprintf (stderr, " -V   show version\n");
+        exit (1);
+    }
     setbuf (stdout, outbuf);
     i = agrep_options (argc, argv);
     if (i)
         return i;
     while (--argc > 0)
         if (**++argv != '-' && **argv)
+        {
             if (!pattern)
             {
                 pattern = *argv;
@@ -275,6 +288,7 @@ char **argv;
                 if (i)
                     return i;
             }
+        }
     if (!no)
     {
         fprintf (stderr, "usage:\n "
@@ -285,3 +299,11 @@ char **argv;
     dfa_delete (&dfa);
     return 0;
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+