[Q@ping.be: Scanf with a long long.]
J. Johnston
jjohnstn@cygnus.com
Thu Sep 13 14:16:00 GMT 2001
"J. Johnston" wrote:
>
> Christopher Faylor wrote:
> >
> > Wow, 1997, huh? Why doesn't someone fix this crucial problem?
> >
> > Whassamadda with you guys?
> >
>
> It is a known deficiency (i.e. scanf does not have any long long support).
> I am working on an enhancement as we speak and should have something tested by
> early next week.
>
> -- Jeff J.
>
>
The attached patch has been checked in. The changes are activated by the WANT_PRINTF_LONG_LONG
flag being defined which is already being done for Cygwin.
2001-09-13 Jeff Johnston <jjohnstn@redhat.com>
* 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.
-- Jeff J.
> > ----- Forwarded message from Kurt Roeckx <Q@ping.be> -----
> >
> > From: Kurt Roeckx <Q@ping.be>
> > To: cygwin@cygwin.com
> > Subject: Scanf with a long long.
> > Date: Thu, 6 Sep 2001 00:54:13 +0200
> >
> > I need use a 64 bit number, and int64_t is defined as a long
> > long.
> >
> > The problem is that scanf doesn't like numbers bigger then
> > 0xFFFFFFFF, and always returns that number in that case. printf
> > works fine with them.
> >
> > An example is doing this:
> >
> > long long int i;
> >
> > sscanf("123456789", "%Lx", &i);
> > printf("%llx\n%llx\n", i, i + 1);
> >
> > it will print:
> >
> > ffffffff
> > 100000000
> >
> > This problem seems to be reported once before in 1997, but still
> > doesn't seem to be fixed.
> > I'm using cygwin 1.3.2 on win98.
> >
> > Kurt
> >
> > ----- End forwarded message -----
Index: libc/stdlib/Makefile.am
===================================================================
RCS file: /cvs/src/src/newlib/libc/stdlib/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- libc/stdlib/Makefile.am 2001/02/15 02:04:54 1.3
+++ libc/stdlib/Makefile.am 2001/09/13 21:06:42
@@ -70,7 +70,9 @@
strdup_r.c \
strtod.c \
strtol.c \
+ strtoll_r.c \
strtoul.c \
+ strtoull_r.c \
system.c \
valloc.c \
wcstombs.c \
Index: libc/stdlib/Makefile.in
===================================================================
RCS file: /cvs/src/src/newlib/libc/stdlib/Makefile.in,v
retrieving revision 1.3
diff -u -r1.3 Makefile.in
--- libc/stdlib/Makefile.in 2001/02/15 02:04:54 1.3
+++ libc/stdlib/Makefile.in 2001/09/13 21:06:42
@@ -152,7 +152,9 @@
strdup_r.c \
strtod.c \
strtol.c \
+ strtoll_r.c \
strtoul.c \
+ strtoull_r.c \
system.c \
valloc.c \
wcstombs.c \
@@ -229,8 +231,9 @@
mblen_r.o mbstowcs.o mbstowcs_r.o mbtowc.o mbtowc_r.o mlock.o mprec.o \
mrand48.o msize.o mstats.o mtrim.o nrand48.o putenv.o putenv_r.o \
qsort.o rand.o rand48.o rand_r.o realloc.o seed48.o setenv.o setenv_r.o \
-srand48.o strdup.o strdup_r.o strtod.o strtol.o strtoul.o system.o \
-valloc.o wcstombs.o wcstombs_r.o wctomb.o wctomb_r.o
+srand48.o strdup.o strdup_r.o strtod.o strtol.o strtoll_r.o strtoul.o \
+strtoull_r.o system.o valloc.o wcstombs.o wcstombs_r.o wctomb.o \
+wctomb_r.o
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
Index: libc/stdlib/strtoll_r.c
===================================================================
RCS file: strtoll_r.c
diff -N strtoll_r.c
--- libc/stdlib/strtoll_r.c Tue May 5 13:32:27 1998
+++ libc/stdlib/strtoll_r.c Thu Sep 13 14:06:42 2001
@@ -0,0 +1,140 @@
+/*
+ This code is based on strtoul.c which has the following copyright.
+ It is used to convert a string into a signed long long.
+
+ long long __strtoll_r (struct _reent *rptr, const char *s,
+ char **ptr, int base);
+*/
+
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by the University of
+ * California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifdef __GNUC__
+
+#define _GNU_SOURCE
+#include <_ansi.h>
+#include <limits.h>
+#include <ctype.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <reent.h>
+
+/*
+ * Convert a string to a long long integer.
+ *
+ * Ignores `locale' stuff. Assumes that the upper and lower case
+ * alphabets and digits are each contiguous.
+ */
+long long
+_DEFUN (__strtoll_r, (rptr, nptr, endptr, base),
+ struct _reent *rptr _AND
+ _CONST char *nptr _AND
+ char **endptr _AND
+ int base)
+{
+ register const char *s = nptr;
+ register unsigned long long acc;
+ register int c;
+ register unsigned long long cutoff;
+ register int neg = 0, any, cutlim;
+
+ /*
+ * Skip white space and pick up leading +/- sign if any.
+ * If base is 0, allow 0x for hex and 0 for octal, else
+ * assume decimal; if base is already 16, allow 0x.
+ */
+ do {
+ c = *s++;
+ } while (isspace(c));
+ if (c == '-') {
+ neg = 1;
+ c = *s++;
+ } else if (c == '+')
+ c = *s++;
+ if ((base == 0 || base == 16) &&
+ c == '0' && (*s == 'x' || *s == 'X')) {
+ c = s[1];
+ s += 2;
+ base = 16;
+ }
+ if (base == 0)
+ base = c == '0' ? 8 : 10;
+
+ /*
+ * Compute the cutoff value between legal numbers and illegal
+ * numbers. That is the largest legal value, divided by the
+ * base. An input number that is greater than this value, if
+ * followed by a legal input character, is too big. One that
+ * is equal to this value may be valid or not; the limit
+ * between valid and invalid numbers is then based on the last
+ * digit. For instance, if the range for longs is
+ * [-2147483648..2147483647] and the input base is 10,
+ * cutoff will be set to 214748364 and cutlim to either
+ * 7 (neg==0) or 8 (neg==1), meaning that if we have accumulated
+ * a value > 214748364, or equal but the next digit is > 7 (or 8),
+ * the number is too big, and we will return a range error.
+ *
+ * Set any if any `digits' consumed; make it negative to indicate
+ * overflow.
+ */
+ cutoff = neg ? -(unsigned long long)LONG_LONG_MIN : LONG_LONG_MAX;
+ cutlim = cutoff % (unsigned long long)base;
+ cutoff /= (unsigned long long)base;
+ for (acc = 0, any = 0;; c = *s++) {
+ if (isdigit(c))
+ c -= '0';
+ else if (isalpha(c))
+ c -= isupper(c) ? 'A' - 10 : 'a' - 10;
+ else
+ break;
+ if (c >= base)
+ break;
+ if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim))
+ any = -1;
+ else {
+ any = 1;
+ acc *= base;
+ acc += c;
+ }
+ }
+ if (any < 0) {
+ acc = neg ? LONG_LONG_MIN : LONG_LONG_MAX;
+ rptr->_errno = ERANGE;
+ } else if (neg)
+ acc = -acc;
+ if (endptr != 0)
+ *endptr = (char *) (any ? s - 1 : nptr);
+ return (acc);
+}
+
+#endif /* __GNUC__ */
Index: libc/stdlib/strtoull_r.c
===================================================================
RCS file: strtoull_r.c
diff -N strtoull_r.c
--- libc/stdlib/strtoull_r.c Tue May 5 13:32:27 1998
+++ libc/stdlib/strtoull_r.c Thu Sep 13 14:06:42 2001
@@ -0,0 +1,120 @@
+/*
+ This code is based on strtoul.c which has the following copyright.
+ It is used to convert a string into an unsigned long long.
+
+ long long __strtoull_r (struct _reent *rptr, const char *s,
+ char **ptr, int base);
+
+*/
+
+/*
+ * Copyright (c) 1990 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by the University of
+ * California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifdef __GNUC__
+
+#define _GNU_SOURCE
+#include <_ansi.h>
+#include <limits.h>
+#include <ctype.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <reent.h>
+
+/*
+ * Convert a string to an unsigned long long integer.
+ *
+ * Ignores `locale' stuff. Assumes that the upper and lower case
+ * alphabets and digits are each contiguous.
+ */
+unsigned long long
+_DEFUN (__strtoull_r, (rptr, nptr, endptr, base),
+ struct _reent *rptr _AND
+ _CONST char *nptr _AND
+ char **endptr _AND
+ int base)
+{
+ register const char *s = nptr;
+ register unsigned long long acc;
+ register int c;
+ register unsigned long long cutoff;
+ register int neg = 0, any, cutlim;
+
+ /*
+ * See strtol for comments as to the logic used.
+ */
+ do {
+ c = *s++;
+ } while (isspace(c));
+ if (c == '-') {
+ neg = 1;
+ c = *s++;
+ } else if (c == '+')
+ c = *s++;
+ if ((base == 0 || base == 16) &&
+ c == '0' && (*s == 'x' || *s == 'X')) {
+ c = s[1];
+ s += 2;
+ base = 16;
+ }
+ if (base == 0)
+ base = c == '0' ? 8 : 10;
+ cutoff = (unsigned long long)ULONG_LONG_MAX / (unsigned long long)base;
+ cutlim = (unsigned long long)ULONG_LONG_MAX % (unsigned long long)base;
+ for (acc = 0, any = 0;; c = *s++) {
+ if (isdigit(c))
+ c -= '0';
+ else if (isalpha(c))
+ c -= isupper(c) ? 'A' - 10 : 'a' - 10;
+ else
+ break;
+ if (c >= base)
+ break;
+ if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim))
+ any = -1;
+ else {
+ any = 1;
+ acc *= base;
+ acc += c;
+ }
+ }
+ if (any < 0) {
+ acc = ULONG_LONG_MAX;
+ rptr->_errno = ERANGE;
+ } else if (neg)
+ acc = -acc;
+ if (endptr != 0)
+ *endptr = (char *) (any ? s - 1 : nptr);
+ return (acc);
+}
+
+#endif /* __GNUC__ */
Index: libc/stdio/local.h
===================================================================
RCS file: /cvs/src/src/newlib/libc/stdio/local.h,v
retrieving revision 1.4
diff -u -r1.4 local.h
--- libc/stdio/local.h 2001/04/20 22:50:51 1.4
+++ libc/stdio/local.h 2001/09/13 21:06:42
@@ -86,6 +86,12 @@
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 */
Index: libc/stdio/vfscanf.c
===================================================================
RCS file: /cvs/src/src/newlib/libc/stdio/vfscanf.c,v
retrieving revision 1.8
diff -u -r1.8 vfscanf.c
--- libc/stdio/vfscanf.c 2001/04/27 21:59:44 1.8
+++ libc/stdio/vfscanf.c 2001/09/13 21:06:42
@@ -130,6 +130,11 @@
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 @@
*/
#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 @@
#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 @@
_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 @@
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 @@
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 *);
More information about the Newlib
mailing list