Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
* libio/stdio.h (vscanf): Fix -std=c99 redirect.
* stdio-common/Makefile (tests): Add scanf16 and scanf17. (CFLAGS-scanf17.c): New. * stdio-common/scanf14.c (main): Add fscanf and scanf tests. * stdio-common/scanf15.c (main): Likewise. * stdio-common/scanf16.c: New test. * stdio-common/scanf17.c: New test. 2008-05-24 Jakub Jelinek <jakub@redhat.com> * libio/stdio.h (vscanf): Fix -std=c99 redirect. * stdio-common/Makefile (tests): Add scanf16 and scanf17. (CFLAGS-scanf17.c): New. * stdio-common/scanf14.c (main): Add fscanf and scanf tests. * stdio-common/scanf15.c (main): Likewise. * stdio-common/scanf16.c: New test. * stdio-common/scanf17.c: New test.
- Loading branch information
Jakub Jelinek
committed
May 24, 2008
1 parent
e200388
commit ad8a551
Showing
7 changed files
with
387 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,147 @@ | ||
#include <stdarg.h> | ||
#include <stdio.h> | ||
#include <stdlib.h> | ||
#include <string.h> | ||
#include <wchar.h> | ||
|
||
#define FAIL() \ | ||
do { \ | ||
result = 1; \ | ||
printf ("test at line %d failed\n", __LINE__); \ | ||
} while (0) | ||
|
||
static int | ||
xsscanf (const char *str, const char *fmt, ...) | ||
{ | ||
va_list ap; | ||
va_start (ap, fmt); | ||
int ret = vsscanf (str, fmt, ap); | ||
va_end (ap); | ||
return ret; | ||
} | ||
|
||
static int | ||
xscanf (const char *fmt, ...) | ||
{ | ||
va_list ap; | ||
va_start (ap, fmt); | ||
int ret = vscanf (fmt, ap); | ||
va_end (ap); | ||
return ret; | ||
} | ||
|
||
static int | ||
xfscanf (FILE *f, const char *fmt, ...) | ||
{ | ||
va_list ap; | ||
va_start (ap, fmt); | ||
int ret = vfscanf (f, fmt, ap); | ||
va_end (ap); | ||
return ret; | ||
} | ||
|
||
int | ||
main (void) | ||
{ | ||
wchar_t *lsp; | ||
char *sp; | ||
float f; | ||
double d; | ||
char c[8]; | ||
int result = 0; | ||
|
||
if (xsscanf (" 0.25s x", "%e%3c", &f, c) != 2) | ||
FAIL (); | ||
else if (f != 0.25 || memcmp (c, "s x", 3) != 0) | ||
FAIL (); | ||
if (xsscanf (" 1.25s x", "%as%2c", &sp, c) != 2) | ||
FAIL (); | ||
else | ||
{ | ||
if (strcmp (sp, "1.25s") != 0 || memcmp (c, " x", 2) != 0) | ||
FAIL (); | ||
memset (sp, 'x', sizeof "1.25s"); | ||
free (sp); | ||
} | ||
if (xsscanf (" 2.25s x", "%las%2c", &d, c) != 2) | ||
FAIL (); | ||
else if (d != 2.25 || memcmp (c, " x", 2) != 0) | ||
FAIL (); | ||
if (xsscanf (" 3.25S x", "%4aS%3c", &lsp, c) != 2) | ||
FAIL (); | ||
else | ||
{ | ||
if (wcscmp (lsp, L"3.25") != 0 || memcmp (c, "S x", 3) != 0) | ||
FAIL (); | ||
memset (lsp, 'x', sizeof L"3.25"); | ||
free (lsp); | ||
} | ||
if (xsscanf ("4.25[0-9.] x", "%a[0-9.]%8c", &sp, c) != 2) | ||
FAIL (); | ||
else | ||
{ | ||
if (strcmp (sp, "4.25") != 0 || memcmp (c, "[0-9.] x", 8) != 0) | ||
FAIL (); | ||
memset (sp, 'x', sizeof "4.25"); | ||
free (sp); | ||
} | ||
if (xsscanf ("5.25[0-9.] x", "%la[0-9.]%2c", &d, c) != 2) | ||
FAIL (); | ||
else if (d != 5.25 || memcmp (c, " x", 2) != 0) | ||
FAIL (); | ||
|
||
const char *tmpdir = getenv ("TMPDIR"); | ||
if (tmpdir == NULL || tmpdir[0] == '\0') | ||
tmpdir = "/tmp"; | ||
|
||
char fname[strlen (tmpdir) + sizeof "/tst-scanf16.XXXXXX"]; | ||
sprintf (fname, "%s/tst-scanf16.XXXXXX", tmpdir); | ||
if (fname == NULL) | ||
FAIL (); | ||
|
||
/* Create a temporary file. */ | ||
int fd = mkstemp (fname); | ||
if (fd == -1) | ||
FAIL (); | ||
|
||
FILE *fp = fdopen (fd, "w+"); | ||
if (fp == NULL) | ||
FAIL (); | ||
else | ||
{ | ||
if (fputs (" 1.25s x", fp) == EOF) | ||
FAIL (); | ||
if (fseek (fp, 0, SEEK_SET) != 0) | ||
FAIL (); | ||
if (xfscanf (fp, "%as%2c", &sp, c) != 2) | ||
FAIL (); | ||
else | ||
{ | ||
if (strcmp (sp, "1.25s") != 0 || memcmp (c, " x", 2) != 0) | ||
FAIL (); | ||
memset (sp, 'x', sizeof "1.25s"); | ||
free (sp); | ||
} | ||
|
||
if (freopen (fname, "r", stdin) == NULL) | ||
FAIL (); | ||
else | ||
{ | ||
if (xscanf ("%as%2c", &sp, c) != 2) | ||
FAIL (); | ||
else | ||
{ | ||
if (strcmp (sp, "1.25s") != 0 || memcmp (c, " x", 2) != 0) | ||
FAIL (); | ||
memset (sp, 'x', sizeof "1.25s"); | ||
free (sp); | ||
} | ||
} | ||
|
||
fclose (fp); | ||
} | ||
|
||
remove (fname); | ||
|
||
return result; | ||
} |
Oops, something went wrong.