Deb: idzebra-2.0-utils includes init.d script

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

diff --git a/dfa/readfile.c b/dfa/readfile.c
index 40b0bf3..6f9f687 100644 (file)
--- a/dfa/readfile.c
+++ b/dfa/readfile.c
@@ -1,8 +1,5 @@
-/* $Id: readfile.c,v 1.10 2005-01-15 19:38:19 adam Exp $
-   Copyright (C) 1995-2005
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 2004-2013 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
@@ -15,12 +12,15 @@ 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 Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+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>
 
@@ -28,7 +28,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <string.h>
 #include <ctype.h>
 
-#include <zebrautl.h>
+#include <idzebra/util.h>
 #include <dfa.h>
 #include "lexer.h"
 
@@ -101,9 +101,9 @@ static void read_rules (struct DFA *dfa)
             /* copy rest of line to output */
             fputs (s, outf);
         else
-        { 
+        {
             /* preprocess regular expression */
-            prep (&s);                   
+            prep (&s);
             /* now parse regular expression */
             sc = s;
             i = dfa_parse (dfa, &sc);
@@ -164,3 +164,12 @@ int read_file (const char *s, struct DFA *dfa)
     fclose (inf);
     return err_no;
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+