Adjust badblocks -n/-w exclusive usage message

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

diff --git a/misc/ChangeLog b/misc/ChangeLog
index de52b1d8c305669f35940af7563547617268d1df..ead69fe8456e43eb1a38620b53d09248c934b300 100644 (file)
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,9 @@
+2006-11-17  Theodore Tso  <tytso@mit.edu>
+
+       * badblocks.c (exclusive_usage): Print the program name in the
+               exclusive usage() and don't print the full usage message
+               if the user specifies -n and -w options simultaneously.
+
 2006-11-14  Theodore Tso  <tytso@mit.edu>
 
        * mke2fs.c (PRS): Always allocate the replacement PATH environment

diff --git a/misc/badblocks.c b/misc/badblocks.c
index 9867668cdf85b50683eba911cd9498ec6293754d..8f48c88bd3e3dc3b1148e4b7dfe216a22f1ca8e4 100644 (file)
--- a/misc/badblocks.c
+++ b/misc/badblocks.c
@@ -84,8 +84,9 @@ static void usage(void)
 static void exclusive_usage(void)
 {
        fprintf(stderr, 
-               _("The -n and -w options are mutually exclusive.\n\n"));
-       usage();
+               _("%s: The -n and -w options are mutually exclusive.\n\n"), 
+               program_name);
+       exit(1);
 }
 
 static unsigned long currently_testing = 0;