summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2013-06-06 00:26:17 -0400
committerRich Felker <dalias@aerifal.cx>2013-06-06 00:26:17 -0400
commite039db27c2b4298470861c57535eb91a3eb3b1a6 (patch)
tree625787f3fcaa626062961335da936b8be67a43b7
parent16a1e0365d83c387d0dddd3c127ac7c8dcdf17fc (diff)
downloadmusl-e039db27c2b4298470861c57535eb91a3eb3b1a6.tar.gz
musl-e039db27c2b4298470861c57535eb91a3eb3b1a6.tar.bz2
musl-e039db27c2b4298470861c57535eb91a3eb3b1a6.tar.xz
musl-e039db27c2b4298470861c57535eb91a3eb3b1a6.zip
implement 'm' modifier for wide scanf variants
-rw-r--r--src/stdio/vfwscanf.c47
1 files changed, 40 insertions, 7 deletions
diff --git a/src/stdio/vfwscanf.c b/src/stdio/vfwscanf.c
index 45de3372..b1eb7939 100644
--- a/src/stdio/vfwscanf.c
+++ b/src/stdio/vfwscanf.c
@@ -103,6 +103,7 @@ int vfwscanf(FILE *restrict f, const wchar_t *restrict fmt, va_list ap)
static const char size_pfx[][3] = { "hh", "h", "", "l", "L", "ll" };
char tmp[3*sizeof(int)+10];
const wchar_t *set;
+ size_t i, k;
FLOCK(f);
@@ -140,7 +141,7 @@ int vfwscanf(FILE *restrict f, const wchar_t *restrict fmt, va_list ap)
}
if (*p=='m') {
- alloc = 1;
+ alloc = !!dest;
p++;
} else {
alloc = 0;
@@ -233,16 +234,39 @@ int vfwscanf(FILE *restrict f, const wchar_t *restrict fmt, va_list ap)
if (width < 1) width = -1;
+ i = 0;
+ if (alloc) {
+ k = t=='c' ? width+1U : 31;
+ if (size == SIZE_l) {
+ wcs = malloc(k*sizeof(wchar_t));
+ if (!wcs) goto alloc_fail;
+ } else {
+ s = malloc(k);
+ if (!s) goto alloc_fail;
+ }
+ }
while (width) {
if ((c=getwc(f))<0) break;
if (in_set(set, c) == invert)
break;
if (wcs) {
- *wcs++ = c;
+ wcs[i++] = c;
+ if (alloc && i==k) {
+ k += k+1;
+ wchar_t *tmp = realloc(wcs, k*sizeof(wchar_t));
+ if (!tmp) goto alloc_fail;
+ wcs = tmp;
+ }
} else if (size != SIZE_l) {
- int l = wctomb(s?s:tmp, c);
+ int l = wctomb(s?s+i:tmp, c);
if (l<0) goto input_fail;
- if (s) s+=l;
+ i += l;
+ if (alloc && i > k-4) {
+ k += k+1;
+ char *tmp = realloc(s, k);
+ if (!tmp) goto alloc_fail;
+ s = tmp;
+ }
}
pos++;
width-=(width>0);
@@ -253,8 +277,12 @@ int vfwscanf(FILE *restrict f, const wchar_t *restrict fmt, va_list ap)
if (t == 'c' || !gotmatch) goto match_fail;
}
- if (wcs) *wcs++ = 0;
- if (s) *s++ = 0;
+ if (alloc) {
+ if (size == SIZE_l) *(wchar_t **)dest = wcs;
+ else *(char **)dest = s;
+ }
+ if (wcs) wcs[i] = 0;
+ if (s) s[i] = 0;
break;
case 'd': case 'i': case 'o': case 'u': case 'x':
@@ -279,10 +307,15 @@ int vfwscanf(FILE *restrict f, const wchar_t *restrict fmt, va_list ap)
}
if (0) {
fmt_fail:
+alloc_fail:
input_fail:
if (!matches) matches--;
- }
match_fail:
+ if (alloc) {
+ free(s);
+ free(wcs);
+ }
+ }
FUNLOCK(f);
return matches;
}