Re: [PATCH] This patch is to allow 12 different OS's to compile and run git.

> On Fri, 6 Jun 2008, Boyd Lynn Gerber wrote:
> > This patch has patches to
> > 
> > Makefile
> > git-compat-util.h
> > progress.c

> > diff --git a/Makefile b/Makefile
> > index cce5a6e..6df008a 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -165,6 +165,20 @@ uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo not')
> >  # CFLAGS and LDFLAGS are for the users to override from the command line.
> >  
> >  CFLAGS = -g -O2 -Wall
> > +ifeq ($(uname_S),SCO_SV)
> > +  ifeq ($(uname_R),3.2)
> > +#    CFLAGS = -g -O2
> > +    CFLAGS = -g
> > +  endif
> > +  ifeq ($(uname_R),5)
> > +    CFLAGS = -g -O2 -Wall
> > +#    CFLAGS = -g -O2
> > +  endif
> > +endif
> > +ifeq ($(uname_S),UnixWare)
> > +    CFLAGS = -g -O2 -Wall
> > +#    CFLAGS = -g -O2
> > +endif
> 
> Might be better to have something for CFLAGS to filter out. Also, as a 
> general rule, remove old lines instead of commentting them out. If we want 
> to undo a change, we can get it out of the version control. :) (More of 
> these below)
> 
> Also, only the SCO_SV 3.2 one actually does anything here, right?

> Probably ought to make this conditional on a flag that says that "cc" 
> works and "gcc" isn't better; there are a lot of systems, IIRC, where "cc" 
> is a lousy vendor compiler (unless you bought the expensive vendor 
> compiler) and "gcc" is the modern working compiler that everybody has 
> installed.
> 
> >  AR = ar
> >  RM = rm -f
> >  TAR = tar
> > @@ -564,6 +579,42 @@ endif
> >  ifeq ($(uname_S),GNU/kFreeBSD)
> >  	NO_STRLCPY = YesPlease
> >  endif
> > +ifeq ($(uname_S),UnixWare)
> > +	NEEDS_SOCKET = YesPlease
> > +#	NEEDS_NSL = YesPlease
> > +	NEEDS_SSL_WITH_CRYPTO = YesPlease
> > +	NEEDS_LIBICONV = YesPlease
> > +	SHELL_PATH = /usr/local/bin/bash
> > +	NO_IPV6 = YesPlease
> > +	NO_HSTRERROR = YesPlease
> > +#	BASIC_CFLAGS +=  -E -H
> > +	BASIC_CFLAGS +=  -Kalloca -Kthread
> > +	BASIC_CFLAGS += -I/usr/local/include
> > +	BASIC_LDFLAGS += -L/usr/local/lib
> > +	INSTALL = ginstall
> > +	TAR = gtar
> > +	NO_STRCASESTR = YesPlease
> > +	NO_MEMMEM = YesPlease
> > +endif
> > +ifeq ($(uname_S),SCO_SV)
> > +	NEEDS_SOCKET = YesPlease
> > +#	NEEDS_NSL = YesPlease
> > +	NEEDS_SSL_WITH_CRYPTO = YesPlease
> > +	NEEDS_LIBICONV = YesPlease
> > +	SHELL_PATH = /usr/bin/bash
> > +	NO_IPV6 = YesPlease
> > +#	NO_HSTRERROR = YesPlease
> > +#	BASIC_CFLAGS +=  -E -H
> > +      ifeq ($(uname_R),5)
> > +	BASIC_CFLAGS +=  -Kalloca -Kthread
> > +      endif
> > +#	BASIC_CFLAGS += -I/usr/local/include
> > +#	BASIC_LDFLAGS += -L/usr/local/lib
> > +	NO_STRCASESTR = YesPlease
> > +	NO_MEMMEM = YesPlease
> > +	INSTALL = ginstall
> > +	TAR = gtar
> > +endif
> >  ifeq ($(uname_S),Darwin)
> >  	NEEDS_SSL_WITH_CRYPTO = YesPlease
> >  	NEEDS_LIBICONV = YesPlease
> > diff --git a/git-compat-util.h b/git-compat-util.h
> > index 01c4045..b57041c 100644
> > --- a/git-compat-util.h
> > +++ b/git-compat-util.h
> > @@ -39,7 +39,7 @@
> >  /* Approximation of the length of the decimal representation of this type. */
> >  #define decimal_length(x)	((int)(sizeof(x) * 2.56 + 0.5) + 1)
> >  
> > -#if !defined(__APPLE__) && !defined(__FreeBSD__)
> > +#if !defined(__APPLE__) && !defined(__FreeBSD__ ) && !defined(__USLC__) && !defined(_M_UNIX)
> >  #define _XOPEN_SOURCE 600 /* glibc2 and AIX 5.3L need 500, OpenBSD needs 600 for S_ISLNK() */
> >  #define _XOPEN_SOURCE_EXTENDED 1 /* AIX 5.3L needs this */
> >  #endif
> > @@ -89,6 +89,10 @@
> >  #include <grp.h>
> >  #define _ALL_SOURCE 1
> >  #endif
> > +#if defined(__USLC__)
> > +#undef _XOPEN_SOURCE
> > +#include <grp.h>
> > +#endif
> 
> Didn't you avoid defining _XOPEN_SOURCE in this case?

> >  
> >  #ifndef NO_ICONV
> >  #include <iconv.h>
> > @@ -206,12 +210,15 @@ void *gitmemmem(const void *haystack, size_t haystacklen,
> >  #endif
> >  
> >  #ifdef FREAD_READS_DIRECTORIES
> > +#if !defined (__USLC__)
> 
> Can't you not define FREAD_READS_DIRECTORIES?

> >  #ifdef SNPRINTF_RETURNS_BOGUS
> >  #define snprintf git_snprintf
> > diff --git a/progress.c b/progress.c
> > index d19f80c..11a0841 100644
> > --- a/progress.c
> > +++ b/progress.c
> > @@ -241,7 +241,8 @@ void stop_progress_msg(struct progress **p_progress, const char *msg)
> >  	*p_progress = NULL;
> >  	if (progress->last_value != -1) {
> >  		/* Force the last update */
> > -		char buf[strlen(msg) + 5];
> > +		/* char buf[strlen(msg) + 5]; */
> > +		char *buf = malloc (strlen(msg) + 5 );
> 
> Do we really have exactly one use of this pattern? I thought we either did 
> it more or excluded it by policy. Aside from not leaking the memory and 
> not leaving the old version in a comment, it's probably the right change.