fbt/sbase
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix parameter-usage in printf(1)

Browse Source 
1) Don't default to a space for numeric conversions. Instead,
   set flag to 0 and work with it on a case-basis.
   This fixes the wrong output of "printf %d 20" which had a
   space prepended to it (" 20").
2) Add precision for doiuxX, which is zero-padding.
   This fixes the wrong output of "printf %.5d 20" to properly
   print "00020".

Thanks to emg for reporting these!
This commit is contained in:
FRIGN 2015-06-21 15:52:21 +02:00 committed by sin
parent 6e7cbdd918
commit d848bcac4b
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
printf.c
View File

@ -49,8 +49,8 @@ main(int argc, char *argv[])
} }
/* flag */ /* flag */
for (flag = ' ', i++; strchr("#-+ 0", format[i]); i++) { for (flag = '\0', i++; strchr("#-+ 0", format[i]); i++) {
flag = format[i]; if (!flag) flag = format[i];
} }
/* field width */ /* field width */
@ -135,18 +135,21 @@ main(int argc, char *argv[])
rarg = ereallocarray(NULL, utflen(arg) + 1, sizeof(*rarg)); rarg = ereallocarray(NULL, utflen(arg) + 1, sizeof(*rarg));
utftorunestr(arg, rarg); utftorunestr(arg, rarg);
num = rarg[0]; num = rarg[0];
} else } else {
num = (strlen(arg) > 0) ? estrtonum(arg, LLONG_MIN, LLONG_MAX) : 0; num = (strlen(arg) > 0) ? estrtonum(arg, LLONG_MIN, LLONG_MAX) : 0;
fmt = estrdup("%#*ll#"); }
fmt = estrdup(flag ? "%#*.*ll#" : "%*.*ll#");
if (flag)
fmt[1] = flag; fmt[1] = flag;
fmt[5] = format[i]; fmt[flag ? 7 : 6] = format[i];
printf(fmt, width, num); printf(fmt, width, precision, num);
free(fmt); free(fmt);
break; break;
case 'a': case 'A': case 'e': case 'E': case 'f': case 'F': case 'g': case 'G': case 'a': case 'A': case 'e': case 'E': case 'f': case 'F': case 'g': case 'G':
fmt = estrdup("%#*.*#"); fmt = estrdup(flag ? "%#*.*#" : "%*.*#");
if (flag)
fmt[1] = flag; fmt[1] = flag;
fmt[5] = format[i]; fmt[flag ? 5 : 4] = format[i];
dou = (strlen(arg) > 0) ? estrtod(arg) : 0; dou = (strlen(arg) > 0) ? estrtod(arg) : 0;
printf(fmt, width, precision, dou); printf(fmt, width, precision, dou);
free(fmt); free(fmt);