From: Ulrich Drepper <drepper@redhat.com>
Date: Mon, 7 Feb 2005 23:20:05 +0000 (+0000)
Subject: * iconv/iconv_prog.c (main): Provide more help in case on an error.
X-Git-Tag: upstream/2.20~9935
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dd1e8878722d0a270f6aecdfeb7374d310f36519;p=platform%2Fupstream%2Flinaro-glibc.git

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

diff --git a/ChangeLog b/ChangeLog
index 5b62762..cc033e6 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 52ae589..5b3d35e 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,