Add strchrnul()

As suggested by Pierre Habouzit, add strchrnul().  It's a useful GNU
extension and can simplify string parser code.  There are several
places in git that can be converted to strchrnul(); as a trivial
example, this patch introduces its usage to builtin-fetch--tool.c.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Makefile b/Makefile
index 621270f6235306dcdd9c55ac371c90cb5b5effc3..69dcbb227e57c37e93e8daf8610b010df9965613 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -30,6 +30,8 @@ all::
 #
 # Define NO_MEMMEM if you don't have memmem.
 #
 #
 # Define NO_MEMMEM if you don't have memmem.
 #

+# Define NO_STRCHRNUL if you don't have strchrnul.
+#

 # Define NO_STRLCPY if you don't have strlcpy.
 #
 # Define NO_STRTOUMAX if you don't have strtoumax in the C library.
 # Define NO_STRLCPY if you don't have strlcpy.
 #
 # Define NO_STRTOUMAX if you don't have strtoumax in the C library.


@@ -406,6 +408,7 @@ ifeq ($(uname_S),Darwin)
        OLD_ICONV = UnfortunatelyYes
        NO_STRLCPY = YesPlease
        NO_MEMMEM = YesPlease
        OLD_ICONV = UnfortunatelyYes
        NO_STRLCPY = YesPlease
        NO_MEMMEM = YesPlease

+       NO_STRCHRNUL = YesPlease

 endif
 ifeq ($(uname_S),SunOS)
        NEEDS_SOCKET = YesPlease
 endif
 ifeq ($(uname_S),SunOS)
        NEEDS_SOCKET = YesPlease


@@ -413,6 +416,7 @@ ifeq ($(uname_S),SunOS)
        SHELL_PATH = /bin/bash
        NO_STRCASESTR = YesPlease
        NO_MEMMEM = YesPlease
        SHELL_PATH = /bin/bash
        NO_STRCASESTR = YesPlease
        NO_MEMMEM = YesPlease

+       NO_STRCHRNUL = YesPlease

        NO_HSTRERROR = YesPlease
        ifeq ($(uname_R),5.8)
                NEEDS_LIBICONV = YesPlease
        NO_HSTRERROR = YesPlease
        ifeq ($(uname_R),5.8)
                NEEDS_LIBICONV = YesPlease


@@ -438,6 +442,7 @@ ifeq ($(uname_O),Cygwin)
        NO_D_INO_IN_DIRENT = YesPlease
        NO_STRCASESTR = YesPlease
        NO_MEMMEM = YesPlease
        NO_D_INO_IN_DIRENT = YesPlease
        NO_STRCASESTR = YesPlease
        NO_MEMMEM = YesPlease

+       NO_STRCHRNUL = YesPlease

        NO_SYMLINK_HEAD = YesPlease
        NEEDS_LIBICONV = YesPlease
        NO_FAST_WORKING_DIRECTORY = UnfortunatelyYes
        NO_SYMLINK_HEAD = YesPlease
        NEEDS_LIBICONV = YesPlease
        NO_FAST_WORKING_DIRECTORY = UnfortunatelyYes


@@ -452,12 +457,14 @@ endif
 ifeq ($(uname_S),FreeBSD)
        NEEDS_LIBICONV = YesPlease
        NO_MEMMEM = YesPlease
 ifeq ($(uname_S),FreeBSD)
        NEEDS_LIBICONV = YesPlease
        NO_MEMMEM = YesPlease

+       NO_STRCHRNUL = YesPlease

        BASIC_CFLAGS += -I/usr/local/include
        BASIC_LDFLAGS += -L/usr/local/lib
 endif
 ifeq ($(uname_S),OpenBSD)
        NO_STRCASESTR = YesPlease
        NO_MEMMEM = YesPlease
        BASIC_CFLAGS += -I/usr/local/include
        BASIC_LDFLAGS += -L/usr/local/lib
 endif
 ifeq ($(uname_S),OpenBSD)
        NO_STRCASESTR = YesPlease
        NO_MEMMEM = YesPlease

+       NO_STRCHRNUL = YesPlease

        NEEDS_LIBICONV = YesPlease
        BASIC_CFLAGS += -I/usr/local/include
        BASIC_LDFLAGS += -L/usr/local/lib
        NEEDS_LIBICONV = YesPlease
        BASIC_CFLAGS += -I/usr/local/include
        BASIC_LDFLAGS += -L/usr/local/lib


@@ -473,6 +480,7 @@ endif
 ifeq ($(uname_S),AIX)
        NO_STRCASESTR=YesPlease
        NO_MEMMEM = YesPlease
 ifeq ($(uname_S),AIX)
        NO_STRCASESTR=YesPlease
        NO_MEMMEM = YesPlease

+       NO_STRCHRNUL = YesPlease

        NO_STRLCPY = YesPlease
        NEEDS_LIBICONV=YesPlease
 endif
        NO_STRLCPY = YesPlease
        NEEDS_LIBICONV=YesPlease
 endif


@@ -485,6 +493,7 @@ ifeq ($(uname_S),IRIX64)
        NO_SETENV=YesPlease
        NO_STRCASESTR=YesPlease
        NO_MEMMEM = YesPlease
        NO_SETENV=YesPlease
        NO_STRCASESTR=YesPlease
        NO_MEMMEM = YesPlease

+       NO_STRCHRNUL = YesPlease

        NO_STRLCPY = YesPlease
        NO_SOCKADDR_STORAGE=YesPlease
        SHELL_PATH=/usr/gnu/bin/bash
        NO_STRLCPY = YesPlease
        NO_SOCKADDR_STORAGE=YesPlease
        SHELL_PATH=/usr/gnu/bin/bash


@@ -695,6 +704,10 @@ ifdef NO_MEMMEM
        COMPAT_CFLAGS += -DNO_MEMMEM
        COMPAT_OBJS += compat/memmem.o
 endif
        COMPAT_CFLAGS += -DNO_MEMMEM
        COMPAT_OBJS += compat/memmem.o
 endif

+ifdef NO_STRCHRNUL
+       COMPAT_CFLAGS += -DNO_STRCHRNUL
+       COMPAT_OBJS += compat/strchrnul.o
+endif

 
 ifdef THREADED_DELTA_SEARCH
        BASIC_CFLAGS += -DTHREADED_DELTA_SEARCH
 
 ifdef THREADED_DELTA_SEARCH
        BASIC_CFLAGS += -DTHREADED_DELTA_SEARCH

diff --git a/builtin-fetch--tool.c b/builtin-fetch--tool.c
index 6a78517958567e9dee4bfb00236caf5c3d1c3d67..ed60847d9fcd0ad8803c432af8d0bc2dd3567768 100644 (file)
--- a/builtin-fetch--tool.c
+++ b/builtin-fetch--tool.c
@@ -435,9 +435,7 @@ static int pick_rref(int sha1_only, const char *rref, const char *ls_remote_resu
                                cp++;
                        if (!*cp)
                                break;
                                cp++;
                        if (!*cp)
                                break;

-                       np = strchr(cp, '\n');
-                       if (!np)
-                               np = cp + strlen(cp);
+                       np = strchrnul(cp, '\n');

                        if (pass) {
                                lrr_list[i].line = cp;
                                lrr_list[i].name = cp + 41;
                        if (pass) {
                                lrr_list[i].line = cp;
                                lrr_list[i].name = cp + 41;


@@ -461,9 +459,7 @@ static int pick_rref(int sha1_only, const char *rref, const char *ls_remote_resu
                        rref++;
                if (!*rref)
                        break;
                        rref++;
                if (!*rref)
                        break;

-               next = strchr(rref, '\n');
-               if (!next)
-                       next = rref + strlen(rref);
+               next = strchrnul(rref, '\n');

                rreflen = next - rref;
 
                for (i = 0; i < lrr_count; i++) {
                rreflen = next - rref;
 
                for (i = 0; i < lrr_count; i++) {

diff --git a/compat/strchrnul.c b/compat/strchrnul.c
new file mode 100644 (file)
index 0000000..51839fe
--- /dev/null
+++ b/compat/strchrnul.c
@@ -0,0 +1,8 @@
+#include "../git-compat-util.h"
+
+char *gitstrchrnul(const char *s, int c)
+{
+       while (*s && *s != c)
+               s++;
+       return (char *)s;
+}

diff --git a/git-compat-util.h b/git-compat-util.h
index 7b29d1b905c618a50704a7b2c38041f71c942e71..e72654bc408e36512b392e3e5ed3026d79cc141b 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -183,6 +183,11 @@ void *gitmemmem(const void *haystack, size_t haystacklen,
                 const void *needle, size_t needlelen);
 #endif
 
                 const void *needle, size_t needlelen);
 #endif
 

+#ifdef NO_STRCHRNUL
+#define strchrnul gitstrchrnul
+char *gitstrchrnul(const char *s, int c);
+#endif
+

 extern void release_pack_memory(size_t, int);
 
 static inline char* xstrdup(const char *str)
 extern void release_pack_memory(size_t, int);
 
 static inline char* xstrdup(const char *str)