[PATCH] debugedit: fix exit status in case of wrong number of arguments

[PATCH] debugedit: fix exit status in case of wrong number of arguments

[Dmitry V. Levin]

Print error diagnostics to stderr and exit with status EXIT_FAILURE
when the number of arguments is not equal to 1.

* tools/debugedit.c (usage): Add "error" argument, print usageText
to stderr and exit with status EXIT_FAILURE if error is set to true.
All callers updated.
* tests/debugedit.at: Check debugedit usage.

Fixes: 5200953d5a65 ("Initial build system. Remove rpm and popt dependencies.")
Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
---
 tests/debugedit.at | 10 ++++++++++
 tools/debugedit.c  | 12 ++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/tests/debugedit.at b/tests/debugedit.at
index a78180e..fb55574 100644
--- a/tests/debugedit.at
+++ b/tests/debugedit.at
@@ -60,6 +60,16 @@ AT_KEYWORDS([debuginfo] [debugedit])
 AT_CHECK([debugedit --help],[0],[ignore],[ignore])
 AT_CLEANUP
 
+# ===
+# Check debugedit usage.
+# ===
+AT_SETUP([debugedit usage])
+AT_KEYWORDS([debuginfo] [debugedit])
+AT_CHECK([debugedit --usage],[0],[ignore],[])
+AT_CHECK([debugedit],[1],[],[ignore])
+AT_CHECK([debugedit . ..],[1],[],[ignore])
+AT_CLEANUP
+
 # ===
 # Make sure that an executable still runs after debugedit munged it.
 # ===
diff --git a/tools/debugedit.c b/tools/debugedit.c
index 68e85df..7c57e16 100644
--- a/tools/debugedit.c
+++ b/tools/debugedit.c
@@ -3061,10 +3061,11 @@ help (const char *progname, bool error)
 }
 
 static void
-usage (const char *progname)
+usage (const char *progname, bool error)
 {
-  printf (usageText, progname);
-  exit (EXIT_SUCCESS);
+  FILE *f = error ? stderr : stdout;
+  fprintf (f, usageText, progname);
+  exit (error ? EXIT_FAILURE : EXIT_SUCCESS);
 }
 
 static DSO *
@@ -3326,7 +3327,7 @@ main (int argc, char *argv[])
 	  break;
 
 	case 'u':
-	  usage (argv[0]);
+	  usage (argv[0], false);
 	  break;
 
 	case 'b':
@@ -3368,8 +3369,7 @@ main (int argc, char *argv[])
   if (optind != argc - 1)
     {
       fprintf (stderr, "Need one FILE as input\n");
-      usage (argv[0]);
-      exit(EXIT_FAILURE);
+      usage (argv[0], true);
     }
 
   if (dest_dir != NULL)
-- 
ldv

Re: [PATCH] debugedit: fix exit status in case of wrong number of arguments

[Mark Wielaard]

Hi Dmitry,

On Mon, 2021-03-22 at 20:00 +0000, Dmitry V. Levin wrote:
> Print error diagnostics to stderr and exit with status EXIT_FAILURE
> when the number of arguments is not equal to 1.
> 
> * tools/debugedit.c (usage): Add "error" argument, print usageText
> to stderr and exit with status EXIT_FAILURE if error is set to true.
> All callers updated.
> * tests/debugedit.at: Check debugedit usage.
> 
> Fixes: 5200953d5a65 ("Initial build system. Remove rpm and popt
> dependencies.")
> Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>

Looks good, this makes usage similar to help.
And thanks for the new testcase.

Pushed to main.

Mark