[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
grep branch, master, updated. v2.5.4-209-gd50cec2
|
From: |
Paolo Bonzini |
|
Subject: |
grep branch, master, updated. v2.5.4-209-gd50cec2 |
|
Date: |
Mon, 22 Mar 2010 09:04:53 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".
The branch, master has been updated
via d50cec2ac8902cc73cef9288671b4f317a68bdf6 (commit)
via 9131ab90daad68365418cfb25e6deb2fb84bfae4 (commit)
via c59a6cd03de84dc38c577083f34e3b0dfe87e36d (commit)
via 59040143e96ce960476c5a360d829256759ff4ab (commit)
via 1046f9ff1093426cc6f3d39e8dae0e0f92d27707 (commit)
via cba2bf3e7a3c4702e62581819ba29cb59ff63295 (commit)
via 86a79b53be729b2d961dd625b9898518b8867b28 (commit)
via 3a5cff100bb294e3a7008ee7f2d323bac711607f (commit)
via 637295fa65a4967546ac25f4f00020c14cf5379c (commit)
from f9f42f94cc0c898cb3632c404317c671690c679b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=d50cec2ac8902cc73cef9288671b4f317a68bdf6
commit d50cec2ac8902cc73cef9288671b4f317a68bdf6
Author: Paolo Bonzini <address@hidden>
Date: Thu Mar 18 13:44:28 2010 +0100
grep: libify *search.c
* src/Makefile.am (libsearch_a_SOURCES): Add dfasearch.c, kwsearch.c,
pcresearch.c.
* src/esearch.c, src/fsearch.c, * src/gsearch.c: Only include search.h.
* src/dfasearch.c (GEAcompile, EGexecute): Export.
* src/kwsearch.c (Fcompile, Fexecute): Export.
* src/pcresearch.c (Pcompile, Pexecute): Export.
* src/search.h: Add new exported functions.
diff --git a/.x-sc_require_config_h b/.x-sc_require_config_h
index 9abf3da..c11a39b 100644
--- a/.x-sc_require_config_h
+++ b/.x-sc_require_config_h
@@ -1,5 +1,2 @@
src/egrep.c
src/fgrep.c
-src/esearch.c
-src/fsearch.c
-src/gsearch.c
diff --git a/.x-sc_require_config_h_first b/.x-sc_require_config_h_first
index 9abf3da..c11a39b 100644
--- a/.x-sc_require_config_h_first
+++ b/.x-sc_require_config_h_first
@@ -1,5 +1,2 @@
src/egrep.c
src/fgrep.c
-src/esearch.c
-src/fsearch.c
-src/gsearch.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 7ebc126..6571529 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,7 +25,8 @@ fgrep_SOURCES = fgrep.c fsearch.c
noinst_HEADERS = grep.h dfa.h kwset.h search.h system.h mbsupport.h
noinst_LIBRARIES = libsearch.a
-libsearch_a_SOURCES = kwset.c dfa.c searchutils.c
+libsearch_a_SOURCES = kwset.c dfa.c searchutils.c dfasearch.c kwsearch.c \
+ pcresearch.c
LDADD = $(LIBINTL) libsearch.a ../lib/libgreputils.a
grep_LDADD = $(LDADD) $(PCRE_LIBS)
@@ -34,5 +35,4 @@ INCLUDES = -I$(top_srcdir)/lib -DLOCALEDIR=\"$(localedir)\"
EXTRA_DIST = \
dosbuf.c \
- pcresearch.c dfasearch.c kwsearch.c \
vms_fab.c vms_fab.h
diff --git a/src/dfasearch.c b/src/dfasearch.c
index 6a9137a..996effd 100644
--- a/src/dfasearch.c
+++ b/src/dfasearch.c
@@ -110,8 +110,7 @@ kwsmusts (void)
}
}
-/* No __VA_ARGS__ in C89. So we have to do it this way. */
-static void
+void
GEAcompile (char const *pattern, size_t size, reg_syntax_t syntax_bits)
{
const char *err;
@@ -195,7 +194,7 @@ GEAcompile (char const *pattern, size_t size, reg_syntax_t
syntax_bits)
free(motif);
}
-static size_t
+size_t
EGexecute (char const *buf, size_t size, size_t *match_size,
char const *start_ptr)
{
diff --git a/src/esearch.c b/src/esearch.c
index 933ecc8..647d2cb 100644
--- a/src/esearch.c
+++ b/src/esearch.c
@@ -1,4 +1,5 @@
-#include "dfasearch.c"
+#include <config.h>
+#include "search.h"
static void
Ecompile (char const *pattern, size_t size)
diff --git a/src/fsearch.c b/src/fsearch.c
index b16e769..a524487 100644
--- a/src/fsearch.c
+++ b/src/fsearch.c
@@ -1,4 +1,5 @@
-#include "kwsearch.c"
+#include <config.h>
+#include "search.h"
struct matcher const matchers[] = {
{ "fgrep", Fcompile, Fexecute },
diff --git a/src/gsearch.c b/src/gsearch.c
index 7156809..b71d3b7 100644
--- a/src/gsearch.c
+++ b/src/gsearch.c
@@ -1,6 +1,5 @@
-#include "dfasearch.c"
-#include "pcresearch.c"
-#include "kwsearch.c"
+#include <config.h>
+#include "search.h"
static void
Gcompile (char const *pattern, size_t size)
diff --git a/src/kwsearch.c b/src/kwsearch.c
index 245ccf0..2f8e7b7 100644
--- a/src/kwsearch.c
+++ b/src/kwsearch.c
@@ -29,7 +29,7 @@
any string matching the regexp. */
static kwset_t kwset;
-static void
+void
Fcompile (char const *pattern, size_t size)
{
char const *beg, *end, *lim, *err, *pat;
@@ -74,7 +74,7 @@ Fcompile (char const *pattern, size_t size)
error (EXIT_TROUBLE, 0, "%s", err);
}
-static size_t
+size_t
Fexecute (char const *buf, size_t size, size_t *match_size,
char const *start_ptr)
{
diff --git a/src/pcresearch.c b/src/pcresearch.c
index f09acdc..4dedf24 100644
--- a/src/pcresearch.c
+++ b/src/pcresearch.c
@@ -32,7 +32,7 @@ static pcre *cre;
static pcre_extra *extra;
#endif
-static void
+void
Pcompile (char const *pattern, size_t size)
{
#if !HAVE_LIBPCRE
@@ -99,7 +99,7 @@ Pcompile (char const *pattern, size_t size)
#endif
}
-static size_t
+size_t
Pexecute (char const *buf, size_t size, size_t *match_size,
char const *start_ptr)
{
diff --git a/src/search.h b/src/search.h
index cb3b535..10e4d5c 100644
--- a/src/search.h
+++ b/src/search.h
@@ -37,6 +37,7 @@
#include "kwset.h"
#include "xalloc.h"
+/* searchutils.c */
void kwsinit (kwset_t *);
#ifdef MBS_SUPPORT
@@ -44,4 +45,17 @@ char * mbtolower (const char *, size_t *);
bool is_mb_middle(const char **, const char *, const char *);
#endif
+/* dfasearch.c */
+void GEAcompile (char const *, size_t, reg_syntax_t);
+size_t EGexecute (char const *, size_t, size_t *, char const *);
+
+/* kwsearch.c */
+void Fcompile (char const *, size_t);
+size_t Fexecute (char const *, size_t, size_t *, char const *);
+
+/* pcresearch.c */
+void Pcompile (char const *, size_t);
+size_t Pexecute (char const *, size_t, size_t *, char const *);
+
+
#endif /* GREP_SEARCH_H */
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=9131ab90daad68365418cfb25e6deb2fb84bfae4
commit d50cec2ac8902cc73cef9288671b4f317a68bdf6
Author: Paolo Bonzini <address@hidden>
Date: Thu Mar 18 13:44:28 2010 +0100
grep: libify *search.c
* src/Makefile.am (libsearch_a_SOURCES): Add dfasearch.c, kwsearch.c,
pcresearch.c.
* src/esearch.c, src/fsearch.c, * src/gsearch.c: Only include search.h.
* src/dfasearch.c (GEAcompile, EGexecute): Export.
* src/kwsearch.c (Fcompile, Fexecute): Export.
* src/pcresearch.c (Pcompile, Pexecute): Export.
* src/search.h: Add new exported functions.
diff --git a/.x-sc_require_config_h b/.x-sc_require_config_h
index 9abf3da..c11a39b 100644
--- a/.x-sc_require_config_h
+++ b/.x-sc_require_config_h
@@ -1,5 +1,2 @@
src/egrep.c
src/fgrep.c
-src/esearch.c
-src/fsearch.c
-src/gsearch.c
diff --git a/.x-sc_require_config_h_first b/.x-sc_require_config_h_first
index 9abf3da..c11a39b 100644
--- a/.x-sc_require_config_h_first
+++ b/.x-sc_require_config_h_first
@@ -1,5 +1,2 @@
src/egrep.c
src/fgrep.c
-src/esearch.c
-src/fsearch.c
-src/gsearch.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 7ebc126..6571529 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,7 +25,8 @@ fgrep_SOURCES = fgrep.c fsearch.c
noinst_HEADERS = grep.h dfa.h kwset.h search.h system.h mbsupport.h
noinst_LIBRARIES = libsearch.a
-libsearch_a_SOURCES = kwset.c dfa.c searchutils.c
+libsearch_a_SOURCES = kwset.c dfa.c searchutils.c dfasearch.c kwsearch.c \
+ pcresearch.c
LDADD = $(LIBINTL) libsearch.a ../lib/libgreputils.a
grep_LDADD = $(LDADD) $(PCRE_LIBS)
@@ -34,5 +35,4 @@ INCLUDES = -I$(top_srcdir)/lib -DLOCALEDIR=\"$(localedir)\"
EXTRA_DIST = \
dosbuf.c \
- pcresearch.c dfasearch.c kwsearch.c \
vms_fab.c vms_fab.h
diff --git a/src/dfasearch.c b/src/dfasearch.c
index 6a9137a..996effd 100644
--- a/src/dfasearch.c
+++ b/src/dfasearch.c
@@ -110,8 +110,7 @@ kwsmusts (void)
}
}
-/* No __VA_ARGS__ in C89. So we have to do it this way. */
-static void
+void
GEAcompile (char const *pattern, size_t size, reg_syntax_t syntax_bits)
{
const char *err;
@@ -195,7 +194,7 @@ GEAcompile (char const *pattern, size_t size, reg_syntax_t
syntax_bits)
free(motif);
}
-static size_t
+size_t
EGexecute (char const *buf, size_t size, size_t *match_size,
char const *start_ptr)
{
diff --git a/src/esearch.c b/src/esearch.c
index 933ecc8..647d2cb 100644
--- a/src/esearch.c
+++ b/src/esearch.c
@@ -1,4 +1,5 @@
-#include "dfasearch.c"
+#include <config.h>
+#include "search.h"
static void
Ecompile (char const *pattern, size_t size)
diff --git a/src/fsearch.c b/src/fsearch.c
index b16e769..a524487 100644
--- a/src/fsearch.c
+++ b/src/fsearch.c
@@ -1,4 +1,5 @@
-#include "kwsearch.c"
+#include <config.h>
+#include "search.h"
struct matcher const matchers[] = {
{ "fgrep", Fcompile, Fexecute },
diff --git a/src/gsearch.c b/src/gsearch.c
index 7156809..b71d3b7 100644
--- a/src/gsearch.c
+++ b/src/gsearch.c
@@ -1,6 +1,5 @@
-#include "dfasearch.c"
-#include "pcresearch.c"
-#include "kwsearch.c"
+#include <config.h>
+#include "search.h"
static void
Gcompile (char const *pattern, size_t size)
diff --git a/src/kwsearch.c b/src/kwsearch.c
index 245ccf0..2f8e7b7 100644
--- a/src/kwsearch.c
+++ b/src/kwsearch.c
@@ -29,7 +29,7 @@
any string matching the regexp. */
static kwset_t kwset;
-static void
+void
Fcompile (char const *pattern, size_t size)
{
char const *beg, *end, *lim, *err, *pat;
@@ -74,7 +74,7 @@ Fcompile (char const *pattern, size_t size)
error (EXIT_TROUBLE, 0, "%s", err);
}
-static size_t
+size_t
Fexecute (char const *buf, size_t size, size_t *match_size,
char const *start_ptr)
{
diff --git a/src/pcresearch.c b/src/pcresearch.c
index f09acdc..4dedf24 100644
--- a/src/pcresearch.c
+++ b/src/pcresearch.c
@@ -32,7 +32,7 @@ static pcre *cre;
static pcre_extra *extra;
#endif
-static void
+void
Pcompile (char const *pattern, size_t size)
{
#if !HAVE_LIBPCRE
@@ -99,7 +99,7 @@ Pcompile (char const *pattern, size_t size)
#endif
}
-static size_t
+size_t
Pexecute (char const *buf, size_t size, size_t *match_size,
char const *start_ptr)
{
diff --git a/src/search.h b/src/search.h
index cb3b535..10e4d5c 100644
--- a/src/search.h
+++ b/src/search.h
@@ -37,6 +37,7 @@
#include "kwset.h"
#include "xalloc.h"
+/* searchutils.c */
void kwsinit (kwset_t *);
#ifdef MBS_SUPPORT
@@ -44,4 +45,17 @@ char * mbtolower (const char *, size_t *);
bool is_mb_middle(const char **, const char *, const char *);
#endif
+/* dfasearch.c */
+void GEAcompile (char const *, size_t, reg_syntax_t);
+size_t EGexecute (char const *, size_t, size_t *, char const *);
+
+/* kwsearch.c */
+void Fcompile (char const *, size_t);
+size_t Fexecute (char const *, size_t, size_t *, char const *);
+
+/* pcresearch.c */
+void Pcompile (char const *, size_t);
+size_t Pexecute (char const *, size_t, size_t *, char const *);
+
+
#endif /* GREP_SEARCH_H */
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=c59a6cd03de84dc38c577083f34e3b0dfe87e36d
commit d50cec2ac8902cc73cef9288671b4f317a68bdf6
Author: Paolo Bonzini <address@hidden>
Date: Thu Mar 18 13:44:28 2010 +0100
grep: libify *search.c
* src/Makefile.am (libsearch_a_SOURCES): Add dfasearch.c, kwsearch.c,
pcresearch.c.
* src/esearch.c, src/fsearch.c, * src/gsearch.c: Only include search.h.
* src/dfasearch.c (GEAcompile, EGexecute): Export.
* src/kwsearch.c (Fcompile, Fexecute): Export.
* src/pcresearch.c (Pcompile, Pexecute): Export.
* src/search.h: Add new exported functions.
diff --git a/.x-sc_require_config_h b/.x-sc_require_config_h
index 9abf3da..c11a39b 100644
--- a/.x-sc_require_config_h
+++ b/.x-sc_require_config_h
@@ -1,5 +1,2 @@
src/egrep.c
src/fgrep.c
-src/esearch.c
-src/fsearch.c
-src/gsearch.c
diff --git a/.x-sc_require_config_h_first b/.x-sc_require_config_h_first
index 9abf3da..c11a39b 100644
--- a/.x-sc_require_config_h_first
+++ b/.x-sc_require_config_h_first
@@ -1,5 +1,2 @@
src/egrep.c
src/fgrep.c
-src/esearch.c
-src/fsearch.c
-src/gsearch.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 7ebc126..6571529 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,7 +25,8 @@ fgrep_SOURCES = fgrep.c fsearch.c
noinst_HEADERS = grep.h dfa.h kwset.h search.h system.h mbsupport.h
noinst_LIBRARIES = libsearch.a
-libsearch_a_SOURCES = kwset.c dfa.c searchutils.c
+libsearch_a_SOURCES = kwset.c dfa.c searchutils.c dfasearch.c kwsearch.c \
+ pcresearch.c
LDADD = $(LIBINTL) libsearch.a ../lib/libgreputils.a
grep_LDADD = $(LDADD) $(PCRE_LIBS)
@@ -34,5 +35,4 @@ INCLUDES = -I$(top_srcdir)/lib -DLOCALEDIR=\"$(localedir)\"
EXTRA_DIST = \
dosbuf.c \
- pcresearch.c dfasearch.c kwsearch.c \
vms_fab.c vms_fab.h
diff --git a/src/dfasearch.c b/src/dfasearch.c
index 6a9137a..996effd 100644
--- a/src/dfasearch.c
+++ b/src/dfasearch.c
@@ -110,8 +110,7 @@ kwsmusts (void)
}
}
-/* No __VA_ARGS__ in C89. So we have to do it this way. */
-static void
+void
GEAcompile (char const *pattern, size_t size, reg_syntax_t syntax_bits)
{
const char *err;
@@ -195,7 +194,7 @@ GEAcompile (char const *pattern, size_t size, reg_syntax_t
syntax_bits)
free(motif);
}
-static size_t
+size_t
EGexecute (char const *buf, size_t size, size_t *match_size,
char const *start_ptr)
{
diff --git a/src/esearch.c b/src/esearch.c
index 933ecc8..647d2cb 100644
--- a/src/esearch.c
+++ b/src/esearch.c
@@ -1,4 +1,5 @@
-#include "dfasearch.c"
+#include <config.h>
+#include "search.h"
static void
Ecompile (char const *pattern, size_t size)
diff --git a/src/fsearch.c b/src/fsearch.c
index b16e769..a524487 100644
--- a/src/fsearch.c
+++ b/src/fsearch.c
@@ -1,4 +1,5 @@
-#include "kwsearch.c"
+#include <config.h>
+#include "search.h"
struct matcher const matchers[] = {
{ "fgrep", Fcompile, Fexecute },
diff --git a/src/gsearch.c b/src/gsearch.c
index 7156809..b71d3b7 100644
--- a/src/gsearch.c
+++ b/src/gsearch.c
@@ -1,6 +1,5 @@
-#include "dfasearch.c"
-#include "pcresearch.c"
-#include "kwsearch.c"
+#include <config.h>
+#include "search.h"
static void
Gcompile (char const *pattern, size_t size)
diff --git a/src/kwsearch.c b/src/kwsearch.c
index 245ccf0..2f8e7b7 100644
--- a/src/kwsearch.c
+++ b/src/kwsearch.c
@@ -29,7 +29,7 @@
any string matching the regexp. */
static kwset_t kwset;
-static void
+void
Fcompile (char const *pattern, size_t size)
{
char const *beg, *end, *lim, *err, *pat;
@@ -74,7 +74,7 @@ Fcompile (char const *pattern, size_t size)
error (EXIT_TROUBLE, 0, "%s", err);
}
-static size_t
+size_t
Fexecute (char const *buf, size_t size, size_t *match_size,
char const *start_ptr)
{
diff --git a/src/pcresearch.c b/src/pcresearch.c
index f09acdc..4dedf24 100644
--- a/src/pcresearch.c
+++ b/src/pcresearch.c
@@ -32,7 +32,7 @@ static pcre *cre;
static pcre_extra *extra;
#endif
-static void
+void
Pcompile (char const *pattern, size_t size)
{
#if !HAVE_LIBPCRE
@@ -99,7 +99,7 @@ Pcompile (char const *pattern, size_t size)
#endif
}
-static size_t
+size_t
Pexecute (char const *buf, size_t size, size_t *match_size,
char const *start_ptr)
{
diff --git a/src/search.h b/src/search.h
index cb3b535..10e4d5c 100644
--- a/src/search.h
+++ b/src/search.h
@@ -37,6 +37,7 @@
#include "kwset.h"
#include "xalloc.h"
+/* searchutils.c */
void kwsinit (kwset_t *);
#ifdef MBS_SUPPORT
@@ -44,4 +45,17 @@ char * mbtolower (const char *, size_t *);
bool is_mb_middle(const char **, const char *, const char *);
#endif
+/* dfasearch.c */
+void GEAcompile (char const *, size_t, reg_syntax_t);
+size_t EGexecute (char const *, size_t, size_t *, char const *);
+
+/* kwsearch.c */
+void Fcompile (char const *, size_t);
+size_t Fexecute (char const *, size_t, size_t *, char const *);
+
+/* pcresearch.c */
+void Pcompile (char const *, size_t);
+size_t Pexecute (char const *, size_t, size_t *, char const *);
+
+
#endif /* GREP_SEARCH_H */
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=59040143e96ce960476c5a360d829256759ff4ab
commit d50cec2ac8902cc73cef9288671b4f317a68bdf6
Author: Paolo Bonzini <address@hidden>
Date: Thu Mar 18 13:44:28 2010 +0100
grep: libify *search.c
* src/Makefile.am (libsearch_a_SOURCES): Add dfasearch.c, kwsearch.c,
pcresearch.c.
* src/esearch.c, src/fsearch.c, * src/gsearch.c: Only include search.h.
* src/dfasearch.c (GEAcompile, EGexecute): Export.
* src/kwsearch.c (Fcompile, Fexecute): Export.
* src/pcresearch.c (Pcompile, Pexecute): Export.
* src/search.h: Add new exported functions.
diff --git a/.x-sc_require_config_h b/.x-sc_require_config_h
index 9abf3da..c11a39b 100644
--- a/.x-sc_require_config_h
+++ b/.x-sc_require_config_h
@@ -1,5 +1,2 @@
src/egrep.c
src/fgrep.c
-src/esearch.c
-src/fsearch.c
-src/gsearch.c
diff --git a/.x-sc_require_config_h_first b/.x-sc_require_config_h_first
index 9abf3da..c11a39b 100644
--- a/.x-sc_require_config_h_first
+++ b/.x-sc_require_config_h_first
@@ -1,5 +1,2 @@
src/egrep.c
src/fgrep.c
-src/esearch.c
-src/fsearch.c
-src/gsearch.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 7ebc126..6571529 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,7 +25,8 @@ fgrep_SOURCES = fgrep.c fsearch.c
noinst_HEADERS = grep.h dfa.h kwset.h search.h system.h mbsupport.h
noinst_LIBRARIES = libsearch.a
-libsearch_a_SOURCES = kwset.c dfa.c searchutils.c
+libsearch_a_SOURCES = kwset.c dfa.c searchutils.c dfasearch.c kwsearch.c \
+ pcresearch.c
LDADD = $(LIBINTL) libsearch.a ../lib/libgreputils.a
grep_LDADD = $(LDADD) $(PCRE_LIBS)
@@ -34,5 +35,4 @@ INCLUDES = -I$(top_srcdir)/lib -DLOCALEDIR=\"$(localedir)\"
EXTRA_DIST = \
dosbuf.c \
- pcresearch.c dfasearch.c kwsearch.c \
vms_fab.c vms_fab.h
diff --git a/src/dfasearch.c b/src/dfasearch.c
index 6a9137a..996effd 100644
--- a/src/dfasearch.c
+++ b/src/dfasearch.c
@@ -110,8 +110,7 @@ kwsmusts (void)
}
}
-/* No __VA_ARGS__ in C89. So we have to do it this way. */
-static void
+void
GEAcompile (char const *pattern, size_t size, reg_syntax_t syntax_bits)
{
const char *err;
@@ -195,7 +194,7 @@ GEAcompile (char const *pattern, size_t size, reg_syntax_t
syntax_bits)
free(motif);
}
-static size_t
+size_t
EGexecute (char const *buf, size_t size, size_t *match_size,
char const *start_ptr)
{
diff --git a/src/esearch.c b/src/esearch.c
index 933ecc8..647d2cb 100644
--- a/src/esearch.c
+++ b/src/esearch.c
@@ -1,4 +1,5 @@
-#include "dfasearch.c"
+#include <config.h>
+#include "search.h"
static void
Ecompile (char const *pattern, size_t size)
diff --git a/src/fsearch.c b/src/fsearch.c
index b16e769..a524487 100644
--- a/src/fsearch.c
+++ b/src/fsearch.c
@@ -1,4 +1,5 @@
-#include "kwsearch.c"
+#include <config.h>
+#include "search.h"
struct matcher const matchers[] = {
{ "fgrep", Fcompile, Fexecute },
diff --git a/src/gsearch.c b/src/gsearch.c
index 7156809..b71d3b7 100644
--- a/src/gsearch.c
+++ b/src/gsearch.c
@@ -1,6 +1,5 @@
-#include "dfasearch.c"
-#include "pcresearch.c"
-#include "kwsearch.c"
+#include <config.h>
+#include "search.h"
static void
Gcompile (char const *pattern, size_t size)
diff --git a/src/kwsearch.c b/src/kwsearch.c
index 245ccf0..2f8e7b7 100644
--- a/src/kwsearch.c
+++ b/src/kwsearch.c
@@ -29,7 +29,7 @@
any string matching the regexp. */
static kwset_t kwset;
-static void
+void
Fcompile (char const *pattern, size_t size)
{
char const *beg, *end, *lim, *err, *pat;
@@ -74,7 +74,7 @@ Fcompile (char const *pattern, size_t size)
error (EXIT_TROUBLE, 0, "%s", err);
}
-static size_t
+size_t
Fexecute (char const *buf, size_t size, size_t *match_size,
char const *start_ptr)
{
diff --git a/src/pcresearch.c b/src/pcresearch.c
index f09acdc..4dedf24 100644
--- a/src/pcresearch.c
+++ b/src/pcresearch.c
@@ -32,7 +32,7 @@ static pcre *cre;
static pcre_extra *extra;
#endif
-static void
+void
Pcompile (char const *pattern, size_t size)
{
#if !HAVE_LIBPCRE
@@ -99,7 +99,7 @@ Pcompile (char const *pattern, size_t size)
#endif
}
-static size_t
+size_t
Pexecute (char const *buf, size_t size, size_t *match_size,
char const *start_ptr)
{
diff --git a/src/search.h b/src/search.h
index cb3b535..10e4d5c 100644
--- a/src/search.h
+++ b/src/search.h
@@ -37,6 +37,7 @@
#include "kwset.h"
#include "xalloc.h"
+/* searchutils.c */
void kwsinit (kwset_t *);
#ifdef MBS_SUPPORT
@@ -44,4 +45,17 @@ char * mbtolower (const char *, size_t *);
bool is_mb_middle(const char **, const char *, const char *);
#endif
+/* dfasearch.c */
+void GEAcompile (char const *, size_t, reg_syntax_t);
+size_t EGexecute (char const *, size_t, size_t *, char const *);
+
+/* kwsearch.c */
+void Fcompile (char const *, size_t);
+size_t Fexecute (char const *, size_t, size_t *, char const *);
+
+/* pcresearch.c */
+void Pcompile (char const *, size_t);
+size_t Pexecute (char const *, size_t, size_t *, char const *);
+
+
#endif /* GREP_SEARCH_H */
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=1046f9ff1093426cc6f3d39e8dae0e0f92d27707
commit d50cec2ac8902cc73cef9288671b4f317a68bdf6
Author: Paolo Bonzini <address@hidden>
Date: Thu Mar 18 13:44:28 2010 +0100
grep: libify *search.c
* src/Makefile.am (libsearch_a_SOURCES): Add dfasearch.c, kwsearch.c,
pcresearch.c.
* src/esearch.c, src/fsearch.c, * src/gsearch.c: Only include search.h.
* src/dfasearch.c (GEAcompile, EGexecute): Export.
* src/kwsearch.c (Fcompile, Fexecute): Export.
* src/pcresearch.c (Pcompile, Pexecute): Export.
* src/search.h: Add new exported functions.
diff --git a/.x-sc_require_config_h b/.x-sc_require_config_h
index 9abf3da..c11a39b 100644
--- a/.x-sc_require_config_h
+++ b/.x-sc_require_config_h
@@ -1,5 +1,2 @@
src/egrep.c
src/fgrep.c
-src/esearch.c
-src/fsearch.c
-src/gsearch.c
diff --git a/.x-sc_require_config_h_first b/.x-sc_require_config_h_first
index 9abf3da..c11a39b 100644
--- a/.x-sc_require_config_h_first
+++ b/.x-sc_require_config_h_first
@@ -1,5 +1,2 @@
src/egrep.c
src/fgrep.c
-src/esearch.c
-src/fsearch.c
-src/gsearch.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 7ebc126..6571529 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,7 +25,8 @@ fgrep_SOURCES = fgrep.c fsearch.c
noinst_HEADERS = grep.h dfa.h kwset.h search.h system.h mbsupport.h
noinst_LIBRARIES = libsearch.a
-libsearch_a_SOURCES = kwset.c dfa.c searchutils.c
+libsearch_a_SOURCES = kwset.c dfa.c searchutils.c dfasearch.c kwsearch.c \
+ pcresearch.c
LDADD = $(LIBINTL) libsearch.a ../lib/libgreputils.a
grep_LDADD = $(LDADD) $(PCRE_LIBS)
@@ -34,5 +35,4 @@ INCLUDES = -I$(top_srcdir)/lib -DLOCALEDIR=\"$(localedir)\"
EXTRA_DIST = \
dosbuf.c \
- pcresearch.c dfasearch.c kwsearch.c \
vms_fab.c vms_fab.h
diff --git a/src/dfasearch.c b/src/dfasearch.c
index 6a9137a..996effd 100644
--- a/src/dfasearch.c
+++ b/src/dfasearch.c
@@ -110,8 +110,7 @@ kwsmusts (void)
}
}
-/* No __VA_ARGS__ in C89. So we have to do it this way. */
-static void
+void
GEAcompile (char const *pattern, size_t size, reg_syntax_t syntax_bits)
{
const char *err;
@@ -195,7 +194,7 @@ GEAcompile (char const *pattern, size_t size, reg_syntax_t
syntax_bits)
free(motif);
}
-static size_t
+size_t
EGexecute (char const *buf, size_t size, size_t *match_size,
char const *start_ptr)
{
diff --git a/src/esearch.c b/src/esearch.c
index 933ecc8..647d2cb 100644
--- a/src/esearch.c
+++ b/src/esearch.c
@@ -1,4 +1,5 @@
-#include "dfasearch.c"
+#include <config.h>
+#include "search.h"
static void
Ecompile (char const *pattern, size_t size)
diff --git a/src/fsearch.c b/src/fsearch.c
index b16e769..a524487 100644
--- a/src/fsearch.c
+++ b/src/fsearch.c
@@ -1,4 +1,5 @@
-#include "kwsearch.c"
+#include <config.h>
+#include "search.h"
struct matcher const matchers[] = {
{ "fgrep", Fcompile, Fexecute },
diff --git a/src/gsearch.c b/src/gsearch.c
index 7156809..b71d3b7 100644
--- a/src/gsearch.c
+++ b/src/gsearch.c
@@ -1,6 +1,5 @@
-#include "dfasearch.c"
-#include "pcresearch.c"
-#include "kwsearch.c"
+#include <config.h>
+#include "search.h"
static void
Gcompile (char const *pattern, size_t size)
diff --git a/src/kwsearch.c b/src/kwsearch.c
index 245ccf0..2f8e7b7 100644
--- a/src/kwsearch.c
+++ b/src/kwsearch.c
@@ -29,7 +29,7 @@
any string matching the regexp. */
static kwset_t kwset;
-static void
+void
Fcompile (char const *pattern, size_t size)
{
char const *beg, *end, *lim, *err, *pat;
@@ -74,7 +74,7 @@ Fcompile (char const *pattern, size_t size)
error (EXIT_TROUBLE, 0, "%s", err);
}
-static size_t
+size_t
Fexecute (char const *buf, size_t size, size_t *match_size,
char const *start_ptr)
{
diff --git a/src/pcresearch.c b/src/pcresearch.c
index f09acdc..4dedf24 100644
--- a/src/pcresearch.c
+++ b/src/pcresearch.c
@@ -32,7 +32,7 @@ static pcre *cre;
static pcre_extra *extra;
#endif
-static void
+void
Pcompile (char const *pattern, size_t size)
{
#if !HAVE_LIBPCRE
@@ -99,7 +99,7 @@ Pcompile (char const *pattern, size_t size)
#endif
}
-static size_t
+size_t
Pexecute (char const *buf, size_t size, size_t *match_size,
char const *start_ptr)
{
diff --git a/src/search.h b/src/search.h
index cb3b535..10e4d5c 100644
--- a/src/search.h
+++ b/src/search.h
@@ -37,6 +37,7 @@
#include "kwset.h"
#include "xalloc.h"
+/* searchutils.c */
void kwsinit (kwset_t *);
#ifdef MBS_SUPPORT
@@ -44,4 +45,17 @@ char * mbtolower (const char *, size_t *);
bool is_mb_middle(const char **, const char *, const char *);
#endif
+/* dfasearch.c */
+void GEAcompile (char const *, size_t, reg_syntax_t);
+size_t EGexecute (char const *, size_t, size_t *, char const *);
+
+/* kwsearch.c */
+void Fcompile (char const *, size_t);
+size_t Fexecute (char const *, size_t, size_t *, char const *);
+
+/* pcresearch.c */
+void Pcompile (char const *, size_t);
+size_t Pexecute (char const *, size_t, size_t *, char const *);
+
+
#endif /* GREP_SEARCH_H */
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=cba2bf3e7a3c4702e62581819ba29cb59ff63295
commit d50cec2ac8902cc73cef9288671b4f317a68bdf6
Author: Paolo Bonzini <address@hidden>
Date: Thu Mar 18 13:44:28 2010 +0100
grep: libify *search.c
* src/Makefile.am (libsearch_a_SOURCES): Add dfasearch.c, kwsearch.c,
pcresearch.c.
* src/esearch.c, src/fsearch.c, * src/gsearch.c: Only include search.h.
* src/dfasearch.c (GEAcompile, EGexecute): Export.
* src/kwsearch.c (Fcompile, Fexecute): Export.
* src/pcresearch.c (Pcompile, Pexecute): Export.
* src/search.h: Add new exported functions.
diff --git a/.x-sc_require_config_h b/.x-sc_require_config_h
index 9abf3da..c11a39b 100644
--- a/.x-sc_require_config_h
+++ b/.x-sc_require_config_h
@@ -1,5 +1,2 @@
src/egrep.c
src/fgrep.c
-src/esearch.c
-src/fsearch.c
-src/gsearch.c
diff --git a/.x-sc_require_config_h_first b/.x-sc_require_config_h_first
index 9abf3da..c11a39b 100644
--- a/.x-sc_require_config_h_first
+++ b/.x-sc_require_config_h_first
@@ -1,5 +1,2 @@
src/egrep.c
src/fgrep.c
-src/esearch.c
-src/fsearch.c
-src/gsearch.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 7ebc126..6571529 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,7 +25,8 @@ fgrep_SOURCES = fgrep.c fsearch.c
noinst_HEADERS = grep.h dfa.h kwset.h search.h system.h mbsupport.h
noinst_LIBRARIES = libsearch.a
-libsearch_a_SOURCES = kwset.c dfa.c searchutils.c
+libsearch_a_SOURCES = kwset.c dfa.c searchutils.c dfasearch.c kwsearch.c \
+ pcresearch.c
LDADD = $(LIBINTL) libsearch.a ../lib/libgreputils.a
grep_LDADD = $(LDADD) $(PCRE_LIBS)
@@ -34,5 +35,4 @@ INCLUDES = -I$(top_srcdir)/lib -DLOCALEDIR=\"$(localedir)\"
EXTRA_DIST = \
dosbuf.c \
- pcresearch.c dfasearch.c kwsearch.c \
vms_fab.c vms_fab.h
diff --git a/src/dfasearch.c b/src/dfasearch.c
index 6a9137a..996effd 100644
--- a/src/dfasearch.c
+++ b/src/dfasearch.c
@@ -110,8 +110,7 @@ kwsmusts (void)
}
}
-/* No __VA_ARGS__ in C89. So we have to do it this way. */
-static void
+void
GEAcompile (char const *pattern, size_t size, reg_syntax_t syntax_bits)
{
const char *err;
@@ -195,7 +194,7 @@ GEAcompile (char const *pattern, size_t size, reg_syntax_t
syntax_bits)
free(motif);
}
-static size_t
+size_t
EGexecute (char const *buf, size_t size, size_t *match_size,
char const *start_ptr)
{
diff --git a/src/esearch.c b/src/esearch.c
index 933ecc8..647d2cb 100644
--- a/src/esearch.c
+++ b/src/esearch.c
@@ -1,4 +1,5 @@
-#include "dfasearch.c"
+#include <config.h>
+#include "search.h"
static void
Ecompile (char const *pattern, size_t size)
diff --git a/src/fsearch.c b/src/fsearch.c
index b16e769..a524487 100644
--- a/src/fsearch.c
+++ b/src/fsearch.c
@@ -1,4 +1,5 @@
-#include "kwsearch.c"
+#include <config.h>
+#include "search.h"
struct matcher const matchers[] = {
{ "fgrep", Fcompile, Fexecute },
diff --git a/src/gsearch.c b/src/gsearch.c
index 7156809..b71d3b7 100644
--- a/src/gsearch.c
+++ b/src/gsearch.c
@@ -1,6 +1,5 @@
-#include "dfasearch.c"
-#include "pcresearch.c"
-#include "kwsearch.c"
+#include <config.h>
+#include "search.h"
static void
Gcompile (char const *pattern, size_t size)
diff --git a/src/kwsearch.c b/src/kwsearch.c
index 245ccf0..2f8e7b7 100644
--- a/src/kwsearch.c
+++ b/src/kwsearch.c
@@ -29,7 +29,7 @@
any string matching the regexp. */
static kwset_t kwset;
-static void
+void
Fcompile (char const *pattern, size_t size)
{
char const *beg, *end, *lim, *err, *pat;
@@ -74,7 +74,7 @@ Fcompile (char const *pattern, size_t size)
error (EXIT_TROUBLE, 0, "%s", err);
}
-static size_t
+size_t
Fexecute (char const *buf, size_t size, size_t *match_size,
char const *start_ptr)
{
diff --git a/src/pcresearch.c b/src/pcresearch.c
index f09acdc..4dedf24 100644
--- a/src/pcresearch.c
+++ b/src/pcresearch.c
@@ -32,7 +32,7 @@ static pcre *cre;
static pcre_extra *extra;
#endif
-static void
+void
Pcompile (char const *pattern, size_t size)
{
#if !HAVE_LIBPCRE
@@ -99,7 +99,7 @@ Pcompile (char const *pattern, size_t size)
#endif
}
-static size_t
+size_t
Pexecute (char const *buf, size_t size, size_t *match_size,
char const *start_ptr)
{
diff --git a/src/search.h b/src/search.h
index cb3b535..10e4d5c 100644
--- a/src/search.h
+++ b/src/search.h
@@ -37,6 +37,7 @@
#include "kwset.h"
#include "xalloc.h"
+/* searchutils.c */
void kwsinit (kwset_t *);
#ifdef MBS_SUPPORT
@@ -44,4 +45,17 @@ char * mbtolower (const char *, size_t *);
bool is_mb_middle(const char **, const char *, const char *);
#endif
+/* dfasearch.c */
+void GEAcompile (char const *, size_t, reg_syntax_t);
+size_t EGexecute (char const *, size_t, size_t *, char const *);
+
+/* kwsearch.c */
+void Fcompile (char const *, size_t);
+size_t Fexecute (char const *, size_t, size_t *, char const *);
+
+/* pcresearch.c */
+void Pcompile (char const *, size_t);
+size_t Pexecute (char const *, size_t, size_t *, char const *);
+
+
#endif /* GREP_SEARCH_H */
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=86a79b53be729b2d961dd625b9898518b8867b28
commit d50cec2ac8902cc73cef9288671b4f317a68bdf6
Author: Paolo Bonzini <address@hidden>
Date: Thu Mar 18 13:44:28 2010 +0100
grep: libify *search.c
* src/Makefile.am (libsearch_a_SOURCES): Add dfasearch.c, kwsearch.c,
pcresearch.c.
* src/esearch.c, src/fsearch.c, * src/gsearch.c: Only include search.h.
* src/dfasearch.c (GEAcompile, EGexecute): Export.
* src/kwsearch.c (Fcompile, Fexecute): Export.
* src/pcresearch.c (Pcompile, Pexecute): Export.
* src/search.h: Add new exported functions.
diff --git a/.x-sc_require_config_h b/.x-sc_require_config_h
index 9abf3da..c11a39b 100644
--- a/.x-sc_require_config_h
+++ b/.x-sc_require_config_h
@@ -1,5 +1,2 @@
src/egrep.c
src/fgrep.c
-src/esearch.c
-src/fsearch.c
-src/gsearch.c
diff --git a/.x-sc_require_config_h_first b/.x-sc_require_config_h_first
index 9abf3da..c11a39b 100644
--- a/.x-sc_require_config_h_first
+++ b/.x-sc_require_config_h_first
@@ -1,5 +1,2 @@
src/egrep.c
src/fgrep.c
-src/esearch.c
-src/fsearch.c
-src/gsearch.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 7ebc126..6571529 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,7 +25,8 @@ fgrep_SOURCES = fgrep.c fsearch.c
noinst_HEADERS = grep.h dfa.h kwset.h search.h system.h mbsupport.h
noinst_LIBRARIES = libsearch.a
-libsearch_a_SOURCES = kwset.c dfa.c searchutils.c
+libsearch_a_SOURCES = kwset.c dfa.c searchutils.c dfasearch.c kwsearch.c \
+ pcresearch.c
LDADD = $(LIBINTL) libsearch.a ../lib/libgreputils.a
grep_LDADD = $(LDADD) $(PCRE_LIBS)
@@ -34,5 +35,4 @@ INCLUDES = -I$(top_srcdir)/lib -DLOCALEDIR=\"$(localedir)\"
EXTRA_DIST = \
dosbuf.c \
- pcresearch.c dfasearch.c kwsearch.c \
vms_fab.c vms_fab.h
diff --git a/src/dfasearch.c b/src/dfasearch.c
index 6a9137a..996effd 100644
--- a/src/dfasearch.c
+++ b/src/dfasearch.c
@@ -110,8 +110,7 @@ kwsmusts (void)
}
}
-/* No __VA_ARGS__ in C89. So we have to do it this way. */
-static void
+void
GEAcompile (char const *pattern, size_t size, reg_syntax_t syntax_bits)
{
const char *err;
@@ -195,7 +194,7 @@ GEAcompile (char const *pattern, size_t size, reg_syntax_t
syntax_bits)
free(motif);
}
-static size_t
+size_t
EGexecute (char const *buf, size_t size, size_t *match_size,
char const *start_ptr)
{
diff --git a/src/esearch.c b/src/esearch.c
index 933ecc8..647d2cb 100644
--- a/src/esearch.c
+++ b/src/esearch.c
@@ -1,4 +1,5 @@
-#include "dfasearch.c"
+#include <config.h>
+#include "search.h"
static void
Ecompile (char const *pattern, size_t size)
diff --git a/src/fsearch.c b/src/fsearch.c
index b16e769..a524487 100644
--- a/src/fsearch.c
+++ b/src/fsearch.c
@@ -1,4 +1,5 @@
-#include "kwsearch.c"
+#include <config.h>
+#include "search.h"
struct matcher const matchers[] = {
{ "fgrep", Fcompile, Fexecute },
diff --git a/src/gsearch.c b/src/gsearch.c
index 7156809..b71d3b7 100644
--- a/src/gsearch.c
+++ b/src/gsearch.c
@@ -1,6 +1,5 @@
-#include "dfasearch.c"
-#include "pcresearch.c"
-#include "kwsearch.c"
+#include <config.h>
+#include "search.h"
static void
Gcompile (char const *pattern, size_t size)
diff --git a/src/kwsearch.c b/src/kwsearch.c
index 245ccf0..2f8e7b7 100644
--- a/src/kwsearch.c
+++ b/src/kwsearch.c
@@ -29,7 +29,7 @@
any string matching the regexp. */
static kwset_t kwset;
-static void
+void
Fcompile (char const *pattern, size_t size)
{
char const *beg, *end, *lim, *err, *pat;
@@ -74,7 +74,7 @@ Fcompile (char const *pattern, size_t size)
error (EXIT_TROUBLE, 0, "%s", err);
}
-static size_t
+size_t
Fexecute (char const *buf, size_t size, size_t *match_size,
char const *start_ptr)
{
diff --git a/src/pcresearch.c b/src/pcresearch.c
index f09acdc..4dedf24 100644
--- a/src/pcresearch.c
+++ b/src/pcresearch.c
@@ -32,7 +32,7 @@ static pcre *cre;
static pcre_extra *extra;
#endif
-static void
+void
Pcompile (char const *pattern, size_t size)
{
#if !HAVE_LIBPCRE
@@ -99,7 +99,7 @@ Pcompile (char const *pattern, size_t size)
#endif
}
-static size_t
+size_t
Pexecute (char const *buf, size_t size, size_t *match_size,
char const *start_ptr)
{
diff --git a/src/search.h b/src/search.h
index cb3b535..10e4d5c 100644
--- a/src/search.h
+++ b/src/search.h
@@ -37,6 +37,7 @@
#include "kwset.h"
#include "xalloc.h"
+/* searchutils.c */
void kwsinit (kwset_t *);
#ifdef MBS_SUPPORT
@@ -44,4 +45,17 @@ char * mbtolower (const char *, size_t *);
bool is_mb_middle(const char **, const char *, const char *);
#endif
+/* dfasearch.c */
+void GEAcompile (char const *, size_t, reg_syntax_t);
+size_t EGexecute (char const *, size_t, size_t *, char const *);
+
+/* kwsearch.c */
+void Fcompile (char const *, size_t);
+size_t Fexecute (char const *, size_t, size_t *, char const *);
+
+/* pcresearch.c */
+void Pcompile (char const *, size_t);
+size_t Pexecute (char const *, size_t, size_t *, char const *);
+
+
#endif /* GREP_SEARCH_H */
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=3a5cff100bb294e3a7008ee7f2d323bac711607f
commit d50cec2ac8902cc73cef9288671b4f317a68bdf6
Author: Paolo Bonzini <address@hidden>
Date: Thu Mar 18 13:44:28 2010 +0100
grep: libify *search.c
* src/Makefile.am (libsearch_a_SOURCES): Add dfasearch.c, kwsearch.c,
pcresearch.c.
* src/esearch.c, src/fsearch.c, * src/gsearch.c: Only include search.h.
* src/dfasearch.c (GEAcompile, EGexecute): Export.
* src/kwsearch.c (Fcompile, Fexecute): Export.
* src/pcresearch.c (Pcompile, Pexecute): Export.
* src/search.h: Add new exported functions.
diff --git a/.x-sc_require_config_h b/.x-sc_require_config_h
index 9abf3da..c11a39b 100644
--- a/.x-sc_require_config_h
+++ b/.x-sc_require_config_h
@@ -1,5 +1,2 @@
src/egrep.c
src/fgrep.c
-src/esearch.c
-src/fsearch.c
-src/gsearch.c
diff --git a/.x-sc_require_config_h_first b/.x-sc_require_config_h_first
index 9abf3da..c11a39b 100644
--- a/.x-sc_require_config_h_first
+++ b/.x-sc_require_config_h_first
@@ -1,5 +1,2 @@
src/egrep.c
src/fgrep.c
-src/esearch.c
-src/fsearch.c
-src/gsearch.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 7ebc126..6571529 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,7 +25,8 @@ fgrep_SOURCES = fgrep.c fsearch.c
noinst_HEADERS = grep.h dfa.h kwset.h search.h system.h mbsupport.h
noinst_LIBRARIES = libsearch.a
-libsearch_a_SOURCES = kwset.c dfa.c searchutils.c
+libsearch_a_SOURCES = kwset.c dfa.c searchutils.c dfasearch.c kwsearch.c \
+ pcresearch.c
LDADD = $(LIBINTL) libsearch.a ../lib/libgreputils.a
grep_LDADD = $(LDADD) $(PCRE_LIBS)
@@ -34,5 +35,4 @@ INCLUDES = -I$(top_srcdir)/lib -DLOCALEDIR=\"$(localedir)\"
EXTRA_DIST = \
dosbuf.c \
- pcresearch.c dfasearch.c kwsearch.c \
vms_fab.c vms_fab.h
diff --git a/src/dfasearch.c b/src/dfasearch.c
index 6a9137a..996effd 100644
--- a/src/dfasearch.c
+++ b/src/dfasearch.c
@@ -110,8 +110,7 @@ kwsmusts (void)
}
}
-/* No __VA_ARGS__ in C89. So we have to do it this way. */
-static void
+void
GEAcompile (char const *pattern, size_t size, reg_syntax_t syntax_bits)
{
const char *err;
@@ -195,7 +194,7 @@ GEAcompile (char const *pattern, size_t size, reg_syntax_t
syntax_bits)
free(motif);
}
-static size_t
+size_t
EGexecute (char const *buf, size_t size, size_t *match_size,
char const *start_ptr)
{
diff --git a/src/esearch.c b/src/esearch.c
index 933ecc8..647d2cb 100644
--- a/src/esearch.c
+++ b/src/esearch.c
@@ -1,4 +1,5 @@
-#include "dfasearch.c"
+#include <config.h>
+#include "search.h"
static void
Ecompile (char const *pattern, size_t size)
diff --git a/src/fsearch.c b/src/fsearch.c
index b16e769..a524487 100644
--- a/src/fsearch.c
+++ b/src/fsearch.c
@@ -1,4 +1,5 @@
-#include "kwsearch.c"
+#include <config.h>
+#include "search.h"
struct matcher const matchers[] = {
{ "fgrep", Fcompile, Fexecute },
diff --git a/src/gsearch.c b/src/gsearch.c
index 7156809..b71d3b7 100644
--- a/src/gsearch.c
+++ b/src/gsearch.c
@@ -1,6 +1,5 @@
-#include "dfasearch.c"
-#include "pcresearch.c"
-#include "kwsearch.c"
+#include <config.h>
+#include "search.h"
static void
Gcompile (char const *pattern, size_t size)
diff --git a/src/kwsearch.c b/src/kwsearch.c
index 245ccf0..2f8e7b7 100644
--- a/src/kwsearch.c
+++ b/src/kwsearch.c
@@ -29,7 +29,7 @@
any string matching the regexp. */
static kwset_t kwset;
-static void
+void
Fcompile (char const *pattern, size_t size)
{
char const *beg, *end, *lim, *err, *pat;
@@ -74,7 +74,7 @@ Fcompile (char const *pattern, size_t size)
error (EXIT_TROUBLE, 0, "%s", err);
}
-static size_t
+size_t
Fexecute (char const *buf, size_t size, size_t *match_size,
char const *start_ptr)
{
diff --git a/src/pcresearch.c b/src/pcresearch.c
index f09acdc..4dedf24 100644
--- a/src/pcresearch.c
+++ b/src/pcresearch.c
@@ -32,7 +32,7 @@ static pcre *cre;
static pcre_extra *extra;
#endif
-static void
+void
Pcompile (char const *pattern, size_t size)
{
#if !HAVE_LIBPCRE
@@ -99,7 +99,7 @@ Pcompile (char const *pattern, size_t size)
#endif
}
-static size_t
+size_t
Pexecute (char const *buf, size_t size, size_t *match_size,
char const *start_ptr)
{
diff --git a/src/search.h b/src/search.h
index cb3b535..10e4d5c 100644
--- a/src/search.h
+++ b/src/search.h
@@ -37,6 +37,7 @@
#include "kwset.h"
#include "xalloc.h"
+/* searchutils.c */
void kwsinit (kwset_t *);
#ifdef MBS_SUPPORT
@@ -44,4 +45,17 @@ char * mbtolower (const char *, size_t *);
bool is_mb_middle(const char **, const char *, const char *);
#endif
+/* dfasearch.c */
+void GEAcompile (char const *, size_t, reg_syntax_t);
+size_t EGexecute (char const *, size_t, size_t *, char const *);
+
+/* kwsearch.c */
+void Fcompile (char const *, size_t);
+size_t Fexecute (char const *, size_t, size_t *, char const *);
+
+/* pcresearch.c */
+void Pcompile (char const *, size_t);
+size_t Pexecute (char const *, size_t, size_t *, char const *);
+
+
#endif /* GREP_SEARCH_H */
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=637295fa65a4967546ac25f4f00020c14cf5379c
commit d50cec2ac8902cc73cef9288671b4f317a68bdf6
Author: Paolo Bonzini <address@hidden>
Date: Thu Mar 18 13:44:28 2010 +0100
grep: libify *search.c
* src/Makefile.am (libsearch_a_SOURCES): Add dfasearch.c, kwsearch.c,
pcresearch.c.
* src/esearch.c, src/fsearch.c, * src/gsearch.c: Only include search.h.
* src/dfasearch.c (GEAcompile, EGexecute): Export.
* src/kwsearch.c (Fcompile, Fexecute): Export.
* src/pcresearch.c (Pcompile, Pexecute): Export.
* src/search.h: Add new exported functions.
diff --git a/.x-sc_require_config_h b/.x-sc_require_config_h
index 9abf3da..c11a39b 100644
--- a/.x-sc_require_config_h
+++ b/.x-sc_require_config_h
@@ -1,5 +1,2 @@
src/egrep.c
src/fgrep.c
-src/esearch.c
-src/fsearch.c
-src/gsearch.c
diff --git a/.x-sc_require_config_h_first b/.x-sc_require_config_h_first
index 9abf3da..c11a39b 100644
--- a/.x-sc_require_config_h_first
+++ b/.x-sc_require_config_h_first
@@ -1,5 +1,2 @@
src/egrep.c
src/fgrep.c
-src/esearch.c
-src/fsearch.c
-src/gsearch.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 7ebc126..6571529 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,7 +25,8 @@ fgrep_SOURCES = fgrep.c fsearch.c
noinst_HEADERS = grep.h dfa.h kwset.h search.h system.h mbsupport.h
noinst_LIBRARIES = libsearch.a
-libsearch_a_SOURCES = kwset.c dfa.c searchutils.c
+libsearch_a_SOURCES = kwset.c dfa.c searchutils.c dfasearch.c kwsearch.c \
+ pcresearch.c
LDADD = $(LIBINTL) libsearch.a ../lib/libgreputils.a
grep_LDADD = $(LDADD) $(PCRE_LIBS)
@@ -34,5 +35,4 @@ INCLUDES = -I$(top_srcdir)/lib -DLOCALEDIR=\"$(localedir)\"
EXTRA_DIST = \
dosbuf.c \
- pcresearch.c dfasearch.c kwsearch.c \
vms_fab.c vms_fab.h
diff --git a/src/dfasearch.c b/src/dfasearch.c
index 6a9137a..996effd 100644
--- a/src/dfasearch.c
+++ b/src/dfasearch.c
@@ -110,8 +110,7 @@ kwsmusts (void)
}
}
-/* No __VA_ARGS__ in C89. So we have to do it this way. */
-static void
+void
GEAcompile (char const *pattern, size_t size, reg_syntax_t syntax_bits)
{
const char *err;
@@ -195,7 +194,7 @@ GEAcompile (char const *pattern, size_t size, reg_syntax_t
syntax_bits)
free(motif);
}
-static size_t
+size_t
EGexecute (char const *buf, size_t size, size_t *match_size,
char const *start_ptr)
{
diff --git a/src/esearch.c b/src/esearch.c
index 933ecc8..647d2cb 100644
--- a/src/esearch.c
+++ b/src/esearch.c
@@ -1,4 +1,5 @@
-#include "dfasearch.c"
+#include <config.h>
+#include "search.h"
static void
Ecompile (char const *pattern, size_t size)
diff --git a/src/fsearch.c b/src/fsearch.c
index b16e769..a524487 100644
--- a/src/fsearch.c
+++ b/src/fsearch.c
@@ -1,4 +1,5 @@
-#include "kwsearch.c"
+#include <config.h>
+#include "search.h"
struct matcher const matchers[] = {
{ "fgrep", Fcompile, Fexecute },
diff --git a/src/gsearch.c b/src/gsearch.c
index 7156809..b71d3b7 100644
--- a/src/gsearch.c
+++ b/src/gsearch.c
@@ -1,6 +1,5 @@
-#include "dfasearch.c"
-#include "pcresearch.c"
-#include "kwsearch.c"
+#include <config.h>
+#include "search.h"
static void
Gcompile (char const *pattern, size_t size)
diff --git a/src/kwsearch.c b/src/kwsearch.c
index 245ccf0..2f8e7b7 100644
--- a/src/kwsearch.c
+++ b/src/kwsearch.c
@@ -29,7 +29,7 @@
any string matching the regexp. */
static kwset_t kwset;
-static void
+void
Fcompile (char const *pattern, size_t size)
{
char const *beg, *end, *lim, *err, *pat;
@@ -74,7 +74,7 @@ Fcompile (char const *pattern, size_t size)
error (EXIT_TROUBLE, 0, "%s", err);
}
-static size_t
+size_t
Fexecute (char const *buf, size_t size, size_t *match_size,
char const *start_ptr)
{
diff --git a/src/pcresearch.c b/src/pcresearch.c
index f09acdc..4dedf24 100644
--- a/src/pcresearch.c
+++ b/src/pcresearch.c
@@ -32,7 +32,7 @@ static pcre *cre;
static pcre_extra *extra;
#endif
-static void
+void
Pcompile (char const *pattern, size_t size)
{
#if !HAVE_LIBPCRE
@@ -99,7 +99,7 @@ Pcompile (char const *pattern, size_t size)
#endif
}
-static size_t
+size_t
Pexecute (char const *buf, size_t size, size_t *match_size,
char const *start_ptr)
{
diff --git a/src/search.h b/src/search.h
index cb3b535..10e4d5c 100644
--- a/src/search.h
+++ b/src/search.h
@@ -37,6 +37,7 @@
#include "kwset.h"
#include "xalloc.h"
+/* searchutils.c */
void kwsinit (kwset_t *);
#ifdef MBS_SUPPORT
@@ -44,4 +45,17 @@ char * mbtolower (const char *, size_t *);
bool is_mb_middle(const char **, const char *, const char *);
#endif
+/* dfasearch.c */
+void GEAcompile (char const *, size_t, reg_syntax_t);
+size_t EGexecute (char const *, size_t, size_t *, char const *);
+
+/* kwsearch.c */
+void Fcompile (char const *, size_t);
+size_t Fexecute (char const *, size_t, size_t *, char const *);
+
+/* pcresearch.c */
+void Pcompile (char const *, size_t);
+size_t Pexecute (char const *, size_t, size_t *, char const *);
+
+
#endif /* GREP_SEARCH_H */
-----------------------------------------------------------------------
Summary of changes:
.x-sc_require_config_h | 2 -
.x-sc_require_config_h_first | 2 -
po/POTFILES.in | 3 +-
src/Makefile.am | 16 +-
src/dfasearch.c | 388 +++++++++++++++++++
src/esearch.c | 16 +-
src/fsearch.c | 10 +-
src/getpagesize.h | 61 ---
src/grep.c | 22 +-
src/grep.h | 33 +--
src/gsearch.c | 32 ++
src/kwsearch.c | 162 ++++++++
src/pcresearch.c | 178 +++++++++
src/search.c | 860 ------------------------------------------
src/search.h | 61 +++
src/searchutils.c | 141 +++++++
16 files changed, 1011 insertions(+), 976 deletions(-)
create mode 100644 src/dfasearch.c
delete mode 100644 src/getpagesize.h
create mode 100644 src/gsearch.c
create mode 100644 src/kwsearch.c
create mode 100644 src/pcresearch.c
delete mode 100644 src/search.c
create mode 100644 src/search.h
create mode 100644 src/searchutils.c
hooks/post-receive
--
grep
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- grep branch, master, updated. v2.5.4-209-gd50cec2,
Paolo Bonzini <=