X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=dfa%2Fagrep.c;h=23014c0d20153a5a3117e557ca985a55517f962c;hp=c8cdf7e2deccbf1c1374117ff15f98db70688377;hb=HEAD;hpb=25711769a3fb5c6bf0ab3eb9634bf74ba07dc48d diff --git a/dfa/agrep.c b/dfa/agrep.c index c8cdf7e..23014c0 100644 --- a/dfa/agrep.c +++ b/dfa/agrep.c @@ -1,20 +1,26 @@ -/* - * Copyright (C) 1994, Index Data I/S - * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss - * - * $Log: agrep.c,v $ - * 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) 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 +#endif #include #include #include @@ -24,10 +30,15 @@ #include #include #include -#include +#ifdef WIN32 +#include +#endif +#if HAVE_UNISTD_H +#include +#endif -#include +#include #include #include "imalloc.h" @@ -47,19 +58,9 @@ void error (const char *format, ...) exit (1); } -#ifdef YYDEBUG -#ifdef YACC -extern int yydebug; -#else -extern int alexdebug; -#endif -#endif - 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 == '-') @@ -76,15 +77,6 @@ char **argv; case 'n': show_lines = 1; continue; -#ifdef YYDEBUG - case 't': -#ifdef YACC - yydebug = 1; -#else - alexdebug = 1; -#endif - continue; -#endif case 'd': switch (*++*argv) { @@ -118,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; @@ -149,8 +140,7 @@ int fd; return 0; } -static char *prline (p) -char *p; +static char *prline (char *p) { char *p0; @@ -169,15 +159,14 @@ char *p; return p; } -static int go (fd, dfaar) -int fd; -DFA_state **dfaar; +static int go (int fd, struct DFA_state **dfaar) { - DFA_state *s = dfaar[0]; - DFA_tran *t; + struct DFA_state *s = dfaar[0]; + struct DFA_tran *t; char *p; int i; unsigned char c; + int start_line = 1; while (1) { @@ -187,14 +176,15 @@ 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'; break; } for (t=s->trans, i=s->tran_no; --i >= 0; t++) - if ((unsigned) *p >= t->ch[0] + if ((unsigned) *p >= t->ch[0] && (unsigned) *p <= t->ch[1]) break; p++; @@ -204,6 +194,7 @@ DFA_state **dfaar; } if (c == '\n') { + start_line = 1; ++line_no; if (inf_ptr == inf_flsh) { @@ -217,13 +208,13 @@ DFA_state **dfaar; } } } + else + start_line = 0; } return 0; } -int agrep (dfas, fd) -DFA_states *dfas; -int fd; +int agrep (struct DFA_state **dfas, int fd) { inf_buf = imalloc (sizeof(char)*INF_BUF_SIZE); inf_eof = 0; @@ -231,49 +222,47 @@ int fd; inf_flush (fd); line_no = 1; - go (fd, dfas->sortarray); + go (fd, dfas); ifree (inf_buf); return 0; } -int main (argc, argv) -int argc; -char **argv; +int main (int argc, char **argv) { - char *pattern = NULL; + const char *pattern = NULL; char outbuf[BUFSIZ]; int fd, i, no = 0; - DFA *dfa = init_dfa(); - DFA_states *dfas; + struct DFA *dfa = dfa_init(); prog = *argv; -#ifdef YYDEBUG -#ifdef YACC - yydebug = 0; -#else - alexdebug = 0; -#endif -#endif + 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; - i = parse_dfa (dfa, &pattern, dfa_thompson_chars); + i = dfa_parse (dfa, &pattern); if (i || *pattern) { fprintf (stderr, "%s: illegal pattern\n", prog); return 1; } - dfa->root = dfa->top; - dfas = mk_dfas (dfa, 200); - rm_dfa (&dfa); + dfa_mkstate (dfa); } else { @@ -284,16 +273,28 @@ char **argv; fprintf (stderr, "%s: couldn't open `%s'\n", prog, *argv); return 1; } - i = agrep (dfas, fd); + i = agrep (dfa->states, fd); close (fd); 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); + 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 + */ +