projects
/
musl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e0d9f78
)
fix wide scanf to respect field width for strings
author
Rich Felker
<dalias@aerifal.cx>
Tue, 17 Apr 2012 23:37:31 +0000
(19:37 -0400)
committer
Rich Felker
<dalias@aerifal.cx>
Tue, 17 Apr 2012 23:37:31 +0000
(19:37 -0400)
src/stdio/vfwscanf.c
patch
|
blob
|
history
diff --git
a/src/stdio/vfwscanf.c
b/src/stdio/vfwscanf.c
index
4426a12
..
92b7fa4
100644
(file)
--- a/
src/stdio/vfwscanf.c
+++ b/
src/stdio/vfwscanf.c
@@
-83,7
+83,7
@@
static int in_set(const wchar_t *set, int c)
#undef ungetwc
#define ungetwc(c,f) \
#undef ungetwc
#define ungetwc(c,f) \
- ((f)->rend && (c)<128 ? *--(f)->rpos : ungetwc((c),(f)))
+ ((f)->rend && (c)<128
U
? *--(f)->rpos : ungetwc((c),(f)))
#endif
int vfwscanf(FILE *f, const wchar_t *fmt, va_list ap)
#endif
int vfwscanf(FILE *f, const wchar_t *fmt, va_list ap)
@@
-215,19
+215,22
@@
int vfwscanf(FILE *f, const wchar_t *fmt, va_list ap)
case 's':
s = dest;
case 's':
s = dest;
- while (!iswspace(c=getwc(f)) && c!=EOF) {
+ while (
width &&
!iswspace(c=getwc(f)) && c!=EOF) {
int l = wctomb(s?s:tmp, c);
if (l<0) goto input_fail;
if (s) s+=l;
pos++;
int l = wctomb(s?s:tmp, c);
if (l<0) goto input_fail;
if (s) s+=l;
pos++;
+ width--;
}
}
+ if (width) ungetwc(c, f);
if (s) *s = 0;
break;
case 'S':
wcs = dest;
if (s) *s = 0;
break;
case 'S':
wcs = dest;
- while (!iswspace(c=getwc(f)) && c!=EOF)
- pos++, *wcs++ = c;
+ while (width && !iswspace(c=getwc(f)) && c!=EOF)
+ width--, pos++, *wcs++ = c;
+ if (width) ungetwc(c, f);
if (wcs) *wcs = 0;
break;
if (wcs) *wcs = 0;
break;