Commit 42c74d64 authored by Daniel Gudbjartsson's avatar Daniel Gudbjartsson Committed by Alexandre Julliard

Combined the implementation of all the scanf's in a single place.

Added implementations of fwscanf, swscanf, wscanf and sscanf. Corrected the declaration of swscanf. Added implementation of the l, h, L and w prefixes. Added implementation of the c, C, s, S and n types.
parent 9fc17ee3
......@@ -31,6 +31,7 @@ C_SRCS = \
mbcs.c \
misc.c \
process.c \
scanf.c \
string.c \
thread.c \
time.c \
......
......@@ -193,266 +193,6 @@ int _ungetch(int c)
return retval;
}
/* helper function for _cscanf. Returns the value of character c in the
* given base, or -1 if the given character is not a digit of the base.
*/
static int char2digit(char c, int base) {
if ((c>='0') && (c<='9') && (c<='0'+base-1)) return (c-'0');
if (base<=10) return -1;
if ((c>='A') && (c<='Z') && (c<='A'+base-11)) return (c-'A'+10);
if ((c>='a') && (c<='z') && (c<='a'+base-11)) return (c-'a'+10);
return -1;
}
/*********************************************************************
* _cscanf (MSVCRT.@)
*/
int _cscanf(const char* format, ...)
{
/* NOTE: If you extend this function, extend MSVCRT_fscanf in file.c too */
int rd = 0;
int nch;
va_list ap;
if (!*format) return 0;
WARN("\"%s\": semi-stub\n", format);
va_start(ap, format);
LOCK_CONSOLE;
nch = _getch();
while (*format) {
/* a whitespace character in the format string causes scanf to read,
* but not store, all consecutive white-space characters in the input
* up to the next non-white-space character. One white space character
* in the input matches any number (including zero) and combination of
* white-space characters in the input. */
if (isspace(*format)) {
/* skip whitespace */
while ((nch!=MSVCRT_EOF) && isspace(nch))
nch = _getch();
}
/* a format specification causes scanf to read and convert characters
* in the input into values of a specified type. The value is assigned
* to an argument in the argument list. Format specifications have
* the form %[*][width][{h | l | I64 | L}]type */
/* FIXME: unimplemented: h/l/I64/L modifiers and some type specs. */
else if (*format == '%') {
int st = 0; int suppress = 0; int width = 0;
int base, number_signed;
format++;
/* look for leading asterisk, which means 'suppress assignment of
* this field'. */
if (*format=='*') {
format++;
suppress=1;
}
/* look for width specification */
while (isdigit(*format)) {
width*=10;
width+=*format++ - '0';
}
if (width==0) width=-1; /* no width spec seen */
switch(*format) {
case '%': /* read a percent symbol */
if (nch!='%') break;
nch = _getch();
break;
case 'x':
case 'X': /* hexadecimal integer. */
base = 16; number_signed = 0;
goto number;
case 'o': /* octal integer */
base = 8; number_signed = 0;
goto number;
case 'u': /* unsigned decimal integer */
base = 10; number_signed = 0;
goto number;
case 'd': /* signed decimal integer */
base = 10; number_signed = 1;
goto number;
case 'i': /* generic integer */
base = 0; number_signed = 1;
number: {
/* read an integer */
int*val = suppress ? NULL : va_arg(ap, int*);
int cur = 0; int negative = 0; int seendigit=0;
/* skip initial whitespace */
while ((nch!=MSVCRT_EOF) && isspace(nch))
nch = _getch();
/* get sign */
if (number_signed && (nch == '-' || nch == '+')) {
negative = (nch=='-');
nch = _getch();
if (width>0) width--;
}
/* look for leading indication of base */
if (width!=0 && nch == '0') {
nch = _getch();
if (width>0) width--;
seendigit=1;
if (width!=0 && (nch=='x' || nch=='X')) {
if (base==0)
base=16;
if (base==16) {
nch = _getch();
if (width>0) width--;
seendigit=0;
}
} else if (base==0)
base = 8;
}
if (base==0)
base=10;
/* throw away leading zeros */
while (width!=0 && nch=='0') {
nch = _getch();
if (width>0) width--;
seendigit=1;
}
/* get first digit. Keep working copy negative, as the
* range of negative numbers in two's complement notation
* is one larger than the range of positive numbers. */
if (width!=0 && char2digit(nch, base)!=-1) {
cur = -char2digit(nch, base);
nch = _getch();
if (width>0) width--;
seendigit=1;
}
/* read until no more digits */
while (width!=0 && (nch!=MSVCRT_EOF) && isdigit(nch)) {
cur = cur*base + char2digit(nch, base);
nch = _getch();
if (width>0) width--;
seendigit=1;
}
/* negate parsed number if non-negative */
if (!negative) cur=-cur;
/* okay, done! */
if (!seendigit) break; /* not a valid number */
st = 1;
if (!suppress) *val = cur;
}
break;
case 'e':
case 'E':
case 'f':
case 'g':
case 'G': { /* read a float */
float*val = suppress ? NULL : va_arg(ap, float*);
float cur = 0;
int negative = 0;
/* skip initial whitespace */
while ((nch!=MSVCRT_EOF) && isspace(nch))
nch = _getch();
/* get sign. */
if (nch == '-' || nch == '+') {
negative = (nch=='-');
if (width>0) width--;
if (width==0) break;
nch = _getch();
}
/* get first digit. */
if (!isdigit(nch)) break;
cur = (nch - '0') * (negative ? -1 : 1);
nch = _getch();
if (width>0) width--;
/* read until no more digits */
while (width!=0 && (nch!=MSVCRT_EOF) && isdigit(nch)) {
cur = cur*10 + (nch - '0');
nch = _getch();
if (width>0) width--;
}
/* handle decimals */
if (width!=0 && nch == '.') {
float dec = 1;
nch = _getch();
if (width>0) width--;
while (width!=0 && (nch!=MSVCRT_EOF) && isdigit(nch)) {
dec /= 10;
cur += dec * (nch - '0');
nch = _getch();
if (width>0) width--;
}
}
/* handle exponent */
if (width!=0 && (nch == 'e' || nch == 'E')) {
int exponent = 0, negexp = 0;
float expcnt;
nch = _getch();
if (width>0) width--;
/* possible sign on the exponent */
if (width!=0 && (nch=='+' || nch=='-')) {
negexp = (nch=='-');
nch = _getch();
if (width>0) width--;
}
/* exponent digits */
while (width!=0 && (nch!=MSVCRT_EOF) && isdigit(nch)) {
exponent *= 10;
exponent += (nch - '0');
nch = _getch();
if (width>0) width--;
}
/* update 'cur' with this exponent. */
expcnt = negexp ? .1 : 10;
while (exponent!=0) {
if (exponent&1)
cur*=expcnt;
exponent/=2;
expcnt=expcnt*expcnt;
}
}
st = 1;
if (!suppress) *val = cur;
}
break;
case 's': { /* read a word */
char*str = suppress ? NULL : va_arg(ap, char*);
char*sptr = str;
/* skip initial whitespace */
while ((nch!=MSVCRT_EOF) && isspace(nch))
nch = _getch();
/* read until whitespace */
while (width!=0 && (nch!=MSVCRT_EOF) && !isspace(nch)) {
if (!suppress) *sptr++ = nch;
st++;
nch = _getch();
if (width>0) width--;
}
/* terminate */
if (!suppress) *sptr = 0;
TRACE("read word: %s\n", str);
}
break;
default: FIXME("unhandled: %%%c\n", *format);
/* From spec: "if a percent sign is followed by a character
* that has no meaning as a format-control character, that
* character and the following characters are treated as
* an ordinary sequence of characters, that is, a sequence
* of characters that must match the input. For example,
* to specify that a percent-sign character is to be input,
* use %%."
* LEAVING AS-IS because we catch bugs better that way. */
}
if (st && !suppress) rd++;
else break;
}
/* a non-white-space character causes scanf to read, but not store,
* a matching non-white-space character. */
else {
/* check for character match */
if (nch == *format)
nch = _getch();
else break;
}
format++;
}
if (nch != MSVCRT_EOF)
_ungetch(nch);
UNLOCK_CONSOLE;
va_end(ap);
TRACE("returning %d\n", rd);
return rd;
}
/*********************************************************************
* _kbhit (MSVCRT.@)
*/
......
......@@ -619,7 +619,7 @@ init MSVCRT_Init
@ cdecl ftell(ptr) MSVCRT_ftell
@ varargs fwprintf(ptr wstr) MSVCRT_fwprintf
@ cdecl fwrite(ptr long long ptr) MSVCRT_fwrite
@ stub fwscanf #(ptr wstr) varargs
@ varargs fwscanf(ptr wstr) MSVCRT_fwscanf
@ cdecl getc(ptr) MSVCRT_getc
@ cdecl getchar() MSVCRT_getchar
@ cdecl getenv(str) MSVCRT_getenv
......@@ -697,7 +697,7 @@ init MSVCRT_Init
@ varargs sprintf(ptr str) sprintf
@ forward -noimport sqrt ntdll.sqrt
@ cdecl srand(long) srand
@ varargs sscanf(str str) sscanf
@ varargs sscanf(str str) MSVCRT_sscanf
@ cdecl strcat(str str) strcat
@ cdecl strchr(str long) strchr
@ cdecl strcmp(str str) strcmp
......@@ -762,6 +762,6 @@ init MSVCRT_Init
@ stub wcsxfrm #(wstr wstr long)
@ cdecl wctomb(ptr long) MSVCRT_wctomb
@ varargs wprintf(wstr) MSVCRT_wprintf
@ stub wscanf #(wstr) varargs
@ varargs wscanf(wstr) MSVCRT_wscanf
@ stub _Gettnames
@ stub __lc_collate_cp
/*
* general implementation of scanf used by scanf, sscanf, fscanf,
* _cscanf, wscanf, swscanf and fwscanf
*
* Copyright 1996,1998 Marcus Meissner
* Copyright 1996 Jukka Iivonen
* Copyright 1997,2000 Uwe Bonnes
* Copyright 2000 Jon Griffiths
* Copyright 2002 Daniel Gudbjartsson
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "winbase.h"
#include "msvcrt.h"
#include "msvcrt/conio.h"
#include "msvcrt/io.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
/* helper function for *scanf. Returns the value of character c in the
* given base, or -1 if the given character is not a digit of the base.
*/
static int char2digit(char c, int base) {
if ((c>='0') && (c<='9') && (c<='0'+base-1)) return (c-'0');
if (base<=10) return -1;
if ((c>='A') && (c<='Z') && (c<='A'+base-11)) return (c-'A'+10);
if ((c>='a') && (c<='z') && (c<='a'+base-11)) return (c-'a'+10);
return -1;
}
/* helper function for *wscanf. Returns the value of character c in the
* given base, or -1 if the given character is not a digit of the base.
*/
static int wchar2digit(WCHAR c, int base) {
if ((c>=L'0') && (c<=L'9') && (c<=L'0'+base-1)) return (c-L'0');
if (base<=10) return -1;
if ((c>=L'A') && (c<=L'Z') && (c<=L'A'+base-11)) return (c-L'A'+10);
if ((c>=L'a') && (c<=L'z') && (c<=L'a'+base-11)) return (c-L'a'+10);
return -1;
}
/*********************************************************************
* fscanf (MSVCRT.@)
*/
#undef WIDE_SCANF
#undef CONSOLE
#undef STRING
#include "scanf.h"
/*********************************************************************
* fwscanf (MSVCRT.@)
*/
#define WIDE_SCANF 1
#undef CONSOLE
#undef STRING
#include "scanf.h"
/*********************************************************************
* sscanf (MSVCRT.@)
*/
#undef WIDE_SCANF
#undef CONSOLE
#define STRING 1
#include "scanf.h"
/*********************************************************************
* swscanf (MSVCRT.@)
*/
#define WIDE_SCANF 1
#undef CONSOLE
#define STRING 1
#include "scanf.h"
/*********************************************************************
* _cscanf (MSVCRT.@)
*/
#undef WIDE_SCANF
#define CONSOLE 1
#undef STRING
#include "scanf.h"
......@@ -206,7 +206,7 @@ MSVCRT(wint_t) MSVCRT(putwc)(MSVCRT(wint_t),MSVCRT(FILE)*);
MSVCRT(wint_t) MSVCRT(putwchar)(MSVCRT(wint_t));
int MSVCRT(putws)(const WCHAR*);
int MSVCRT(swprintf)(WCHAR*,const WCHAR*,...);
int MSVCRT(swscanf)(WCHAR*,const WCHAR*,...);
int MSVCRT(swscanf)(const WCHAR*,const WCHAR*,...);
MSVCRT(wint_t) MSVCRT(ungetwc)(MSVCRT(wint_t),MSVCRT(FILE)*);
int MSVCRT(vfwprintf)(MSVCRT(FILE)*,const WCHAR*,va_list);
int MSVCRT(vswprintf)(WCHAR*,const WCHAR*,va_list);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment