From owner-svn-src-stable-8@FreeBSD.ORG  Sat Feb  4 15:43:16 2012
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A1270106564A;
	Sat,  4 Feb 2012 15:43:16 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8BEB38FC1D;
	Sat,  4 Feb 2012 15:43:16 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q14FhGQ6041465;
	Sat, 4 Feb 2012 15:43:16 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q14FhG8n041463;
	Sat, 4 Feb 2012 15:43:16 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201202041543.q14FhG8n041463@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sat, 4 Feb 2012 15:43:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r230983 - stable/8/usr.sbin/mixer
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 04 Feb 2012 15:43:16 -0000

Author: mav
Date: Sat Feb  4 15:43:16 2012
New Revision: 230983
URL: http://svn.freebsd.org/changeset/base/230983

Log:
  MFC r230611:
  Return proper error message if recording device is not specified.

Modified:
  stable/8/usr.sbin/mixer/mixer.c
Directory Properties:
  stable/8/usr.sbin/mixer/   (props changed)

Modified: stable/8/usr.sbin/mixer/mixer.c
==============================================================================
--- stable/8/usr.sbin/mixer/mixer.c	Sat Feb  4 15:42:07 2012	(r230982)
+++ stable/8/usr.sbin/mixer/mixer.c	Sat Feb  4 15:43:16 2012	(r230983)
@@ -193,13 +193,18 @@ main(int argc, char *argv[])
 			argc--;
 			argv++;
 			continue;
-		} else if (argc > 1 && strcmp("rec", *argv + 1) == 0) {
+		} else if (strcmp("rec", *argv + 1) == 0) {
 			if (**argv != '+' && **argv != '-' &&
 			    **argv != '=' && **argv != '^') {
 				warnx("unknown modifier: %c", **argv);
 				dusage = 1;
 				break;
 			}
+			if (argc <= 1) {
+				warnx("no recording device specified");
+				dusage = 1;
+				break;
+			}
 			if ((dev = res_name(argv[1], recmask)) == -1) {
 				warnx("unknown recording device: %s", argv[1]);
 				dusage = 1;