From MAILER-DAEMON Sat Aug 20 16:42:31 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1QusND-00050z-P4
	for mharc-grep-commit@gnu.org; Sat, 20 Aug 2011 16:42:31 -0400
Received: from eggs.gnu.org ([140.186.70.92]:59556)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1QusN9-00050S-So
	for grep-commit@gnu.org; Sat, 20 Aug 2011 16:42:29 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1QusN8-0007XU-BG
	for grep-commit@gnu.org; Sat, 20 Aug 2011 16:42:27 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:56662)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1QusN8-0007XO-9f
	for grep-commit@gnu.org; Sat, 20 Aug 2011 16:42:26 -0400
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1QusN7-0006qA-R1
	for grep-commit@gnu.org; Sat, 20 Aug 2011 20:42:26 +0000
Date: Sat, 20 Aug 2011 20:42:25 +0000
Message-Id: <E1QusN7-0006qA-R1@vcs.savannah.gnu.org>
To: grep-commit@gnu.org
Subject: grep branch, master, updated. v2.9-18-gbb85185
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: f4c4b1b107f014244142e9b8a27208a5f3ac52b5
X-Git-Newrev: bb85185a2b32f4c35f3cf629319ca03088602144
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 20 Aug 2011 20:42:29 -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  bb85185a2b32f4c35f3cf629319ca03088602144 (commit)
       via  b0edb0fc72a8d2c706f4144867b6795b49103f85 (commit)
      from  f4c4b1b107f014244142e9b8a27208a5f3ac52b5 (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=bb85185a2b32f4c35f3cf629319ca03088602144


commit bb85185a2b32f4c35f3cf629319ca03088602144
Author: Jim Meyering <meyering@redhat.com>
Date:   Fri Aug 12 17:57:29 2011 +0200

    maint: clean up and plug a leak-on-OOM
    
    * src/dfa.c (icatalloc): Clean up; use xrealloc in place of malloc
    and realloc; remove conditionals that are unnecessary, now that
    failed allocation results in exit.
    (enlist): Use xrealloc in place of realloc; remove conditional.
    (comsubs): Avoid leak upon failed enlist call.
    (dfamust): Use xmalloc in place of malloc.
    Remove conditionals, now that icpyalloc and icatalloc never return NULL.

diff --git a/src/dfa.c b/src/dfa.c
index b1a5266..76e34a7 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -3643,20 +3643,12 @@ static char *
 icatalloc (char *old, char const *new)
 {
   char *result;
-  size_t oldsize, newsize;
-
-  newsize = (new == NULL) ? 0 : strlen(new);
-  if (old == NULL)
-    oldsize = 0;
-  else if (newsize == 0)
+  size_t oldsize = old == NULL ? 0 : strlen (old);
+  size_t newsize = new == NULL ? 0 : strlen (new);
+  if (newsize == 0)
     return old;
-  else	oldsize = strlen(old);
-  if (old == NULL)
-    result = malloc(newsize + 1);
-  else
-    result = realloc(old, oldsize + newsize + 1);
-  if (result != NULL && new != NULL)
-    strcpy(result + oldsize, new);
+  result = xrealloc (old, oldsize + newsize + 1);
+  strcpy (result + oldsize, new);
   return result;
 }
 
@@ -3764,8 +3756,16 @@ comsubs (char *left, char const *right)
         }
       if (len == 0)
         continue;
-      if ((cpp = enlist(cpp, lcp, len)) == NULL)
-        break;
+      {
+        char **p = enlist (cpp, lcp, len);
+        if (p == NULL)
+          {
+            freelist (cpp);
+            cpp = NULL;
+            break;
+          }
+        cpp = p;
+      }
     }
   return cpp;
 }
@@ -3858,13 +3858,10 @@ dfamust (struct dfa *d)
     mp[i] = must0;
   for (i = 0; i <= d->tindex; ++i)
     {
-      mp[i].in = malloc(sizeof *mp[i].in);
-      mp[i].left = malloc(2);
-      mp[i].right = malloc(2);
-      mp[i].is = malloc(2);
-      if (mp[i].in == NULL || mp[i].left == NULL ||
-          mp[i].right == NULL || mp[i].is == NULL)
-        goto done;
+      mp[i].in = xmalloc(sizeof *mp[i].in);
+      mp[i].left = xmalloc(2);
+      mp[i].right = xmalloc(2);
+      mp[i].is = xmalloc(2);
       mp[i].left[0] = mp[i].right[0] = mp[i].is[0] = '\0';
       mp[i].in[0] = NULL;
     }
@@ -3971,13 +3968,8 @@ dfamust (struct dfa *d)
                 char *tp;
 
                 tp = icpyalloc(lmp->right);
-                if (tp == NULL)
-                  goto done;
                 tp = icatalloc(tp, rmp->left);
-                if (tp == NULL)
-                  goto done;
-                lmp->in = enlist(lmp->in, tp,
-                                 strlen(tp));
+                lmp->in = enlist(lmp->in, tp, strlen(tp));
                 free(tp);
                 if (lmp->in == NULL)
                   goto done;

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=b0edb0fc72a8d2c706f4144867b6795b49103f85


commit bb85185a2b32f4c35f3cf629319ca03088602144
Author: Jim Meyering <meyering@redhat.com>
Date:   Fri Aug 12 17:57:29 2011 +0200

    maint: clean up and plug a leak-on-OOM
    
    * src/dfa.c (icatalloc): Clean up; use xrealloc in place of malloc
    and realloc; remove conditionals that are unnecessary, now that
    failed allocation results in exit.
    (enlist): Use xrealloc in place of realloc; remove conditional.
    (comsubs): Avoid leak upon failed enlist call.
    (dfamust): Use xmalloc in place of malloc.
    Remove conditionals, now that icpyalloc and icatalloc never return NULL.

diff --git a/src/dfa.c b/src/dfa.c
index b1a5266..76e34a7 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -3643,20 +3643,12 @@ static char *
 icatalloc (char *old, char const *new)
 {
   char *result;
-  size_t oldsize, newsize;
-
-  newsize = (new == NULL) ? 0 : strlen(new);
-  if (old == NULL)
-    oldsize = 0;
-  else if (newsize == 0)
+  size_t oldsize = old == NULL ? 0 : strlen (old);
+  size_t newsize = new == NULL ? 0 : strlen (new);
+  if (newsize == 0)
     return old;
-  else	oldsize = strlen(old);
-  if (old == NULL)
-    result = malloc(newsize + 1);
-  else
-    result = realloc(old, oldsize + newsize + 1);
-  if (result != NULL && new != NULL)
-    strcpy(result + oldsize, new);
+  result = xrealloc (old, oldsize + newsize + 1);
+  strcpy (result + oldsize, new);
   return result;
 }
 
@@ -3764,8 +3756,16 @@ comsubs (char *left, char const *right)
         }
       if (len == 0)
         continue;
-      if ((cpp = enlist(cpp, lcp, len)) == NULL)
-        break;
+      {
+        char **p = enlist (cpp, lcp, len);
+        if (p == NULL)
+          {
+            freelist (cpp);
+            cpp = NULL;
+            break;
+          }
+        cpp = p;
+      }
     }
   return cpp;
 }
@@ -3858,13 +3858,10 @@ dfamust (struct dfa *d)
     mp[i] = must0;
   for (i = 0; i <= d->tindex; ++i)
     {
-      mp[i].in = malloc(sizeof *mp[i].in);
-      mp[i].left = malloc(2);
-      mp[i].right = malloc(2);
-      mp[i].is = malloc(2);
-      if (mp[i].in == NULL || mp[i].left == NULL ||
-          mp[i].right == NULL || mp[i].is == NULL)
-        goto done;
+      mp[i].in = xmalloc(sizeof *mp[i].in);
+      mp[i].left = xmalloc(2);
+      mp[i].right = xmalloc(2);
+      mp[i].is = xmalloc(2);
       mp[i].left[0] = mp[i].right[0] = mp[i].is[0] = '\0';
       mp[i].in[0] = NULL;
     }
@@ -3971,13 +3968,8 @@ dfamust (struct dfa *d)
                 char *tp;
 
                 tp = icpyalloc(lmp->right);
-                if (tp == NULL)
-                  goto done;
                 tp = icatalloc(tp, rmp->left);
-                if (tp == NULL)
-                  goto done;
-                lmp->in = enlist(lmp->in, tp,
-                                 strlen(tp));
+                lmp->in = enlist(lmp->in, tp, strlen(tp));
                 free(tp);
                 if (lmp->in == NULL)
                   goto done;

-----------------------------------------------------------------------

Summary of changes:
 src/dfa.c  |   48 ++++++++++++++++++++----------------------------
 src/main.c |    2 +-
 2 files changed, 21 insertions(+), 29 deletions(-)


hooks/post-receive
-- 
grep


From MAILER-DAEMON Sat Aug 20 16:48:00 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1QusSW-0005sX-RE
	for mharc-grep-commit@gnu.org; Sat, 20 Aug 2011 16:48:00 -0400
Received: from eggs.gnu.org ([140.186.70.92]:52308)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1QusSS-0005mi-HY
	for grep-commit@gnu.org; Sat, 20 Aug 2011 16:47:57 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1QusSQ-0008Id-Si
	for grep-commit@gnu.org; Sat, 20 Aug 2011 16:47:56 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:60807)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1QusSQ-0008IZ-Q3
	for grep-commit@gnu.org; Sat, 20 Aug 2011 16:47:54 -0400
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1QusSQ-0007KB-MJ
	for grep-commit@gnu.org; Sat, 20 Aug 2011 20:47:54 +0000
Date: Sat, 20 Aug 2011 20:47:54 +0000
Message-Id: <E1QusSQ-0007KB-MJ@vcs.savannah.gnu.org>
To: grep-commit@gnu.org
Subject: grep branch, master, updated. v2.9-19-g79d2c07
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: bb85185a2b32f4c35f3cf629319ca03088602144
X-Git-Newrev: 79d2c07e90cfe9e1f9327c90777811ed19e923ad
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 20 Aug 2011 20:47:58 -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  79d2c07e90cfe9e1f9327c90777811ed19e923ad (commit)
      from  bb85185a2b32f4c35f3cf629319ca03088602144 (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=79d2c07e90cfe9e1f9327c90777811ed19e923ad


commit 79d2c07e90cfe9e1f9327c90777811ed19e923ad
Author: Jim Meyering <meyering@redhat.com>
Date:   Sat Aug 20 22:44:20 2011 +0200

    build: use largefile module and update to latest gnulib
    
    * configure.ac: Remove AC_SYS_LARGEFILE, subsumed by ...
    * bootstrap.conf (gnulib_modules): ...this.  Use largefile module.
    * gnulib: Update to latest.

diff --git a/bootstrap.conf b/bootstrap.conf
index 66c239e..c3b7158 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -43,6 +43,7 @@ ignore-value
 intprops
 isblank
 isdir
+largefile
 lseek
 locale
 malloc-gnu
diff --git a/build-aux/.gitignore b/build-aux/.gitignore
index a561ced..78cf860 100644
--- a/build-aux/.gitignore
+++ b/build-aux/.gitignore
@@ -15,6 +15,7 @@
 /link-warning.h
 /mdate-sh
 /missing
+/snippet
 /texinfo.tex
 /unused-parameter.h
 /update-copyright
diff --git a/configure.ac b/configure.ac
index aca529a..2e13064 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,7 +82,6 @@ gl_EARLY
 AC_PROG_RANLIB
 
 dnl Checks for typedefs, structures, and compiler characteristics.
-AC_SYS_LARGEFILE
 AC_TYPE_SIZE_T
 AC_C_CONST
 gl_INIT
diff --git a/gnulib b/gnulib
index 0f247f9..372ef2a 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 0f247f994ecf88c40563c2d264536a1aa7634b33
+Subproject commit 372ef2a0e94ec6ee85b5fc4bab763154ec11420d

-----------------------------------------------------------------------

Summary of changes:
 bootstrap.conf       |    1 +
 build-aux/.gitignore |    1 +
 configure.ac         |    1 -
 gnulib               |    2 +-
 4 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
grep


From MAILER-DAEMON Wed Aug 31 16:21:01 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1QyrHR-0001n8-To
	for mharc-grep-commit@gnu.org; Wed, 31 Aug 2011 16:21:01 -0400
Received: from eggs.gnu.org ([140.186.70.92]:36016)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1QyrHP-0001mB-BP
	for grep-commit@gnu.org; Wed, 31 Aug 2011 16:21:00 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1QyrHN-00069Q-W4
	for grep-commit@gnu.org; Wed, 31 Aug 2011 16:20:59 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:42274)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1QyrHN-00069M-TG
	for grep-commit@gnu.org; Wed, 31 Aug 2011 16:20:57 -0400
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1QyrHN-0007e0-Dq
	for grep-commit@gnu.org; Wed, 31 Aug 2011 20:20:57 +0000
Date: Wed, 31 Aug 2011 20:20:57 +0000
Message-Id: <E1QyrHN-0007e0-Dq@vcs.savannah.gnu.org>
To: grep-commit@gnu.org
Subject: grep branch, master, updated. v2.9-20-ga7e745b
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 79d2c07e90cfe9e1f9327c90777811ed19e923ad
X-Git-Newrev: a7e745b9d40e3c94cc5527a257c37f334fa0c9d0
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 31 Aug 2011 20:21:00 -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  a7e745b9d40e3c94cc5527a257c37f334fa0c9d0 (commit)
      from  79d2c07e90cfe9e1f9327c90777811ed19e923ad (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=a7e745b9d40e3c94cc5527a257c37f334fa0c9d0


commit a7e745b9d40e3c94cc5527a257c37f334fa0c9d0
Author: Matthew Burgess <matthew@linuxfromscratch.org>
Date:   Wed Aug 31 21:18:54 2011 +0200

    tests: remove debug code that would cp to /t
    
    * tests/unibyte-bracket-expr: Remove debug artifact introduced
    by 2011-06-02 commit de5f7000, "tests: exercise a uni-byte [...]
    bug: requires ru_RU.KOI8-R".  [bug introduced in grep-2.9]

diff --git a/tests/unibyte-bracket-expr b/tests/unibyte-bracket-expr
index a0b51dd..45ad5d9 100755
--- a/tests/unibyte-bracket-expr
+++ b/tests/unibyte-bracket-expr
@@ -32,7 +32,6 @@ for i in 8 9 a b c d e f; do
     in=in-$i$j
     b=$(printf "\\x$i$j")
     echo "$b" > $in || framework_failure_
-    cp $in /t
     grep "[$b]" $in > out || fail=1
     compare out $in || fail=1
   done

-----------------------------------------------------------------------

Summary of changes:
 tests/unibyte-bracket-expr |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
grep


