From owner-svn-src-all@freebsd.org Fri Mar 13 11:27:30 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A1FAA25C08F; Fri, 13 Mar 2020 11:27:30 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48f3MQ39zVz3K7R; Fri, 13 Mar 2020 11:27:30 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 53E3D56C5; Fri, 13 Mar 2020 11:27:30 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02DBRUbI028232; Fri, 13 Mar 2020 11:27:30 GMT (envelope-from 0mp@FreeBSD.org) Received: (from 0mp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02DBRTTS028228; Fri, 13 Mar 2020 11:27:29 GMT (envelope-from 0mp@FreeBSD.org) Message-Id: <202003131127.02DBRTTS028228@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: 0mp set sender to 0mp@FreeBSD.org using -f From: Mateusz Piotrowski <0mp@FreeBSD.org> Date: Fri, 13 Mar 2020 11:27:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358955 - in stable/12: etc/mtree usr.sbin/mixer usr.sbin/mixer/tests X-SVN-Group: stable-12 X-SVN-Commit-Author: 0mp X-SVN-Commit-Paths: in stable/12: etc/mtree usr.sbin/mixer usr.sbin/mixer/tests X-SVN-Commit-Revision: 358955 X-SVN-Commit-Repository: base 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.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Mar 2020 11:27:30 -0000 Author: 0mp (doc,ports committer) Date: Fri Mar 13 11:27:29 2020 New Revision: 358955 URL: https://svnweb.freebsd.org/changeset/base/358955 Log: MFC 351481, 357619: Approved by: bcr (mentor), hselasky (src) Differential Revision: https://reviews.freebsd.org/D24058 mixer(8): Report an error if the passed value is an empty string This patch fixes a bug that made the mixer command enter an infinite loop when instructed to set the value of a device to an empty string (e.g., `mixer vol ""`). Additionally, some tests for mixer(8) are being added. PR: 240039 Reviewed by: hselasky, mav Approved by: src (hselasky, mav) Differential Revision: https://reviews.freebsd.org/D21409 mixer: call the cleanup function in a test The set_empty_value test has a cleanup function, but is not called. Fix it Reviewed by: 0mp Approved by: kp Differential Revision: https://reviews.freebsd.org/D23498 Added: stable/12/usr.sbin/mixer/tests/ - copied from r351481, head/usr.sbin/mixer/tests/ Modified: stable/12/etc/mtree/BSD.tests.dist stable/12/usr.sbin/mixer/Makefile stable/12/usr.sbin/mixer/mixer.c stable/12/usr.sbin/mixer/tests/mixer_test.sh Directory Properties: stable/12/ (props changed) Modified: stable/12/etc/mtree/BSD.tests.dist ============================================================================== --- stable/12/etc/mtree/BSD.tests.dist Fri Mar 13 11:07:48 2020 (r358954) +++ stable/12/etc/mtree/BSD.tests.dist Fri Mar 13 11:27:29 2020 (r358955) @@ -817,6 +817,8 @@ .. link .. + mixer + .. mkdir .. mkfifo Modified: stable/12/usr.sbin/mixer/Makefile ============================================================================== --- stable/12/usr.sbin/mixer/Makefile Fri Mar 13 11:07:48 2020 (r358954) +++ stable/12/usr.sbin/mixer/Makefile Fri Mar 13 11:27:29 2020 (r358955) @@ -1,6 +1,11 @@ # $FreeBSD$ +.include + PROG= mixer MAN= mixer.8 + +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests .include Modified: stable/12/usr.sbin/mixer/mixer.c ============================================================================== --- stable/12/usr.sbin/mixer/mixer.c Fri Mar 13 11:07:48 2020 (r358954) +++ stable/12/usr.sbin/mixer/mixer.c Fri Mar 13 11:27:29 2020 (r358955) @@ -241,6 +241,11 @@ main(int argc, char *argv[]) lrel = rrel = 0; if (argc > 1) { m = sscanf(argv[1], "%7[^:]:%7s", lstr, rstr); + if (m == EOF) { + warnx("invalid value: %s", argv[1]); + dusage = 1; + break; + } if (m > 0) { if (*lstr == '+' || *lstr == '-') lrel = rrel = 1; Modified: stable/12/usr.sbin/mixer/tests/mixer_test.sh ============================================================================== --- head/usr.sbin/mixer/tests/mixer_test.sh Sun Aug 25 17:55:31 2019 (r351481) +++ stable/12/usr.sbin/mixer/tests/mixer_test.sh Fri Mar 13 11:27:29 2020 (r358955) @@ -93,7 +93,7 @@ S_flag_cleanup() restore_mixer_vol } -atf_test_case set_empty_value +atf_test_case set_empty_value cleanup set_empty_value_head() { atf_set "descr" "Verify that mixer returns when the provided " \