This commit was manufactured by cvs2svn to create tag 'FreeBSD-release/1.0'.

[unix-history] / lib / libc / stdio / vfscanf.c

diff --git a/lib/libc/stdio/vfscanf.c b/lib/libc/stdio/vfscanf.c
index f8c9f05..7f9005d 100644 (file)
--- a/lib/libc/stdio/vfscanf.c
+++ b/lib/libc/stdio/vfscanf.c
@@ -35,7 +35,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)vfscanf.c  5.6 (Berkeley) 2/24/91";
+static char sccsid[] = "@(#)vfscanf.c  5.7 (Berkeley) 12/14/92";

 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>


@@ -50,12 +50,8 @@ static char sccsid[] = "@(#)vfscanf.c        5.6 (Berkeley) 2/24/91";
 
 #define FLOATING_POINT
 
 
 #define FLOATING_POINT
 

-#ifdef FLOATING_POINT

 #include "floatio.h"
 #include "floatio.h"

-#define        BUF     (MAXEXP+MAXFRACT+3)     /* 3 = sign + decimal point + NUL */
-#else
-#define        BUF     40
-#endif
+#define        BUF             513     /* Maximum length of numeric string. */

 
 /*
  * Flags used during conversion.
 
 /*
  * Flags used during conversion.


@@ -635,7 +631,7 @@ literal:
                                double res;
 
                                *p = 0;
                                double res;
 
                                *p = 0;

-                               res = atof(buf);
+                               res = strtod(buf,(char **) NULL);

                                if (flags & LONG)
                                        *va_arg(ap, double *) = res;
                                else
                                if (flags & LONG)
                                        *va_arg(ap, double *) = res;
                                else