diff options
| author | Matthieu Patou <mat@matws.net> | 2010-10-21 00:13:54 +0400 |
|---|---|---|
| committer | Matthieu Patou <mat@matws.net> | 2010-10-22 01:00:53 +0400 |
| commit | 2d0ac59fcc490517b202180f49b178ab80c2534e (patch) | |
| tree | 8d4ea0c932fec9cb4ab88b4586e54513e596cee9 /lib/replace/replace.c | |
| parent | c529317fe2b48e045b35a613cfd1ad3f03b68435 (diff) | |
| download | samba-2d0ac59fcc490517b202180f49b178ab80c2534e.tar.gz samba-2d0ac59fcc490517b202180f49b178ab80c2534e.tar.bz2 samba-2d0ac59fcc490517b202180f49b178ab80c2534e.zip | |
replace: use a wrapper around strtoll if it didn't behave as expected
Diffstat (limited to 'lib/replace/replace.c')
| -rw-r--r-- | lib/replace/replace.c | 50 |
1 files changed, 48 insertions, 2 deletions
diff --git a/lib/replace/replace.c b/lib/replace/replace.c index a00f7053e2..5ecda9226f 100644 --- a/lib/replace/replace.c +++ b/lib/replace/replace.c @@ -3,6 +3,7 @@ replacement routines for broken systems Copyright (C) Andrew Tridgell 1992-1998 Copyright (C) Jelmer Vernooij 2005-2008 + Copyright (C) Matthieu Patou 2010 ** NOTE! The following LGPL license applies to the replace ** library. This does NOT imply that all of Samba is released @@ -502,6 +503,7 @@ char *rep_strtok_r(char *s, const char *delim, char **save_ptr) } #endif + #ifndef HAVE_STRTOLL long long int rep_strtoll(const char *str, char **endptr, int base) { @@ -515,7 +517,29 @@ long long int rep_strtoll(const char *str, char **endptr, int base) # error "You need a strtoll function" #endif } -#endif +#else +#ifdef HAVE_BSD_STRTOLL +#ifdef HAVE_STRTOQ +long long int rep_strtoll(const char *str, char **endptr, int base) +{ + long long int nb = strtoq(str, endptr, base); + /* In linux EINVAL is only returned if base is not ok */ + if (errno == EINVAL) { + if (base == 0 || (base >1 && base <37)) { + /* Base was ok so it's because we were not + * able to make the convertion. + * Let's reset errno. + */ + errno = 0; + } + } + return nb; +} +#else +#error "You need the strtoq function" +#endif /* HAVE_STRTOQ */ +#endif /* HAVE_BSD_STRTOLL */ +#endif /* HAVE_STRTOLL */ #ifndef HAVE_STRTOULL @@ -531,7 +555,29 @@ unsigned long long int rep_strtoull(const char *str, char **endptr, int base) # error "You need a strtoull function" #endif } -#endif +#else +#ifdef HAVE_BSD_STRTOLL +#ifdef HAVE_STRTOUQ +long long int rep_strtoull(const char *str, char **endptr, int base) +{ + unsigned long long int nb = strtouq(str, endptr, base); + /* In linux EINVAL is only returned if base is not ok */ + if (errno == EINVAL) { + if (base == 0 || (base >1 && base <37)) { + /* Base was ok so it's because we were not + * able to make the convertion. + * Let's reset errno. + */ + errno = 0; + } + } + return nb; +} +#else +#error "You need the strtouq function" +#endif /* HAVE_STRTOUQ */ +#endif /* HAVE_BSD_STRTOLL */ +#endif /* HAVE_STRTOULL */ #ifndef HAVE_SETENV int rep_setenv(const char *name, const char *value, int overwrite) |