From owner-svn-src-all@FreeBSD.ORG  Fri Dec 14 15:04:40 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 3EA89A15;
 Fri, 14 Dec 2012 15:04:40 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 22B688FC08;
 Fri, 14 Dec 2012 15:04:40 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBEF4eL5083104;
 Fri, 14 Dec 2012 15:04:40 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBEF4dop083103;
 Fri, 14 Dec 2012 15:04:40 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <201212141504.qBEF4dop083103@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Fri, 14 Dec 2012 15:04:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244217 - head/sbin/savecore
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Dec 2012 15:04:40 -0000

Author: pjd
Date: Fri Dec 14 15:04:39 2012
New Revision: 244217
URL: http://svnweb.freebsd.org/changeset/base/244217

Log:
  The clear option (-c) is not compatible with keep (-k) and compress (-z)
  options.
  
  Obtained from:	WHEEL Systems

Modified:
  head/sbin/savecore/savecore.c

Modified: head/sbin/savecore/savecore.c
==============================================================================
--- head/sbin/savecore/savecore.c	Fri Dec 14 15:03:12 2012	(r244216)
+++ head/sbin/savecore/savecore.c	Fri Dec 14 15:04:39 2012	(r244217)
@@ -681,6 +681,8 @@ main(int argc, char **argv)
 		}
 	if (checkfor && (clear || force || keep))
 		usage();
+	if (clear && (compress || keep))
+		usage();
 	argc -= optind;
 	argv += optind;
 	if (argc >= 1) {