From 137442a3ecbf41dae519d7c503b25fa7208a8bd4 Mon Sep 17 00:00:00 2001
From: mav <mav@FreeBSD.org>
Date: Fri, 27 Jan 2012 09:15:55 +0000
Subject: Return proper error message if recording device is not specified.

MFC after:	1 week
---
 usr.sbin/mixer/mixer.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'usr.sbin')

diff --git a/usr.sbin/mixer/mixer.c b/usr.sbin/mixer/mixer.c
index 245fb06..49b57d8 100644
--- a/usr.sbin/mixer/mixer.c
+++ b/usr.sbin/mixer/mixer.c
@@ -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;
-- 
cgit v1.1