# [PATCH] Add a compat/strtoumax.c for Solaris 8. 9 messages from 2007-02-20 to 2007-02-20. Participants: Jason Riedy, Shawn O. Pearce, Junio C Hamano. Thread: https://gitlist.dev/t/6887 ## Jason Riedy, 2007-02-20 00:22 Subject: [PATCH] Add a compat/strtoumax.c for Solaris 8. Message-ID: <17777.1171930976@lotus.CS.Berkeley.EDU> URL: https://gitlist.dev/e/17777.1171930976%40lotus.CS.Berkeley.EDU ``` Solaris 8 was pre-c99, and they weren't willing to commit to the strtoumax definition according to /usr/include/inttypes.h. This adds NO_STRTOUMAX and NO_STRTOULL for ancient systems. If NO_STRTOUMAX is defined, the routine in compat/strtoumax.c will be used instead. That routine passes its arguments to strtoull unless NO_STRTOULL is defined. If NO_STRTOULL, then the routine uses strtoul (unsigned long). Signed-off-by: Jason Riedy --- I suppose the Sun libc folks were so burnt on the math additions that they decided not to support *any* potential C99 bits on Solaris 8. sigh. (Solaris 8 is slated to reach EOL on 2012, so it'll be around a while.) This alone won't pass tests on Solaris 8. The next patch fixes fast-import.c to avoid C99 formats when necessary. Makefile | 12 ++++++++++++ compat/strtoumax.c | 10 ++++++++++ git-compat-util.h | 5 +++++ 3 files changed, 27 insertions(+), 0 deletions(-) create mode 100644 compat/strtoumax.c diff --git a/Makefile b/Makefile index ebecbbd..5ae509f 100644 --- a/Makefile +++ b/Makefile @@ -28,6 +28,10 @@ all:: # # Define NO_STRLCPY if you don't have strlcpy. # +# Define NO_STRTOUMAX if you don't have strtoumax in the C library. +# If your compiler also does not support long long or does not have +# strtoull, define NO_STRTOULL. +# # Define NO_SETENV if you don't have setenv in the C library. # # Define NO_SYMLINK_HEAD if you never want .git/HEAD to be a symbolic link. @@ -353,6 +357,7 @@ ifeq ($(uname_S),SunOS) NO_UNSETENV = YesPlease NO_SETENV = YesPlease NO_C99_FORMAT = YesPlease + NO_STRTOUMAX = YesPlease endif ifeq ($(uname_R),5.9) NO_UNSETENV = YesPlease @@ -517,6 +522,13 @@ ifdef NO_STRLCPY COMPAT_CFLAGS += -DNO_STRLCPY COMPAT_OBJS += compat/strlcpy.o endif +ifdef NO_STRTOUMAX + COMPAT_CFLAGS += -DNO_STRTOUMAX + COMPAT_OBJS += compat/strtoumax.o +endif +ifdef NO_STRTOULL + COMPAT_CFLAGS += -DNO_STRTOULL +endif ifdef NO_SETENV COMPAT_CFLAGS += -DNO_SETENV COMPAT_OBJS += compat/setenv.o diff --git a/compat/strtoumax.c b/compat/strtoumax.c new file mode 100644 index 0000000..f97bd08 --- /dev/null +++ b/compat/strtoumax.c @@ -0,0 +1,10 @@ +#include "../git-compat-util.h" + +uintmax_t gitstrtoumax (const char *nptr, char **endptr, int base) +{ +#if defined(NO_STRTOULL) + return strtoul(nptr, endptr, base); +#else + return strtoull(nptr, endptr, base); +#endif +} diff --git a/git-compat-util.h b/git-compat-util.h index 105ac28..9863cf6 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -139,6 +139,11 @@ extern char *gitstrcasestr(const char *haystack, const char *needle); extern size_t gitstrlcpy(char *, const char *, size_t); #endif +#ifdef NO_STRTOUMAX +#define strtoumax gitstrtoumax +extern uintmax_t gitstrtoumax(const char *, char **, int); +#endif + extern void release_pack_memory(size_t); static inline char* xstrdup(const char *str) -- 1.5.0.1.28.g7b18f ``` ## Shawn O. Pearce, 2007-02-20 00:35 Subject: Re: [PATCH] Add a compat/strtoumax.c for Solaris 8. Message-ID: <20070220003533.GB28314@spearce.org> URL: https://gitlist.dev/e/20070220003533.GB28314%40spearce.org In-Reply-To: <17777.1171930976@lotus.CS.Berkeley.EDU> ``` Jason Riedy wrote: > Solaris 8 was pre-c99, and they weren't willing to commit to > the strtoumax definition according to /usr/include/inttypes.h. > > This adds NO_STRTOUMAX and NO_STRTOULL for ancient systems. > If NO_STRTOUMAX is defined, the routine in compat/strtoumax.c > will be used instead. That routine passes its arguments to > strtoull unless NO_STRTOULL is defined. If NO_STRTOULL, then > the routine uses strtoul (unsigned long). Ack'd (this and the fast-import patch that follows). This is a better version than the patch I sent out last night, so Junio please drop my patch in favor of Jason's. -- Shawn. ``` ## Junio C Hamano, 2007-02-20 00:53 Subject: Re: [PATCH] Add a compat/strtoumax.c for Solaris 8. Message-ID: <7virdx4pl2.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7virdx4pl2.fsf%40assigned-by-dhcp.cox.net In-Reply-To: <20070220003533.GB28314@spearce.org> ``` "Shawn O. Pearce" writes: > This is a better version than the patch I sent out last night, > so Junio please drop my patch in favor of Jason's. Agh. Too late... I need some rewinding and reshuffling. ``` ## Shawn O. Pearce, 2007-02-20 00:58 Subject: Re: [PATCH] Add a compat/strtoumax.c for Solaris 8. Message-ID: <20070220005821.GC28314@spearce.org> URL: https://gitlist.dev/e/20070220005821.GC28314%40spearce.org In-Reply-To: <7virdx4pl2.fsf@assigned-by-dhcp.cox.net> ``` Junio C Hamano wrote: > "Shawn O. Pearce" writes: > > > This is a better version than the patch I sent out last night, > > so Junio please drop my patch in favor of Jason's. > > Agh. Too late... > > I need some rewinding and reshuffling. Whoops. :-) I hear Git is good at rewinding and reshuffling. Provided you have not pushed the commits out yet. Maybe that will help you here? ;-) -- Shawn. ``` ## Junio C Hamano, 2007-02-20 01:29 Subject: Re: [PATCH] Add a compat/strtoumax.c for Solaris 8. Message-ID: <7vy7mt39c0.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7vy7mt39c0.fsf%40assigned-by-dhcp.cox.net In-Reply-To: <20070220005821.GC28314@spearce.org> ``` "Shawn O. Pearce" writes: > Junio C Hamano wrote: >> "Shawn O. Pearce" writes: >> >> > This is a better version than the patch I sent out last night, >> > so Junio please drop my patch in favor of Jason's. >> >> Agh. Too late... >> >> I need some rewinding and reshuffling. > > Whoops. :-) > > I hear Git is good at rewinding and reshuffling. Provided you have > not pushed the commits out yet. Maybe that will help you here? ;-) That's what I'll do later. ``` ## Junio C Hamano, 2007-02-20 02:20 Subject: Re: [PATCH] Add a compat/strtoumax.c for Solaris 8. Message-ID: <7vfy9136zu.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7vfy9136zu.fsf%40assigned-by-dhcp.cox.net In-Reply-To: <20070220003533.GB28314@spearce.org> ``` "Shawn O. Pearce" writes: > Jason Riedy wrote: >> Solaris 8 was pre-c99, and they weren't willing to commit to >> the strtoumax definition according to /usr/include/inttypes.h. >> >> This adds NO_STRTOUMAX and NO_STRTOULL for ancient systems. >> If NO_STRTOUMAX is defined, the routine in compat/strtoumax.c >> will be used instead. That routine passes its arguments to >> strtoull unless NO_STRTOULL is defined. If NO_STRTOULL, then >> the routine uses strtoul (unsigned long). > > Ack'd (this and the fast-import patch that follows). > > This is a better version than the patch I sent out last night, > so Junio please drop my patch in favor of Jason's. Yours talk about Sol 9 and Jason talks about Sol 8. Should I take your ack to mean you want this patch on top of Jason's? diff --git a/Makefile b/Makefile index 821996f..f85fb7c 100644 --- a/Makefile +++ b/Makefile @@ -358,16 +358,17 @@ ifeq ($(uname_S),SunOS) NO_SETENV = YesPlease NO_C99_FORMAT = YesPlease NO_STRTOUMAX = YesPlease endif ifeq ($(uname_R),5.9) NO_UNSETENV = YesPlease NO_SETENV = YesPlease NO_C99_FORMAT = YesPlease + NO_STRTOUMAX = YesPlease endif INSTALL = ginstall TAR = gtar BASIC_CFLAGS += -D__EXTENSIONS__ endif ifeq ($(uname_O),Cygwin) NO_D_TYPE_IN_DIRENT = YesPlease NO_D_INO_IN_DIRENT = YesPlease ``` ## Shawn O. Pearce, 2007-02-20 02:51 Subject: Re: [PATCH] Add a compat/strtoumax.c for Solaris 8. Message-ID: <20070220025110.GA28797@spearce.org> URL: https://gitlist.dev/e/20070220025110.GA28797%40spearce.org In-Reply-To: <7vfy9136zu.fsf@assigned-by-dhcp.cox.net> ``` Junio C Hamano wrote: > Yours talk about Sol 9 and Jason talks about Sol 8. Should I > take your ack to mean you want this patch on top of Jason's? Yes, indeed. Please apply that. :-) -- Shawn. ``` ## Junio C Hamano, 2007-02-20 03:00 Subject: Re: [PATCH] Add a compat/strtoumax.c for Solaris 8. Message-ID: <7v7iud354s.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7v7iud354s.fsf%40assigned-by-dhcp.cox.net In-Reply-To: <20070220025110.GA28797@spearce.org> ``` Thanks. ``` ## Jason Riedy, 2007-02-20 20:16 Subject: Re: [PATCH] Add a compat/strtoumax.c for Solaris 8. Message-ID: <19776.1172002568@lotus.CS.Berkeley.EDU> URL: https://gitlist.dev/e/19776.1172002568%40lotus.CS.Berkeley.EDU In-Reply-To: <20070220003533.GB28314@spearce.org> ``` And Shawn O. Pearce writes: > This is a better version than the patch I sent out last night, > so Junio please drop my patch in favor of Jason's. Sorry, didn't even notice... Houseguest, cold, and too much work. ;) Thanks for working on this! Jason ```