projects
/
oweals
/
musl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix failure of wide printf/scanf functions to set wide orientation
[oweals/musl.git]
/
src
/
stdio
/
vfwprintf.c
diff --git
a/src/stdio/vfwprintf.c
b/src/stdio/vfwprintf.c
index 3557678f455d0189a169e5589b52c143e2d0b5b5..c6400591a01ac7d6e257721eb0ed19b4f3a5a556 100644
(file)
--- a/
src/stdio/vfwprintf.c
+++ b/
src/stdio/vfwprintf.c
@@
-253,7
+253,6
@@
static int wprintf_core(FILE *f, const wchar_t *fmt, va_list *ap, union arg *nl_
/* Check validity of argument type (nl/normal) */
if (st==NOARG) {
if (argpos>=0) return -1;
/* Check validity of argument type (nl/normal) */
if (st==NOARG) {
if (argpos>=0) return -1;
- else if (!f) continue;
} else {
if (argpos>=0) nl_type[argpos]=st, arg=nl_arg[argpos];
else if (f) pop_arg(&arg, st, ap);
} else {
if (argpos>=0) nl_type[argpos]=st, arg=nl_arg[argpos];
else if (f) pop_arg(&arg, st, ap);
@@
-287,8
+286,7
@@
static int wprintf_core(FILE *f, const wchar_t *fmt, va_list *ap, union arg *nl_
case 'S':
a = arg.p;
z = wmemchr(a, 0, p);
case 'S':
a = arg.p;
z = wmemchr(a, 0, p);
- if (!z) z=a+p;
- else p=z-a;
+ if (z) p=z-a;
if (w<p) w=p;
if (!(fl&LEFT_ADJ)) fprintf(f, "%.*s", w-p, "");
out(f, a, p);
if (w<p) w=p;
if (!(fl&LEFT_ADJ)) fprintf(f, "%.*s", w-p, "");
out(f, a, p);
@@
-349,10
+347,15
@@
int vfwprintf(FILE *restrict f, const wchar_t *restrict fmt, va_list ap)
union arg nl_arg[NL_ARGMAX];
int ret;
union arg nl_arg[NL_ARGMAX];
int ret;
+ /* the copy allows passing va_list* even if va_list is an array */
va_copy(ap2, ap);
va_copy(ap2, ap);
- if (wprintf_core(0, fmt, &ap2, nl_arg, nl_type) < 0) return -1;
+ if (wprintf_core(0, fmt, &ap2, nl_arg, nl_type) < 0) {
+ va_end(ap2);
+ return -1;
+ }
FLOCK(f);
FLOCK(f);
+ f->mode |= f->mode+1;
ret = wprintf_core(f, fmt, &ap2, nl_arg, nl_type);
FUNLOCK(f);
va_end(ap2);
ret = wprintf_core(f, fmt, &ap2, nl_arg, nl_type);
FUNLOCK(f);
va_end(ap2);