github/amiga-clib2
1
0
Fork 0
mirror of https://github.com/adtools/clib2.git synced 2025-12-08 14:59:05 +00:00
Code Issues Releases Wiki Activity

- The 68020/030/040/060 versions of the library now include the

Browse Source 
64 bit integer conversion code. The plain 68000 version does not.

- The 64 bit integer conversion code used in by the scanf() family
  was broken due to a misplaced overflow check, which had the cruel
  effect of triggering for 32 bit integers as well. Fixed.


git-svn-id: file:///Users/olsen/Code/migration-svn-zu-git/logical-line-staging/clib2/trunk@15023 87f5fb63-7c3d-0410-a384-fd976d0f7a62
This commit is contained in:
Olaf Barthel
2005-08-27 12:57:26 +00:00
parent 4cde124d5d
commit 2e56caa3fb
2 changed files with 52 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
library/changes
View File

@ -32,6 +32,13 @@
equivalent to "%a %b %e %T %Y", "%x" is equivalent to "%m/%d/%y"
and "%X" is now equivalent to "%T".
- The 68020/030/040/060 versions of the library now include the
64 bit integer conversion code. The plain 68000 version does not.
- The 64 bit integer conversion code used in by the scanf() family
was broken due to a misplaced overflow check, which had the cruel
effect of triggering for 32 bit integers as well. Fixed.
c.lib 1.194 (15.7.2005)

51
library/stdio_vfscanf.c
View File

@ -1,5 +1,5 @@
/*
* $Id: stdio_vfscanf.c,v 1.18 2005-06-04 10:46:21 obarthel Exp $
* $Id: stdio_vfscanf.c,v 1.19 2005-08-27 12:57:26 obarthel Exp $
*
* :ts=4
*
@ -31,6 +31,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
/*#define DEBUG*/
#ifndef _STDLIB_NULL_POINTER_CHECK_H
#include "stdlib_null_pointer_check.h"
#endif /* _STDLIB_NULL_POINTER_CHECK_H */
@ -259,33 +261,51 @@ vfscanf(FILE *stream, const char *format, va_list arg)
{
/* Parameter is a short integer. */
parameter_size = parameter_size_short;
SHOWMSG("short integer");
format++;
}
else if (c == 'j')
{
parameter_size = parameter_size_intmax_t;
SHOWMSG("largest integer");
format++;
}
else if (c == 'l')
{
/* Parameter is a long integer or a double precision floating point value. */
parameter_size = parameter_size_long;
SHOWMSG("long integer");
format++;
}
else if (c == 'L')
{
/* Parameter is a long double floating point value. */
parameter_size = parameter_size_long_double;
SHOWMSG("long double");
format++;
}
else if (c == 't')
{
parameter_size = parameter_size_ptrdiff_t;
SHOWMSG("pointer difference");
format++;
}
else if (c == 'z')
{
parameter_size = parameter_size_size_t;
SHOWMSG("size");
format++;
}
else if (c == '\0')
@ -297,6 +317,8 @@ vfscanf(FILE *stream, const char *format, va_list arg)
{
/* Parameter is a long integer or a single precision floating point value. */
parameter_size = parameter_size_default;
SHOWMSG("default");
}
/* Now for the conversion type. */
@ -306,9 +328,13 @@ vfscanf(FILE *stream, const char *format, va_list arg)
#if defined(USE_64_BIT_INTS) && defined(__GNUC__)
{
D(("c = '%lc'",c));
/* Check for long long parameters. */
if(parameter_size == parameter_size_long && c == 'l')
{
SHOWMSG("this is a long long parameter");
parameter_size = parameter_size_long_long;
format++;
@ -326,6 +352,8 @@ vfscanf(FILE *stream, const char *format, va_list arg)
{
parameter_size = parameter_size_byte;
SHOWMSG("byte-sized integer");
format++;
/* The conversion type follows. */
@ -1426,6 +1454,8 @@ vfscanf(FILE *stream, const char *format, va_list arg)
/* Is this a valid digit? */
if(digit >= radix)
{
SHOWMSG("digit is larger than radix");
if(ungetc(c,stream) == EOF)
goto out;
@ -1436,16 +1466,23 @@ vfscanf(FILE *stream, const char *format, va_list arg)
#if defined(USE_64_BIT_INTS) && defined(__GNUC__)
{
if((parameter_size == parameter_size_long_long || parameter_size == parameter_size_intmax_t) && (unsigned long long)next_sum < (unsigned long long)sum) /* overflow? */
if(parameter_size == parameter_size_long_long || parameter_size == parameter_size_intmax_t)
{
/* Put this back. */
if(ungetc(c,stream) == EOF)
goto out;
if((unsigned long long)next_sum < (unsigned long long)sum) /* overflow? */
{
SHOWMSG("overflow!");
break;
/* Put this back. */
if(ungetc(c,stream) == EOF)
goto out;
break;
}
}
else if ((unsigned int)next_sum < (unsigned int)sum) /* overflow? */
{
SHOWMSG("overflow!");
/* Put this back. */
if(ungetc(c,stream) == EOF)
goto out;
@ -1457,6 +1494,8 @@ vfscanf(FILE *stream, const char *format, va_list arg)
{
if((unsigned int)next_sum < (unsigned int)sum) /* overflow? */
{
SHOWMSG("overflow!");
/* Put this back. */
if(ungetc(c,stream) == EOF)
goto out;