diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | iconv/iconv_prog.c | 12 |
2 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 5b62762f24..cc033e6be1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 diff --git a/iconv/iconv_prog.c b/iconv/iconv_prog.c index 52ae589b37..5b3d35ecaa 100644 --- a/iconv/iconv_prog.c +++ b/iconv/iconv_prog.c @@ -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, |