From: Theodore Ts'o <tytso@mit.edu>
Date: Sat, 18 Nov 2006 04:00:19 +0000 (-0500)
Subject: Adjust badblocks -n/-w exclusive usage message
X-Git-Tag: E2FSPROGS-1_40~123
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=017a76ee39356ecb13911d666a152f2a4856cbbb;p=thirdparty%2Fe2fsprogs.git

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 de52b1d8c..ead69fe84 100644
--- 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 9867668cd..8f48c88bd 100644
--- 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;