/* Transform ls,lc -> S,C */
if (size==SIZE_l && (t&15)==3) t&=~32;
- if (t != 'n' && t != '[' && (t|32) != 'c') {
- while (iswspace((c=getwc(f)))) pos++;
+ if (t != 'n') {
+ if (t != '[' && (t|32) != 'c')
+ while (iswspace((c=getwc(f)))) pos++;
+ else
+ c=getwc(f);
if (c < 0) goto input_fail;
ungetwc(c, f);
}
break;
case 's':
+ if (width < 1) width = -1;
s = dest;
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++;
- width--;
+ width-=(width>0);
}
if (width) ungetwc(c, f);
if (s) *s = 0;
case 'S':
wcs = dest;
+ if (width < 1) width = -1;
while (width && !iswspace(c=getwc(f)) && c!=EOF)
- width--, pos++, *wcs++ = c;
+ width-=(width>0), pos++, *wcs++ = c;
if (width) ungetwc(c, f);
if (wcs) *wcs = 0;
break;
int gotmatch = 0;
+ if (width < 1) width = -1;
+
while (width) {
if ((c=getwc(f))<0) break;
if (in_set(p, c) == invert)
if (s) s+=l;
}
pos++;
- width--;
+ width-=(width>0);
gotmatch=1;
}
if (width) ungetwc(c, f);