X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=dfa%2Fagrep.c;h=2214fb5addeadcfc1beadca8d74d74a1d73dc1e1;hb=b63ec925e865fd55b560bac229b7eb23fd7da46e;hp=405104d57ff8d1a4c71485adef5e5bb05e5a5aa4;hpb=a825e22395e14761bcb2f88177d1a86f3da2843a;p=idzebra-moved-to-github.git diff --git a/dfa/agrep.c b/dfa/agrep.c index 405104d..2214fb5 100644 --- a/dfa/agrep.c +++ b/dfa/agrep.c @@ -4,7 +4,17 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: agrep.c,v $ - * Revision 1.7 1995-10-16 09:31:24 adam + * 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 @@ -36,11 +46,14 @@ #include #include -#include +#include +#ifdef WINDOWS +#include +#else #include +#endif - -#include +#include #include #include "imalloc.h" @@ -174,6 +187,7 @@ struct DFA_state **dfaar; char *p; int i; unsigned char c; + int start_line = 1; while (1) { @@ -183,7 +197,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 +215,7 @@ struct DFA_state **dfaar; } if (c == '\n') { + start_line = 1; ++line_no; if (inf_ptr == inf_flsh) { @@ -213,6 +229,8 @@ struct DFA_state **dfaar; } } } + else + start_line = 0; } return 0; } @@ -238,12 +256,21 @@ 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)