[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
grep branch, master, updated. v2.20-46-gf6de00f
|
From: |
Paul Eggert |
|
Subject: |
grep branch, master, updated. v2.20-46-gf6de00f |
|
Date: |
Thu, 18 Sep 2014 03:38:10 +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 f6de00f6cec3831b8f334de7dbd1b59115627457 (commit)
via 1b76ead152e0a14b3c4b8469d74f44dad60617ae (commit)
via d795d6d194a594792b2a5bb35527a84a484ebeea (commit)
via 9fa500407137f49f6edc3c6b4ee6c7096f0190c5 (commit)
via 3688f2f9cc0868dd7b828d11c8ba030400a5b2c3 (commit)
via 8cc20c82a747460991305b0d8d72faf6830298f4 (commit)
via 000737024019deb7b59a14f336ded508bd271352 (commit)
via 543fb3e3bc68eb689c91f5f68c9e25d3f703260b (commit)
from 9ea9254ea58456b84ed2f0c1481ca91cdd325bf7 (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=f6de00f6cec3831b8f334de7dbd1b59115627457
commit f6de00f6cec3831b8f334de7dbd1b59115627457
Author: Paul Eggert <address@hidden>
Date: Wed Sep 17 12:53:17 2014 -0700
grep: speed up processing of holes before EOF on Solaris
* src/grep.c (fillbuf): If SEEK_DATA fails with errno == ENXIO,
skip over the hole at EOF.
diff --git a/src/grep.c b/src/grep.c
index a08fa41..35d3358 100644
--- a/src/grep.c
+++ b/src/grep.c
@@ -720,7 +720,12 @@ fillbuf (size_t save, struct stat const *st)
if (SEEK_DATA != SEEK_SET && !seek_data_failed)
{
+ /* Solaris SEEK_DATA fails with errno == ENXIO in a hole at EOF. */
off_t data_start = lseek (bufdesc, bufoffset, SEEK_DATA);
+ if (data_start < 0 && errno == ENXIO
+ && usable_st_size (st) && bufoffset < st->st_size)
+ data_start = lseek (bufdesc, 0, SEEK_END);
+
if (data_start < 0)
seek_data_failed = true;
else
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=1b76ead152e0a14b3c4b8469d74f44dad60617ae
commit f6de00f6cec3831b8f334de7dbd1b59115627457
Author: Paul Eggert <address@hidden>
Date: Wed Sep 17 12:53:17 2014 -0700
grep: speed up processing of holes before EOF on Solaris
* src/grep.c (fillbuf): If SEEK_DATA fails with errno == ENXIO,
skip over the hole at EOF.
diff --git a/src/grep.c b/src/grep.c
index a08fa41..35d3358 100644
--- a/src/grep.c
+++ b/src/grep.c
@@ -720,7 +720,12 @@ fillbuf (size_t save, struct stat const *st)
if (SEEK_DATA != SEEK_SET && !seek_data_failed)
{
+ /* Solaris SEEK_DATA fails with errno == ENXIO in a hole at EOF. */
off_t data_start = lseek (bufdesc, bufoffset, SEEK_DATA);
+ if (data_start < 0 && errno == ENXIO
+ && usable_st_size (st) && bufoffset < st->st_size)
+ data_start = lseek (bufdesc, 0, SEEK_END);
+
if (data_start < 0)
seek_data_failed = true;
else
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=d795d6d194a594792b2a5bb35527a84a484ebeea
commit f6de00f6cec3831b8f334de7dbd1b59115627457
Author: Paul Eggert <address@hidden>
Date: Wed Sep 17 12:53:17 2014 -0700
grep: speed up processing of holes before EOF on Solaris
* src/grep.c (fillbuf): If SEEK_DATA fails with errno == ENXIO,
skip over the hole at EOF.
diff --git a/src/grep.c b/src/grep.c
index a08fa41..35d3358 100644
--- a/src/grep.c
+++ b/src/grep.c
@@ -720,7 +720,12 @@ fillbuf (size_t save, struct stat const *st)
if (SEEK_DATA != SEEK_SET && !seek_data_failed)
{
+ /* Solaris SEEK_DATA fails with errno == ENXIO in a hole at EOF. */
off_t data_start = lseek (bufdesc, bufoffset, SEEK_DATA);
+ if (data_start < 0 && errno == ENXIO
+ && usable_st_size (st) && bufoffset < st->st_size)
+ data_start = lseek (bufdesc, 0, SEEK_END);
+
if (data_start < 0)
seek_data_failed = true;
else
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=9fa500407137f49f6edc3c6b4ee6c7096f0190c5
commit f6de00f6cec3831b8f334de7dbd1b59115627457
Author: Paul Eggert <address@hidden>
Date: Wed Sep 17 12:53:17 2014 -0700
grep: speed up processing of holes before EOF on Solaris
* src/grep.c (fillbuf): If SEEK_DATA fails with errno == ENXIO,
skip over the hole at EOF.
diff --git a/src/grep.c b/src/grep.c
index a08fa41..35d3358 100644
--- a/src/grep.c
+++ b/src/grep.c
@@ -720,7 +720,12 @@ fillbuf (size_t save, struct stat const *st)
if (SEEK_DATA != SEEK_SET && !seek_data_failed)
{
+ /* Solaris SEEK_DATA fails with errno == ENXIO in a hole at EOF. */
off_t data_start = lseek (bufdesc, bufoffset, SEEK_DATA);
+ if (data_start < 0 && errno == ENXIO
+ && usable_st_size (st) && bufoffset < st->st_size)
+ data_start = lseek (bufdesc, 0, SEEK_END);
+
if (data_start < 0)
seek_data_failed = true;
else
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=3688f2f9cc0868dd7b828d11c8ba030400a5b2c3
commit f6de00f6cec3831b8f334de7dbd1b59115627457
Author: Paul Eggert <address@hidden>
Date: Wed Sep 17 12:53:17 2014 -0700
grep: speed up processing of holes before EOF on Solaris
* src/grep.c (fillbuf): If SEEK_DATA fails with errno == ENXIO,
skip over the hole at EOF.
diff --git a/src/grep.c b/src/grep.c
index a08fa41..35d3358 100644
--- a/src/grep.c
+++ b/src/grep.c
@@ -720,7 +720,12 @@ fillbuf (size_t save, struct stat const *st)
if (SEEK_DATA != SEEK_SET && !seek_data_failed)
{
+ /* Solaris SEEK_DATA fails with errno == ENXIO in a hole at EOF. */
off_t data_start = lseek (bufdesc, bufoffset, SEEK_DATA);
+ if (data_start < 0 && errno == ENXIO
+ && usable_st_size (st) && bufoffset < st->st_size)
+ data_start = lseek (bufdesc, 0, SEEK_END);
+
if (data_start < 0)
seek_data_failed = true;
else
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=8cc20c82a747460991305b0d8d72faf6830298f4
commit f6de00f6cec3831b8f334de7dbd1b59115627457
Author: Paul Eggert <address@hidden>
Date: Wed Sep 17 12:53:17 2014 -0700
grep: speed up processing of holes before EOF on Solaris
* src/grep.c (fillbuf): If SEEK_DATA fails with errno == ENXIO,
skip over the hole at EOF.
diff --git a/src/grep.c b/src/grep.c
index a08fa41..35d3358 100644
--- a/src/grep.c
+++ b/src/grep.c
@@ -720,7 +720,12 @@ fillbuf (size_t save, struct stat const *st)
if (SEEK_DATA != SEEK_SET && !seek_data_failed)
{
+ /* Solaris SEEK_DATA fails with errno == ENXIO in a hole at EOF. */
off_t data_start = lseek (bufdesc, bufoffset, SEEK_DATA);
+ if (data_start < 0 && errno == ENXIO
+ && usable_st_size (st) && bufoffset < st->st_size)
+ data_start = lseek (bufdesc, 0, SEEK_END);
+
if (data_start < 0)
seek_data_failed = true;
else
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=000737024019deb7b59a14f336ded508bd271352
commit f6de00f6cec3831b8f334de7dbd1b59115627457
Author: Paul Eggert <address@hidden>
Date: Wed Sep 17 12:53:17 2014 -0700
grep: speed up processing of holes before EOF on Solaris
* src/grep.c (fillbuf): If SEEK_DATA fails with errno == ENXIO,
skip over the hole at EOF.
diff --git a/src/grep.c b/src/grep.c
index a08fa41..35d3358 100644
--- a/src/grep.c
+++ b/src/grep.c
@@ -720,7 +720,12 @@ fillbuf (size_t save, struct stat const *st)
if (SEEK_DATA != SEEK_SET && !seek_data_failed)
{
+ /* Solaris SEEK_DATA fails with errno == ENXIO in a hole at EOF. */
off_t data_start = lseek (bufdesc, bufoffset, SEEK_DATA);
+ if (data_start < 0 && errno == ENXIO
+ && usable_st_size (st) && bufoffset < st->st_size)
+ data_start = lseek (bufdesc, 0, SEEK_END);
+
if (data_start < 0)
seek_data_failed = true;
else
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=543fb3e3bc68eb689c91f5f68c9e25d3f703260b
commit f6de00f6cec3831b8f334de7dbd1b59115627457
Author: Paul Eggert <address@hidden>
Date: Wed Sep 17 12:53:17 2014 -0700
grep: speed up processing of holes before EOF on Solaris
* src/grep.c (fillbuf): If SEEK_DATA fails with errno == ENXIO,
skip over the hole at EOF.
diff --git a/src/grep.c b/src/grep.c
index a08fa41..35d3358 100644
--- a/src/grep.c
+++ b/src/grep.c
@@ -720,7 +720,12 @@ fillbuf (size_t save, struct stat const *st)
if (SEEK_DATA != SEEK_SET && !seek_data_failed)
{
+ /* Solaris SEEK_DATA fails with errno == ENXIO in a hole at EOF. */
off_t data_start = lseek (bufdesc, bufoffset, SEEK_DATA);
+ if (data_start < 0 && errno == ENXIO
+ && usable_st_size (st) && bufoffset < st->st_size)
+ data_start = lseek (bufdesc, 0, SEEK_END);
+
if (data_start < 0)
seek_data_failed = true;
else
-----------------------------------------------------------------------
Summary of changes:
NEWS | 8 ++
doc/grep.texi | 2 +
src/grep.c | 201 ++++++++++++++++++++++++++++++++++++++----------------
src/grep.h | 24 ++++++-
src/pcresearch.c | 126 ++++++++++++++++++++++++++++------
tests/null-byte | 4 +-
tests/pcre-z | 4 +
7 files changed, 287 insertions(+), 82 deletions(-)
hooks/post-receive
--
grep
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- grep branch, master, updated. v2.20-46-gf6de00f,
Paul Eggert <=