From: Karel Zak <kzak@redhat.com>
Date: Wed, 20 Jul 2011 13:50:34 +0000 (+0200)
Subject: dmesg: mark some options mutually exclusive
X-Git-Tag: v2.20-rc1~75
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=641986cf92221e4329d1a2978cabbbed27a7a746;p=thirdparty%2Futil-linux.git

dmesg: mark some options mutually exclusive

Reported-by: "Voelker, Bernhard" <bernhard.voelker@siemens-enterprise.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c
index b71097dc12..2be34075ab 100644
--- a/sys-utils/dmesg.c
+++ b/sys-utils/dmesg.c
@@ -650,9 +650,9 @@ int main(int argc, char *argv[])
 				longopts, NULL)) != -1) {
 
 		if (cmd != -1 && strchr("CcnDE", c))
-			errx(EXIT_FAILURE, "%s %s",
-				"--{clear,read-clear,console-level,console-on,console-off}",
-				_("options are mutually exclusive"));
+			errx(EXIT_FAILURE, _("clear, read-clear, console-level, "
+			     "console-on, and console-off options are mutually "
+			     "exclusive"));
 
 		switch (c) {
 		case 'C':
@@ -733,8 +733,14 @@ int main(int argc, char *argv[])
 	if (cmd == -1)
 		cmd = SYSLOG_ACTION_READ_ALL;	/* default */
 
-	if (ctl.raw && (ctl.fltr_lev || ctl.fltr_fac))
-		errx(EXIT_FAILURE, _("options --level and --facility cannot be used for raw output"));
+	if (ctl.raw && (ctl.fltr_lev || ctl.fltr_fac || ctl.delta ||
+			ctl.notime || ctl.ctime || ctl.decode))
+		errx(EXIT_FAILURE, _("--raw can't be used together with level, "
+		     "facility, decode, delta, ctime or notime options"));
+
+	if (ctl.notime && (ctl.ctime || ctl.delta))
+		errx(EXIT_FAILURE, _("--notime can't be used together with ctime "
+		     "or delta options"));
 
 	switch (cmd) {
 	case SYSLOG_ACTION_READ_ALL: