--- embedaddon/sudo/compat/snprintf.c 2013/07/22 10:46:11 1.1.1.2 +++ embedaddon/sudo/compat/snprintf.c 2014/06/15 16:12:54 1.1.1.3 @@ -41,7 +41,9 @@ #include -#if !defined(HAVE_VSNPRINTF) || !defined(HAVE_SNPRINTF) || !defined(HAVE_VASPRINTF) || !defined(HAVE_ASPRINTF) +#if !defined(HAVE_VSNPRINTF) || !defined(HAVE_SNPRINTF) || \ + !defined(HAVE_VASPRINTF) || !defined(HAVE_ASPRINTF) || \ + defined(PREFER_PORTABLE_SNPRINTF) #include @@ -79,32 +81,6 @@ static int xxxprintf(char **, size_t, int, const char *, va_list); /* - * Some systems may not have these defined in - */ -#ifndef ULONG_MAX -# define ULONG_MAX ((unsigned long)-1) -#endif -#ifndef LONG_MAX -# define LONG_MAX (ULONG_MAX / 2) -#endif -#ifdef HAVE_LONG_LONG_INT -# ifndef ULLONG_MAX -# ifdef UQUAD_MAX -# define ULLONG_MAX UQUAD_MAX -# else -# define ULLONG_MAX ((unsigned long long)-1) -# endif -# endif -# ifndef LLONG_MAX -# ifdef QUAD_MAX -# define LLONG_MAX QUAD_MAX -# else -# define LLONG_MAX (ULLONG_MAX / 2) -# endif -# endif -#endif /* HAVE_LONG_LONG_INT */ - -/* * Macros for converting digits to letters and vice versa */ #define to_digit(c) ((c) - '0') @@ -187,12 +163,11 @@ __ultoa(unsigned long val, char *endp, int base, int o } /* Identical to __ultoa, but for quads. */ -#ifdef HAVE_LONG_LONG_INT -# if SIZEOF_LONG_INT == 8 -# define __uqtoa(v, e, b, o, x) __ultoa((unsigned long)(v), (e), (b), (o), (x)) -# else +#if SIZEOF_LONG_INT == 8 +# define __ulltoa(v, e, b, o, x) __ultoa((unsigned long)(v), (e), (b), (o), (x)) +#else static char * -__uqtoa(unsigned long long val, char *endp, int base, int octzero, char *xdigs) +__ulltoa(unsigned long long val, char *endp, int base, int octzero, char *xdigs) { char *cp = endp; long long sval; @@ -239,8 +214,7 @@ __uqtoa(unsigned long long val, char *endp, int base, } return cp; } -# endif /* !SIZEOF_LONG_INT */ -#endif /* HAVE_LONG_LONG_INT */ +#endif /* !SIZEOF_LONG_INT */ /* * Actual printf innards. @@ -258,9 +232,7 @@ xxxprintf(char **strp, size_t strsize, int alloc, cons int prec; /* precision from format (%.3d), or -1 */ char sign; /* sign prefix (' ', '+', '-', or \0) */ unsigned long ulval = 0; /* integer arguments %[diouxX] */ -#ifdef HAVE_LONG_LONG_INT - unsigned long long uqval = 0; /* %q (quad) integers */ -#endif + unsigned long long ullval = 0; /* long long arguments %ll[diouxX] */ int base; /* base for [diouxX] conversion */ int dprec; /* a copy of prec if [diouxX], 0 otherwise */ int fieldsz; /* field size expanded by sign, etc */ @@ -440,11 +412,6 @@ reswitch: switch (ch) { flags |= LONGINT; } goto rflag; -#ifdef HAVE_LONG_LONG_INT - case 'q': - flags |= LLONGINT; - goto rflag; -#endif /* HAVE_LONG_LONG_INT */ case 'c': *(cp = buf) = va_arg(ap, int); size = 1; @@ -455,17 +422,13 @@ reswitch: switch (ch) { /*FALLTHROUGH*/ case 'd': case 'i': -#ifdef HAVE_LONG_LONG_INT if (flags & LLONGINT) { - uqval = va_arg(ap, long long); - if ((long long)uqval < 0) { - uqval = -uqval; + ullval = va_arg(ap, long long); + if ((long long)ullval < 0) { + ullval = -ullval; sign = '-'; } - } - else -#endif /* HAVE_LONG_LONG_INT */ - { + } else { ulval = SARG(); if ((long)ulval < 0) { ulval = -ulval; @@ -475,12 +438,9 @@ reswitch: switch (ch) { base = 10; goto number; case 'n': -#ifdef HAVE_LONG_LONG_INT if (flags & LLONGINT) *va_arg(ap, long long *) = ret; - else -#endif /* HAVE_LONG_LONG_INT */ - if (flags & LONGINT) + else if (flags & LONGINT) *va_arg(ap, long *) = ret; else if (flags & SHORTINT) *va_arg(ap, short *) = ret; @@ -491,11 +451,9 @@ reswitch: switch (ch) { flags |= LONGINT; /*FALLTHROUGH*/ case 'o': -#ifdef HAVE_LONG_LONG_INT if (flags & LLONGINT) - uqval = va_arg(ap, unsigned long long); + ullval = va_arg(ap, unsigned long long); else -#endif /* HAVE_LONG_LONG_INT */ ulval = UARG(); base = 8; goto nosign; @@ -538,11 +496,9 @@ reswitch: switch (ch) { flags |= LONGINT; /*FALLTHROUGH*/ case 'u': -#ifdef HAVE_LONG_LONG_INT if (flags & LLONGINT) - uqval = va_arg(ap, unsigned long long); + ullval = va_arg(ap, unsigned long long); else -#endif /* HAVE_LONG_LONG_INT */ ulval = UARG(); base = 10; goto nosign; @@ -552,20 +508,14 @@ reswitch: switch (ch) { case 'x': xdigs = "0123456789abcdef"; hex: -#ifdef HAVE_LONG_LONG_INT if (flags & LLONGINT) - uqval = va_arg(ap, unsigned long long); + ullval = va_arg(ap, unsigned long long); else -#endif /* HAVE_LONG_LONG_INT */ ulval = UARG(); base = 16; /* leading 0x/X only if non-zero */ if (flags & ALT && -#ifdef HAVE_LONG_LONG_INT - (flags & LLONGINT ? uqval != 0 : ulval != 0)) -#else - ulval != 0) -#endif /* HAVE_LONG_LONG_INT */ + (flags & LLONGINT ? ullval != 0 : ulval != 0)) flags |= HEXPREFIX; /* unsigned conversions */ @@ -584,15 +534,11 @@ number: if ((dprec = prec) >= 0) * -- ANSI X3J11 */ cp = buf + BUF; -#ifdef HAVE_LONG_LONG_INT if (flags & LLONGINT) { - if (uqval != 0 || prec != 0) - cp = __uqtoa(uqval, cp, base, + if (ullval != 0 || prec != 0) + cp = __ulltoa(ullval, cp, base, flags & ALT, xdigs); - } - else -#endif /* HAVE_LONG_LONG_INT */ - { + } else { if (ulval != 0 || prec != 0) cp = __ultoa(ulval, cp, base, flags & ALT, xdigs); @@ -668,18 +614,18 @@ done: /* NOTREACHED */ } -#ifndef HAVE_VSNPRINTF +#if !defined(HAVE_VSNPRINTF) || defined(PREFER_PORTABLE_SNPRINTF) int -vsnprintf(char *str, size_t n, const char *fmt, va_list ap) +rpl_vsnprintf(char *str, size_t n, const char *fmt, va_list ap) { return xxxprintf(&str, n, 0, fmt, ap); } -#endif /* HAVE_VSNPRINTF */ +#endif /* !HAVE_VSNPRINTF || PREFER_PORTABLE_SNPRINTF */ -#ifndef HAVE_SNPRINTF +#if !defined(HAVE_SNPRINTF) || defined(PREFER_PORTABLE_SNPRINTF) int -snprintf(char *str, size_t n, char const *fmt, ...) +rpl_snprintf(char *str, size_t n, char const *fmt, ...) { int ret; va_list ap; @@ -689,20 +635,20 @@ snprintf(char *str, size_t n, char const *fmt, ...) va_end(ap); return ret; } -#endif /* HAVE_SNPRINTF */ +#endif /* !HAVE_SNPRINTF || PREFER_PORTABLE_SNPRINTF */ -#ifndef HAVE_VASPRINTF +#if !defined(HAVE_VASPRINTF) || defined(PREFER_PORTABLE_SNPRINTF) int -vasprintf(char **str, const char *fmt, va_list ap) +rpl_vasprintf(char **str, const char *fmt, va_list ap) { return xxxprintf(str, 0, 1, fmt, ap); } -#endif /* HAVE_VASPRINTF */ +#endif /* !HAVE_VASPRINTF || PREFER_PORTABLE_SNPRINTF */ -#ifndef HAVE_ASPRINTF +#if !defined(HAVE_ASPRINTF) || defined(PREFER_PORTABLE_SNPRINTF) int -asprintf(char **str, char const *fmt, ...) +rpl_asprintf(char **str, char const *fmt, ...) { int ret; va_list ap; @@ -712,6 +658,6 @@ asprintf(char **str, char const *fmt, ...) va_end(ap); return ret; } -#endif /* HAVE_ASPRINTF */ +#endif /* !HAVE_ASPRINTF || PREFER_PORTABLE_SNPRINTF */ -#endif /* !HAVE_VSNPRINTF || !HAVE_SNPRINTF || !HAVE_VASPRINTF || !HAVE_ASPRINTF */ +#endif /* !HAVE_VSNPRINTF || !HAVE_SNPRINTF || !HAVE_VASPRINTF || !HAVE_ASPRINTF || PREFER_PORTABLE_SNPRINTF */