xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix awk format printing bugs (thanks aiju)

Browse source
This commit is contained in:
spew 2016-08-18 08:52:58 -05:00
parent 713beb6d42
commit db7d1ed2b1
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sys/src/cmd/awk/run.c
View file

@ -895,18 +895,21 @@ int format(char **pbuf, int *pbufsize, char *s, Node *a) /* printf-like conversi
case 'd': case 'i': case 'd': case 'i':
flag = 2; flag = 2;
if(*(s-1) == 'l') break; if(*(s-1) == 'l') break;
*(t-1) = 'l'; t[-1] = 'l';
*t = 'd'; *t = 'd';
*++t = '\0'; *++t = '\0';
break; break;
case 'u': case 'u':
flag = *(s-1) == 'l' ? 2 : 3; flag = *(s-1) == 'l' ? 2 : 3;
*t++ = 'u'; t[-1] = 'u';
*t++ = 'd'; *t++ = 'd';
*t = '\0'; *t = '\0';
break; break;
case 'o': case 'x': case 'X': case 'o': case 'x': case 'X':
flag = *(s-1) == 'l' ? 2 : 3; flag = *(s-1) == 'l' ? 2 : 3;
t[-1] = 'u';
*t++ = *s;
*t = '\0';
break; break;
case 's': case 's':
flag = 4; flag = 4;
@ -939,7 +942,7 @@ int format(char **pbuf, int *pbufsize, char *s, Node *a) /* printf-like conversi
break; break;
case 1: sprint(p, fmt, getfval(x)); break; case 1: sprint(p, fmt, getfval(x)); break;
case 2: sprint(p, fmt, (long) getfval(x)); break; case 2: sprint(p, fmt, (long) getfval(x)); break;
case 3: sprint(p, fmt, (int) getfval(x)); break; case 3: sprint(p, fmt, (int) getfval(x)); break;
case 4: case 4:
t = getsval(x); t = getsval(x);
n = strlen(t); n = strlen(t);