diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-12-11 16:49:45 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-12-11 16:49:45 -0800 |
| commit | a9572072f0ab0ac97e64b0dc01254a3ad95befe1 (patch) | |
| tree | 2375e3b4aea11444375f9f587c8ca4cd8d22d6d0 /compat | |
| parent | GIT 0.99.9l aka 1.0rc4 (diff) | |
| parent | t/t6022: a new test for renaming merge. (diff) | |
| download | git-1.0rc5.tar.gz git-1.0rc5.zip | |
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'compat')
| -rw-r--r-- | compat/mmap.c | 2 | ||||
| -rw-r--r-- | compat/setenv.c | 8 | ||||
| -rw-r--r-- | compat/strcasestr.c | 3 |
3 files changed, 8 insertions, 5 deletions
diff --git a/compat/mmap.c b/compat/mmap.c index a051c4767d..55cb120764 100644 --- a/compat/mmap.c +++ b/compat/mmap.c @@ -2,7 +2,7 @@ #include <stdlib.h> #include <unistd.h> #include <errno.h> -#include "../cache.h" +#include "../git-compat-util.h" void *gitfakemmap(void *start, size_t length, int prot , int flags, int fd, off_t offset) { diff --git a/compat/setenv.c b/compat/setenv.c index 94acd2da9e..b7d7678598 100644 --- a/compat/setenv.c +++ b/compat/setenv.c @@ -16,7 +16,7 @@ int gitsetenv(const char *name, const char *value, int replace) namelen = strlen(name); valuelen = strlen(value); - envstr = malloc((namelen + valuelen + 2) * sizeof(char)); + envstr = malloc((namelen + valuelen + 2)); if (!envstr) return -1; memcpy(envstr, name, namelen); @@ -25,7 +25,11 @@ int gitsetenv(const char *name, const char *value, int replace) envstr[namelen + valuelen + 1] = 0; out = putenv(envstr); + /* putenv(3) makes the argument string part of the environment, + * and changing that string modifies the environment --- which + * means we do not own that storage anymore. Do not free + * envstr. + */ - free(envstr); return out; } diff --git a/compat/strcasestr.c b/compat/strcasestr.c index b96414d36b..26896deca6 100644 --- a/compat/strcasestr.c +++ b/compat/strcasestr.c @@ -1,5 +1,4 @@ -#include <string.h> -#include <ctype.h> +#include "../git-compat-util.h" char *gitstrcasestr(const char *haystack, const char *needle) { |