From 7a2afbbb855e8b96234fd78b22698d028e785ea6 Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Thu, 13 Sep 2001 21:12:33 +0000 Subject: 2001-09-13 Jeff Johnston * libc/stdlib/Makefile.am: Add support to build strtoll_r.c and strtoull_r.c. * libc/stdlib/Makefile.in: Regenerated. * libc/stdlib/strtoll_r.c: New file. * libc/stdlib/strtoull_r.c: New file. * libc/stdio/local.h: Add prototypes for long long string conversion routines. * libc/stdio/vfscanf.c (__svfscanf_r): Add optional long long support tied to %L integer conversion specifier. --- newlib/libc/stdio/local.h | 6 ++++++ newlib/libc/stdio/vfscanf.c | 35 ++++++++++++++++++++++++++++++++++- 2 files changed, 40 insertions(+), 1 deletion(-) (limited to 'newlib/libc/stdio') diff --git a/newlib/libc/stdio/local.h b/newlib/libc/stdio/local.h index 8b55503c8..d8ae29d9f 100644 --- a/newlib/libc/stdio/local.h +++ b/newlib/libc/stdio/local.h @@ -86,6 +86,12 @@ char *_EXFUN(_licvt,(char *, long, char)); char *_EXFUN(_llicvt,(char *, long long, char)); #endif +/* The following are found in the stdlib directory, not here */ +#ifdef __GNUC__ +long long _EXFUN(__strtoll_r,(struct _reent *, const char *, char **, int)); +unsigned long long _EXFUN(__strtoull_r,(struct _reent *, const char *, char **, int)); +#endif + #define CVT_BUF_SIZE 128 #define NDYNAMIC 4 /* add four more whenever necessary */ diff --git a/newlib/libc/stdio/vfscanf.c b/newlib/libc/stdio/vfscanf.c index 662a92360..313a6b85b 100644 --- a/newlib/libc/stdio/vfscanf.c +++ b/newlib/libc/stdio/vfscanf.c @@ -130,6 +130,11 @@ Supporting OS subroutines required: extern _LONG_DOUBLE _strtold _PARAMS((char *s, char **sptr)); #endif +#define _NO_LONGLONG +#if defined WANT_PRINTF_LONG_LONG && defined __GNUC__ +# undef _NO_LONGLONG +#endif + #include "floatio.h" #define BUF (MAXEXP+MAXFRACT+3) /* 3 = sign + decimal point + NUL */ /* An upper bound for how long a long prints in decimal. 4 / 13 approximates @@ -144,7 +149,7 @@ extern _LONG_DOUBLE _strtold _PARAMS((char *s, char **sptr)); */ #define LONG 0x01 /* l: long or double */ -#define LONGDBL 0x02 /* L: long double */ +#define LONGDBL 0x02 /* L: long double or long long */ #define SHORT 0x04 /* h: short */ #define SUPPRESS 0x08 /* suppress assignment */ #define POINTER 0x10 /* weird %p pointer (`fake hex') */ @@ -181,6 +186,10 @@ extern _LONG_DOUBLE _strtold _PARAMS((char *s, char **sptr)); #define u_char char #define u_long unsigned long +#ifndef _NO_LONGLONG +typedef unsigned long long u_long_long; +#endif + /*static*/ u_char *__sccl (); /* @@ -257,6 +266,11 @@ __svfscanf_r (rptr, fp, fmt0, ap) _LONG_DOUBLE *ldp; double *dp; long *lp; +#ifndef _NO_LONGLONG + long long *llp; +#else + u_long _uquad; +#endif /* `basefix' is used to avoid `if' tests in the integer scanner */ static _CONST short basefix[17] = @@ -435,6 +449,13 @@ __svfscanf_r (rptr, fp, fmt0, ap) lp = va_arg (ap, long *); *lp = nread; } +#ifndef _NO_LONGLONG + else if (flags & LONGDBL) + { + llp = va_arg (ap, long long*); + *llp = nread; + } +#endif else { ip = va_arg (ap, int *); @@ -796,6 +817,18 @@ __svfscanf_r (rptr, fp, fmt0, ap) lp = va_arg (ap, long *); *lp = res; } +#ifndef _NO_LONGLONG + else if (flags & LONGDBL) + { + u_long_long resll; + if (ccfn == _strtoul_r) + resll = __strtoull_r (rptr, buf, (char **) NULL, base); + else + resll = __strtoll_r (rptr, buf, (char **) NULL, base); + llp = va_arg (ap, long long*); + *llp = resll; + } +#endif else { ip = va_arg (ap, int *); -- cgit v1.2.3