fix %ls breakage in last printf fix

signedness issue kept %ls with no precision from working at all
This commit is contained in:
Rich Felker 2012-06-08 10:36:43 -04:00
parent 6e9ff6a4cf
commit 63d40196b9
1 changed files with 2 additions and 2 deletions

View File

@ -599,12 +599,12 @@ static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg,
p = -1; p = -1;
case 'S': case 'S':
ws = arg.p; ws = arg.p;
for (i=l=0; i<p && *ws && (l=wctomb(mb, *ws++))>=0 && l<=0U+p-i; i+=l); for (i=l=0; i<0U+p && *ws && (l=wctomb(mb, *ws++))>=0 && l<=0U+p-i; i+=l);
if (l<0) return -1; if (l<0) return -1;
p = i; p = i;
pad(f, ' ', w, p, fl); pad(f, ' ', w, p, fl);
ws = arg.p; ws = arg.p;
for (i=0; i<p && *ws && i+(l=wctomb(mb, *ws++))<=p; i+=l) for (i=0; i<0U+p && *ws && i+(l=wctomb(mb, *ws++))<=p; i+=l)
out(f, mb, l); out(f, mb, l);
pad(f, ' ', w, p, fl^LEFT_ADJ); pad(f, ' ', w, p, fl^LEFT_ADJ);
l = w>p ? w : p; l = w>p ? w : p;