OpenE2K/glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* iconv/iconv_prog.c (main): Provide more help in case on an error.

Browse Source
This commit is contained in:
Ulrich Drepper 2005-02-07 23:20:05 +00:00
parent 6aa10807fc
commit dd1e887872
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2005-02-07 Ulrich Drepper <drepper@redhat.com>
* iconv/iconv_prog.c (main): Provide more help in case on an error.
2005-02-07 Jakub Jelinek <jakub@redhat.com>
* nscd/nscd.c (termination_handler): Avoid segfault if some database

12
iconv/iconv_prog.c
View File

@ -239,26 +239,30 @@ main (int argc, char *argv[])
if (from_wrong)
{
if (to_wrong)
error (EXIT_FAILURE, 0,
error (0, 0,
_("\
conversion from `%s' and to `%s' are not supported"),
from_pretty, to_pretty);
else
error (EXIT_FAILURE, 0,
error (0, 0,
_("conversion from `%s' is not supported"),
from_pretty);
}
else
{
if (to_wrong)
error (EXIT_FAILURE, 0,
error (0, 0,
_("conversion to `%s' is not supported"),
to_pretty);
else
error (EXIT_FAILURE, 0,
error (0, 0,
_("conversion from `%s' to `%s' is not supported"),
from_pretty, to_pretty);
}
argp_help (&argp, stderr, ARGP_HELP_SEE,
program_invocation_short_name);
exit (1);
}
else
error (EXIT_FAILURE, errno,