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>
Jason Riedy committed
Jan 25, 2006 at 12:38 UTC
731043fd4d55b1561ebb5a53daa4b9ff6dfac046
4 files changed
+37
Makefile
+5
@@ -232,6 +232,7 @@ ifeq ($(uname_S),SunOS)
232
SHELL_PATH = /bin/bash
233
NO_STRCASESTR = YesPlease
234
ifeq ($(uname_R),5.8)
235
+ NO_UNSETENV = YesPlease
236
NO_SETENV = YesPlease
237
endif
238
INSTALL = ginstall
@@ -355,6 +356,10 @@ ifdef NO_SETENV
356
COMPAT_CFLAGS += -DNO_SETENV
357
COMPAT_OBJS += compat/setenv.o
358
endif
359
+ifdef NO_SETENV
360
+ COMPAT_CFLAGS += -DNO_UNSETENV
361
+ COMPAT_OBJS += compat/unsetenv.o
362
+endif
363
ifdef NO_MMAP
364
COMPAT_CFLAGS += -DNO_MMAP
365
COMPAT_OBJS += compat/mmap.o
compat/unsetenv.c
new
+26
@@ -0,0 +1,26 @@
1
+#include <stdlib.h>
2
+#include <string.h>
3
+
4
+void gitunsetenv (const char *name)
5
+{
6
+ extern char **environ;
7
+ int src, dst;
8
+ size_t nmln;
9
+
10
+ nmln = strlen(name);
11
+
12
+ for (src = dst = 0; environ[src]; ++src) {
13
+ size_t enln;
14
+ enln = strlen(environ[src]);
15
+ if (enln > nmln) {
16
+ /* might match, and can test for '=' safely */
17
+ if (0 == strncmp (environ[src], name, nmln)
18
+ && '=' == environ[src][nmln])
19
+ /* matches, so skip */
20
+ continue;
21
+ }
22
+ environ[dst] = environ[src];
23
+ ++dst;
24
+ }
25
+ environ[dst] = NULL;
26
+}
connect.c
+1
@@ -1,3 +1,4 @@
1
+#include "git-compat-util.h"
2
#include "cache.h"
3
#include "pkt-line.h"
4
#include "quote.h"
git-compat-util.h
+5
@@ -63,6 +63,11 @@ extern int gitfakemunmap(void *start, size_t length);
63
extern int gitsetenv(const char *, const char *, int);
64
#endif
65
66
+#ifdef NO_UNSETENV
67
+#define unsetenv gitunsetenv
68
+extern void gitunsetenv(const char *);
69
+#endif
70
+
71
#ifdef NO_STRCASESTR
72
#define strcasestr gitstrcasestr
73
extern char *gitstrcasestr(const char *haystack, const char *needle);