X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=dfa%2Fagrep.c;h=39d0f69173ff7241d73f6e541c605c9f9a9b76b8;hb=d960df9d3f91d209797047fca679027e365e8d02;hp=81835d084f1ce2c491e1479c75854a740952ede7;hpb=cf67c63195045b4ba4d535d8df5129732aab215d;p=idzebra-moved-to-github.git

diff --git a/dfa/agrep.c b/dfa/agrep.c
index 81835d0..39d0f69 100644
--- a/dfa/agrep.c
+++ b/dfa/agrep.c
@@ -1,10 +1,29 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
+ * Copyright (C) 1994-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: agrep.c,v $
- * Revision 1.6  1995-09-28 09:18:51  adam
+ * Revision 1.12  1999-05-26 07:49:12  adam
+ * C++ compilation.
+ *
+ * Revision 1.11  1999/02/02 14:50:03  adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * 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
@@ -34,10 +53,16 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <unistd.h>
 
+#ifdef WIN32
+
+#include <io.h>
 
-#include <alexutil.h>
+#else
+#include <unistd.h>
+#endif
+
+#include <zebrautl.h>
 #include <dfa.h>
 #include "imalloc.h"
 
@@ -171,6 +196,7 @@ struct DFA_state **dfaar;
     char *p;
     int i;
     unsigned char c;
+    int start_line = 1;
 
     while (1)
     {
@@ -180,7 +206,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';
@@ -197,6 +224,7 @@ struct DFA_state **dfaar;
             }
         if (c == '\n')
         {
+            start_line = 1;
             ++line_no;
             if (inf_ptr == inf_flsh)
             {
@@ -210,6 +238,8 @@ struct DFA_state **dfaar;
                 }
             }
         }
+        else
+            start_line = 0;
     }
     return 0;
 }
@@ -235,18 +265,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;
@@ -272,9 +312,11 @@ char **argv;
                 if (i)
                     return i;
             }
+        }
     if (!no)
     {
-        fprintf (stderr, "%s: no files specified\n", prog);
+        fprintf (stderr, "usage:\n "
+                         " %s [-d] [-v] [-n] [-f] pattern file ..\n", prog);
         return 2;
     }
     fflush(stdout);