diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-09-12 15:34:36 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-09-12 15:34:36 -0700 |
commit | 27853a85edce65afd73c8bb0ca7adf0a4468def3 (patch) | |
tree | c2afb3b465f0d1ed53089e137960ee8ad82e3a7a /compat | |
parent | Merge branch 'jc/forbid-symbolic-ref-d-HEAD' (diff) | |
parent | compat: move strdup(3) replacement to its own file (diff) | |
download | tgif-27853a85edce65afd73c8bb0ca7adf0a4468def3.tar.xz |
Merge branch 'rs/compat-strdup'
* rs/compat-strdup:
compat: move strdup(3) replacement to its own file
Diffstat (limited to 'compat')
-rw-r--r-- | compat/nedmalloc/nedmalloc.c | 16 | ||||
-rw-r--r-- | compat/strdup.c | 11 |
2 files changed, 11 insertions, 16 deletions
diff --git a/compat/nedmalloc/nedmalloc.c b/compat/nedmalloc/nedmalloc.c index 2d4ef59013..1cc31c3502 100644 --- a/compat/nedmalloc/nedmalloc.c +++ b/compat/nedmalloc/nedmalloc.c @@ -948,22 +948,6 @@ void **nedpindependent_comalloc(nedpool *p, size_t elems, size_t *sizes, void ** return ret; } -#ifdef OVERRIDE_STRDUP -/* - * This implementation is purely there to override the libc version, to - * avoid a crash due to allocation and free on different 'heaps'. - */ -char *strdup(const char *s1) -{ - size_t len = strlen(s1) + 1; - char *s2 = malloc(len); - - if (s2) - memcpy(s2, s1, len); - return s2; -} -#endif - #if defined(__cplusplus) } #endif diff --git a/compat/strdup.c b/compat/strdup.c new file mode 100644 index 0000000000..f3fb978eb3 --- /dev/null +++ b/compat/strdup.c @@ -0,0 +1,11 @@ +#include "../git-compat-util.h" + +char *gitstrdup(const char *s1) +{ + size_t len = strlen(s1) + 1; + char *s2 = malloc(len); + + if (s2) + memcpy(s2, s1, len); + return s2; +} |