grep branch, master, updated. v2.18-41-gdf6da5d

[Paul Eggert]

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  df6da5d40a47abbc6e3451cb9fab7a8c9ede12cc (commit)
      from  d5d7cfaa18fc7573572aa8a5526a3f034fc6f988 (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=df6da5d40a47abbc6e3451cb9fab7a8c9ede12cc


commit df6da5d40a47abbc6e3451cb9fab7a8c9ede12cc
Author: Paul Eggert <address@hidden>
Date:   Fri Mar 28 19:27:00 2014 -0700

    dfa: improve port to freestanding DJGPP
    
    Suggested by Aharon Robbins (Bug#17056).
    * src/dfa.c (setlocale) [!LC_ALL]: Return NULL, not "C",
    reverting part of a recent change.
    (using_simple_locale): Return true if setlocale returns null.

diff --git a/src/dfa.c b/src/dfa.c
index 4ed2189..b22fe97 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -37,7 +37,7 @@
 /* Gawk doesn't use Gnulib, so don't assume that setlocale and
    static_assert are present.  */
 #ifndef LC_ALL
-# define setlocale(category, locale) "C"
+# define setlocale(category, locale) NULL
 #endif
 #ifndef static_assert
 # define static_assert(cond, diagnostic) \
@@ -850,8 +850,9 @@ using_simple_locale (void)
       if (unibyte_c < 0)
         {
           char const *locale = setlocale (LC_ALL, NULL);
-          unibyte_c = (locale && (STREQ (locale, "C")
-                                  || STREQ (locale, "POSIX")));
+          unibyte_c = (!locale
+                       || STREQ (locale, "C")
+                       || STREQ (locale, "POSIX"));
         }
       return unibyte_c;
     }

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

Summary of changes:
 src/dfa.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
grep