Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-06-13 18:29:34 +00:00
Code Issues Projects Releases Wiki Activity

printf: fix exit code on conversion error

Browse Source 
Signed-off-by: Colin Watson <cjwatson@ubuntu.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2009-06-18 22:22:04 +02:00
parent c9f280cc46
commit bf4aeed129
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
coreutils/printf.c
View File

@ -53,10 +53,7 @@
* (but negative numbers are not "bad"). * (but negative numbers are not "bad").
* Both accept negative numbers for %u specifier. * Both accept negative numbers for %u specifier.
* *
* We try to be compatible. We are not compatible here: * We try to be compatible.
* - we do not accept -NUM for %u
* - exit code is 0 even if "invalid number" was seen (FIXME)
* See "if (errno)" checks in the code below.
*/ */
typedef void FAST_FUNC (*converter)(const char *arg, void *result); typedef void FAST_FUNC (*converter)(const char *arg, void *result);
@ -163,7 +160,6 @@ static void print_direc(char *format, unsigned fmt_length,
case 'i': case 'i':
llv = my_xstrtoll(argument); llv = my_xstrtoll(argument);
print_long: print_long:
/* if (errno) return; - see comment at the top */
if (!have_width) { if (!have_width) {
if (!have_prec) if (!have_prec)
printf(format, llv); printf(format, llv);
@ -210,7 +206,6 @@ static void print_direc(char *format, unsigned fmt_length,
case 'g': case 'g':
case 'G': case 'G':
dv = my_xstrtod(argument); dv = my_xstrtod(argument);
/* if (errno) return; */
if (!have_width) { if (!have_width) {
if (!have_prec) if (!have_prec)
printf(format, dv); printf(format, dv);
@ -241,7 +236,7 @@ static int get_width_prec(const char *str)
/* Print the text in FORMAT, using ARGV for arguments to any '%' directives. /* Print the text in FORMAT, using ARGV for arguments to any '%' directives.
Return advanced ARGV. */ Return advanced ARGV. */
static char **print_formatted(char *f, char **argv) static char **print_formatted(char *f, char **argv, int *conv_err)
{ {
char *direc_start; /* Start of % directive. */ char *direc_start; /* Start of % directive. */
unsigned direc_length; /* Length of % directive. */ unsigned direc_length; /* Length of % directive. */
@ -299,8 +294,8 @@ static char **print_formatted(char *f, char **argv)
/* Remove "lLhz" size modifiers, repeatedly. /* Remove "lLhz" size modifiers, repeatedly.
* bash does not like "%lld", but coreutils * bash does not like "%lld", but coreutils
* would happily take even "%Llllhhzhhzd"! * happily takes even "%Llllhhzhhzd"!
* We will be permissive like coreutils */ * We are permissive like coreutils */
while ((*f | 0x20) == 'l' || *f == 'h' || *f == 'z') { while ((*f | 0x20) == 'l' || *f == 'h' || *f == 'z') {
overlapping_strcpy(f, f + 1); overlapping_strcpy(f, f + 1);
} }
@ -330,12 +325,12 @@ static char **print_formatted(char *f, char **argv)
} }
if (*argv) { if (*argv) {
print_direc(direc_start, direc_length, field_width, print_direc(direc_start, direc_length, field_width,
precision, *argv); precision, *argv++);
++argv;
} else { } else {
print_direc(direc_start, direc_length, field_width, print_direc(direc_start, direc_length, field_width,
precision, ""); precision, "");
} }
*conv_err |= errno;
free(p); free(p);
} }
break; break;
@ -356,6 +351,7 @@ static char **print_formatted(char *f, char **argv)
int printf_main(int argc UNUSED_PARAM, char **argv) int printf_main(int argc UNUSED_PARAM, char **argv)
{ {
int conv_err;
char *format; char *format;
char **argv2; char **argv2;
@ -392,9 +388,10 @@ int printf_main(int argc UNUSED_PARAM, char **argv)
format = argv[1]; format = argv[1];
argv2 = argv + 2; argv2 = argv + 2;
conv_err = 0;
do { do {
argv = argv2; argv = argv2;
argv2 = print_formatted(format, argv); argv2 = print_formatted(format, argv, &conv_err);
} while (argv2 > argv && *argv2); } while (argv2 > argv && *argv2);
/* coreutils compat (bash doesn't do this): /* coreutils compat (bash doesn't do this):
@ -402,5 +399,6 @@ int printf_main(int argc UNUSED_PARAM, char **argv)
fprintf(stderr, "excess args ignored"); fprintf(stderr, "excess args ignored");
*/ */
return (argv2 < argv); /* if true, print_formatted errored out */ return (argv2 < argv) /* if true, print_formatted errored out */
|| conv_err; /* print_formatted saw invalid number */
} }

3
testsuite/printf.tests
View File

@ -87,13 +87,12 @@ testing "printf understands %Ld" \
# "1\n""printf: -2: invalid number\n""0\n""3\n""0\n" \ # "1\n""printf: -2: invalid number\n""0\n""3\n""0\n" \
# "" "" # "" ""
# Actually, we are wrong here: exit code should be 1
testing "printf handles %d bad_input" \ testing "printf handles %d bad_input" \
"${bb}printf '%d\n' 1 - 2 bad 3 123bad 4 2>&1; echo \$?" \ "${bb}printf '%d\n' 1 - 2 bad 3 123bad 4 2>&1; echo \$?" \
"1\n""printf: -: invalid number\n""0\n"\ "1\n""printf: -: invalid number\n""0\n"\
"2\n""printf: bad: invalid number\n""0\n"\ "2\n""printf: bad: invalid number\n""0\n"\
"3\n""printf: 123bad: invalid number\n""0\n"\ "3\n""printf: 123bad: invalid number\n""0\n"\
"4\n""0\n" \ "4\n""1\n" \
"" "" "" ""
testing "printf aborts on bare %" \ testing "printf aborts on bare %" \