Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-13 21:44:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Return EXIT_FAILURE in printf builtin if conversion to number fails

Browse source
This commit is contained in:
Siteshwar Vashisht 2013-03-04 23:25:14 +05:30
parent 97c9c9c9d1
commit 42be7733fe
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
builtin_printf.cpp
View file

@ -68,6 +68,8 @@
# define PRIdMAX L"ld"
static int exit_code;
/* True if the POSIXLY_CORRECT environment variable is set. */
static bool posixly_correct;
@ -120,6 +122,7 @@ static void verify_numeric (const wchar_t *s, const wchar_t *end)
if (errno)
{
append_format(stderr_buffer, L"%ls", s);
exit_code = EXIT_FAILURE;
}
else if (*end)
{
@ -127,6 +130,7 @@ static void verify_numeric (const wchar_t *s, const wchar_t *end)
append_format(stderr_buffer, _(L"%ls: expected a numeric value"), s);
else
append_format(stderr_buffer, _(L"%ls: value not completely converted"), s);
exit_code = EXIT_FAILURE;
}
}
@ -175,7 +179,7 @@ print_esc_char (wchar_t c)
append_format(stdout_buffer, L"%lc", L'\b');
break;
case L'c': /* Cancel the rest of the output. */
exit (EXIT_SUCCESS);
return;
break;
case L'f': /* Form feed. */
append_format(stdout_buffer, L"%lc", L'\f');
@ -610,6 +614,8 @@ static int builtin_printf(parser_t &parser, wchar_t **argv)
int args_used;
int argc = builtin_count_args(argv);
exit_code = EXIT_SUCCESS;
if (argc <= 1)
{
append_format(stderr_buffer, _(L"missing operand"));
@ -627,5 +633,5 @@ static int builtin_printf(parser_t &parser, wchar_t **argv)
argv += args_used;
}
while (args_used > 0 && argc > 0);
return 0;
return exit_code;
}