summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Riedy <ejr@EECS.Berkeley.EDU>2006-01-25 20:38:36 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-01-25 23:10:39 (GMT)
commit731043fd4d55b1561ebb5a53daa4b9ff6dfac046 (patch)
tree15c382b6fd015b5da5be577c57f76bc5096040d6
parent5ea06e2014a910240408f74b9dab2128a30fd06c (diff)
downloadgit-731043fd4d55b1561ebb5a53daa4b9ff6dfac046.zip
git-731043fd4d55b1561ebb5a53daa4b9ff6dfac046.tar.gz
git-731043fd4d55b1561ebb5a53daa4b9ff6dfac046.tar.bz2
Add compat/unsetenv.c .
Implement a (slow) unsetenv() for older systems. Signed-off-by: Jason Riedy <ejr@cs.berkeley.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--Makefile5
-rw-r--r--compat/unsetenv.c26
-rw-r--r--connect.c1
-rw-r--r--git-compat-util.h5
4 files changed, 37 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 245f658..2e95353 100644
--- a/Makefile
+++ b/Makefile
@@ -232,6 +232,7 @@ ifeq ($(uname_S),SunOS)
SHELL_PATH = /bin/bash
NO_STRCASESTR = YesPlease
ifeq ($(uname_R),5.8)
+ NO_UNSETENV = YesPlease
NO_SETENV = YesPlease
endif
INSTALL = ginstall
@@ -355,6 +356,10 @@ ifdef NO_SETENV
COMPAT_CFLAGS += -DNO_SETENV
COMPAT_OBJS += compat/setenv.o
endif
+ifdef NO_SETENV
+ COMPAT_CFLAGS += -DNO_UNSETENV
+ COMPAT_OBJS += compat/unsetenv.o
+endif
ifdef NO_MMAP
COMPAT_CFLAGS += -DNO_MMAP
COMPAT_OBJS += compat/mmap.o
diff --git a/compat/unsetenv.c b/compat/unsetenv.c
new file mode 100644
index 0000000..3a5e4ec
--- /dev/null
+++ b/compat/unsetenv.c
@@ -0,0 +1,26 @@
+#include <stdlib.h>
+#include <string.h>
+
+void gitunsetenv (const char *name)
+{
+ extern char **environ;
+ int src, dst;
+ size_t nmln;
+
+ nmln = strlen(name);
+
+ for (src = dst = 0; environ[src]; ++src) {
+ size_t enln;
+ enln = strlen(environ[src]);
+ if (enln > nmln) {
+ /* might match, and can test for '=' safely */
+ if (0 == strncmp (environ[src], name, nmln)
+ && '=' == environ[src][nmln])
+ /* matches, so skip */
+ continue;
+ }
+ environ[dst] = environ[src];
+ ++dst;
+ }
+ environ[dst] = NULL;
+}
diff --git a/connect.c b/connect.c
index e1c04e1..3f2d65c 100644
--- a/connect.c
+++ b/connect.c
@@ -1,3 +1,4 @@
+#include "git-compat-util.h"
#include "cache.h"
#include "pkt-line.h"
#include "quote.h"
diff --git a/git-compat-util.h b/git-compat-util.h
index 12ce659..f982b8e 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -63,6 +63,11 @@ extern int gitfakemunmap(void *start, size_t length);
extern int gitsetenv(const char *, const char *, int);
#endif
+#ifdef NO_UNSETENV
+#define unsetenv gitunsetenv
+extern void gitunsetenv(const char *);
+#endif
+
#ifdef NO_STRCASESTR
#define strcasestr gitstrcasestr
extern char *gitstrcasestr(const char *haystack, const char *needle);