@matheusbsbs / matheus-bagliano / commits / e40b61fb6b
Fork 0

Add compat/setenv.c, use in git.c.

There is no setenv() in Solaris 5.8. The trivial calls to setenv() were replaced by putenv() in a much earlier patch, but setenv() was used again in git.c. This patch just adds a compat/setenv.c. The rule for building git$(X) also needs to include compat. objects and compiler flags. Those are now in makefile vars COMPAT_OBJS and COMPAT_CFLAGS. Signed-off-by: E. Jason Riedy <ejr@cs.berkeley.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>

Jason Riedy committed Dec 2, 2005 at 15:08 UTC e40b61fb6bd2e0ed2dc4799096fcf4c828c28d6d
3 files changed +53 -9
Makefile
+18 -9
@@ -21,6 +21,8 @@ all:
21 #
22 # Define NO_STRCASESTR if you don't have strcasestr.
23 #
24 +# Define NO_SETENV if you don't have setenv in the C library.
25 +#
26 # Define PPC_SHA1 environment variable when running make to make use of
27 # a bundled SHA1 routine optimized for PowerPC.
28 #
@@ -194,6 +196,7 @@ shellquote = '$(call shq,$(1))'
196 uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
197 uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
198 uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not')
199 +uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not')
200
201 ifeq ($(uname_S),Darwin)
202 NEEDS_SSL_WITH_CRYPTO = YesPlease
@@ -211,6 +214,9 @@ ifeq ($(uname_S),SunOS)
214 NEEDS_LIBICONV = YesPlease
215 SHELL_PATH = /bin/bash
216 NO_STRCASESTR = YesPlease
217 + ifeq ($(uname_R),5.8)
218 + NO_SETENV = YesPlease
219 + endif
220 INSTALL = ginstall
221 TAR = gtar
222 ALL_CFLAGS += -D__EXTENSIONS__
@@ -314,12 +320,16 @@ ifdef NEEDS_NSL
320 SIMPLE_LIB += -lnsl
321 endif
322 ifdef NO_STRCASESTR
317 - ALL_CFLAGS += -Dstrcasestr=gitstrcasestr -DNO_STRCASESTR=1
318 - LIB_OBJS += compat/strcasestr.o
323 + COMPAT_CFLAGS += -Dstrcasestr=gitstrcasestr -DNO_STRCASESTR=1
324 + COMPAT_OBJS += compat/strcasestr.o
325 +endif
326 +ifdef NO_SETENV
327 + COMPAT_CFLAGS += -Dsetenv=gitsetenv -DNO_SETENV=1
328 + COMPAT_OBJS += compat/setenv.o
329 endif
330 ifdef NO_MMAP
321 - ALL_CFLAGS += -Dmmap=gitfakemmap -Dmunmap=gitfakemunmap -DNO_MMAP
322 - LIB_OBJS += compat/mmap.o
331 + COMPAT_CFLAGS += -Dmmap=gitfakemmap -Dmunmap=gitfakemunmap -DNO_MMAP
332 + COMPAT_OBJS += compat/mmap.o
333 endif
334 ifdef NO_IPV6
335 ALL_CFLAGS += -DNO_IPV6 -Dsockaddr_storage=sockaddr_in
@@ -343,8 +353,8 @@ endif
353 endif
354 endif
355
346 -ALL_CFLAGS += -DSHA1_HEADER=$(call shellquote,$(SHA1_HEADER))
347 -
356 +ALL_CFLAGS += -DSHA1_HEADER=$(call shellquote,$(SHA1_HEADER)) $(COMPAT_CFLAGS)
357 +LIB_OBJS += $(COMPAT_OBJS)
358 export prefix TAR INSTALL DESTDIR SHELL_PATH template_dir
359 ### Build rules
360
@@ -353,10 +363,9 @@ all: $(ALL_PROGRAMS)
363 all:
364 $(MAKE) -C templates
365
356 -# Only use $(CFLAGS). We don't need anything else.
357 -git$(X): git.c Makefile
366 +git$(X): git.c $(COMPAT_OBJS) Makefile
367 $(CC) -DGIT_EXEC_PATH='"$(bindir)"' -DGIT_VERSION='"$(GIT_VERSION)"' \
359 - $(CFLAGS) $< -o $@
368 + $(CFLAGS) $(COMPAT_CFLAGS) -o $@ $(filter %.c,$^) $(filter %.o,$^)
369
370 $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
371 rm -f $@
compat/setenv.c new
+31
@@ -0,0 +1,31 @@
1 +#include <stdlib.h>
2 +#include <string.h>
3 +
4 +int gitsetenv(const char *name, const char *value, int replace)
5 +{
6 + int out;
7 + size_t namelen, valuelen;
8 + char *envstr;
9 +
10 + if (!name || !value) return -1;
11 + if (!replace) {
12 + char *oldval = NULL;
13 + oldval = getenv(name);
14 + if (oldval) return 0;
15 + }
16 +
17 + namelen = strlen(name);
18 + valuelen = strlen(value);
19 + envstr = malloc((namelen + valuelen + 2) * sizeof(char));
20 + if (!envstr) return -1;
21 +
22 + memcpy(envstr, name, namelen);
23 + envstr[namelen] = '=';
24 + memcpy(envstr + namelen + 1, value, valuelen);
25 + envstr[namelen + valuelen + 1] = 0;
26 +
27 + out = putenv(envstr);
28 +
29 + free(envstr);
30 + return out;
31 +}
git.c
+4
@@ -13,6 +13,10 @@
13 # define PATH_MAX 4096
14 #endif
15
16 +#ifdef NO_SETENV
17 +extern int gitsetenv(char *name, char *value, int overwrite);
18 +#endif
19 +
20 static const char git_usage[] =
21 "Usage: git [--version] [--exec-path[=GIT_EXEC_PATH]] [--help] COMMAND [ ARGS ]";
22