ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcrt: If we're at EOF in the buffer and we have pattern %n in format string we should not count the EOF in the total.

This commit is contained in:
Alasdair Sinclair 2007-01-17 04:14:27 +00:00 committed by Alexandre Julliard
parent 9d70a6ee2c
commit 8137c094fd
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/msvcrt/scanf.h
View File

@ -415,7 +415,7 @@ _FUNCTION_ {
case 'n': { case 'n': {
if (!suppress) { if (!suppress) {
int*n = va_arg(ap, int*); int*n = va_arg(ap, int*);
*n = consumed - (nch!=_EOF_); *n = consumed - 1;
} }
/* This is an odd one: according to the standard, /* This is an odd one: according to the standard,
* "Execution of a %n directive does not increment the * "Execution of a %n directive does not increment the

6
dlls/msvcrt/tests/scanf.c
View File

@ -162,6 +162,12 @@ static void test_sscanf( void )
ok(strcmp(buffer1,"def")==0, "Second %%s read incorrectly: %s\n", buffer1); ok(strcmp(buffer1,"def")==0, "Second %%s read incorrectly: %s\n", buffer1);
ok(number_so_far==6, "%%n yielded wrong result: %d\n", number_so_far); ok(number_so_far==6, "%%n yielded wrong result: %d\n", number_so_far);
ok(ret == 2, "%%n shouldn't count as a conversion: %d\n", ret); ok(ret == 2, "%%n shouldn't count as a conversion: %d\n", ret);
/* Check where %n matches to EOF in buffer */
strcpy(buffer, "3:45");
ret = sscanf(buffer, "%d:%d%n", &hour, &min, &number_so_far);
ok(ret == 2, "Wrong number of arguments read: %d\n", ret);
ok(number_so_far == 4, "%%n yielded wrong result: %d\n", number_so_far);
} }
START_TEST(scanf) START_TEST(scanf)