d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

printf(1): warn about incomplete uses n$

Browse Source 
Reviewed by:	jilles
Obtained from:	Illumos
MFC after:	2 weeks
This commit is contained in:
Pedro F. Giffuni 2014-05-26 14:57:47 +00:00
parent eb0a187849
commit 4aa1792423
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
usr.bin/printf/printf.c
View File

@ -244,11 +244,11 @@ printf_doformat(char *fmt, int *rval)
/* save format argument */ /* save format argument */
fargv = gargv; fargv = gargv;
} else { } else {
fargv = NULL; fargv = NULL;
} }
/* skip to field width */ /* skip to field width */
while (strchr(skip1, *fmt) != NULL) { while (*fmt && strchr(skip1, *fmt) != NULL) {
*dptr++ = *fmt++; *dptr++ = *fmt++;
*dptr = 0; *dptr = 0;
} }
@ -259,12 +259,19 @@ printf_doformat(char *fmt, int *rval)
l = strspn(fmt, digits); l = strspn(fmt, digits);
if ((l > 0) && (fmt[l] == '$')) { if ((l > 0) && (fmt[l] == '$')) {
int idx = atoi(fmt); int idx = atoi(fmt);
if (fargv == NULL) {
warnx("incomplete use of n$");
return (NULL);
}
if (idx <= myargc) { if (idx <= myargc) {
gargv = &myargv[idx - 1]; gargv = &myargv[idx - 1];
} else { } else {
gargv = &myargv[myargc]; gargv = &myargv[myargc];
} }
fmt += l + 1; fmt += l + 1;
} else if (fargv != NULL) {
warnx("incomplete use of n$");
return (NULL);
} }
if (getint(&fieldwidth)) if (getint(&fieldwidth))
@ -296,12 +303,19 @@ printf_doformat(char *fmt, int *rval)
l = strspn(fmt, digits); l = strspn(fmt, digits);
if ((l > 0) && (fmt[l] == '$')) { if ((l > 0) && (fmt[l] == '$')) {
int idx = atoi(fmt); int idx = atoi(fmt);
if (fargv == NULL) {
warnx("incomplete use of n$");
return (NULL);
}
if (idx <= myargc) { if (idx <= myargc) {
gargv = &myargv[idx - 1]; gargv = &myargv[idx - 1];
} else { } else {
gargv = &myargv[myargc]; gargv = &myargv[myargc];
} }
fmt += l + 1; fmt += l + 1;
} else if (fargv != NULL) {
warnx("incomplete use of n$");
return (NULL);
} }
if (getint(&precision)) if (getint(&precision))