From nobody Thu Apr 07 00:26:53 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 424091A91AE8; Thu, 7 Apr 2022 00:26:54 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KYhyk1Lb9z4pnk; Thu, 7 Apr 2022 00:26:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649291214; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e5+2eVVqzNSI69Q10i/J9fQ59sBP3XnMugVoCh7D0Ak=; b=q2ZRec0x8BIjqsNPd9lX+PeNTFfG1EDf7wsHDnABVGLZjTBT1l9+XTAuJHL5PDjd/RgF9g TzfPzyfAW8J/OQ9WNbgUayJvqq7PaghLOYu2ELStAHL/96suDOuAd7UX+9mIuERLQlV899 9Zt6u169VhegAVLdkoUHNNnAX/WgaKHHXYnBTMPo13pqFM5dk7IcIEbzvKHWqOMMht5+4A ZDwTLDHD4Bok2GXEUl7K7H/IGVd0oUdw+wQXogaIfg5sIhcacQDqwxBXMkZSWxQHSMCpVX NDNhbcQQh1aHhYGDS97bXZvP1JEYeAKxb8uDiVeBgPrHecE16xxWET2WM4hBsg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0AA2E253F6; Thu, 7 Apr 2022 00:26:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2370QrwZ063941; Thu, 7 Apr 2022 00:26:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2370Qrto063940; Thu, 7 Apr 2022 00:26:53 GMT (envelope-from git) Date: Thu, 7 Apr 2022 00:26:53 GMT Message-Id: <202204070026.2370Qrto063940@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: c71ae91f1976 - main - vidcontrol: disable p, P, and H when vt(4) is in use List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c71ae91f1976746b380a8aada8676d7ae084fdc5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649291214; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e5+2eVVqzNSI69Q10i/J9fQ59sBP3XnMugVoCh7D0Ak=; b=gje6rq1PdfjmCzVmzSgNS2kk7wiRCzM5U9vGbpVC+gpd9lF8v4l1RAwUZEaabGqcWJQkFS nwqkaVjXPy9SwWmbGsW2axFyND5j5U3U4oH14Gj50Yiw9GCDEcvmkqGYl7TZFI4LfJp/dU Mg20LRFzWgM89AiZ5UyMOYc44vqPlkr5xqcBAb0sznj9VwImyu9kTOAoJYUF67Sl2c/uFH 6j/JB7F5C2nMbjaD6nt2IbjleZwVPtxxulR4kIfcMh8WP9e/wwBpuua+iFVQzFywG96r5W t1F4S8GBPiadp9cmMZGf73XhMQQjdLuoSXQxID4ElkcTw0AmHLSs7iBi4RmqWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649291214; a=rsa-sha256; cv=none; b=Y20b/SJ27FUkrvGm2gLmrZt0m+lRLs8q1duHTaa63moIP6xirDTRTEr67eaUp0ZDm04qgZ jU6wfiH+GxYrtZ994CzWdof3mHipf78ctMZOI/qIGmq+UqUiRk7bLW5h+TrTrQn9Cw75oX wgINdCNcPAQso7wWrvuEa8zQGsYEqZO/X7YH0poFoDtZ1H8jde6J6PzFLXp0EWquMY5y2U G7+xcoaNWtANU/m/2DJSKnsm1lQ10pIP+6gGlQ1OCrEe4V3dGrLwI8Ul7A7/7N/hpDVRs/ UOR6nQqSzWXev0u5zNBaQxuouGpShvXS3esQ04mkiE62lqiCSIUHa1mgnV6BNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c71ae91f1976746b380a8aada8676d7ae084fdc5 commit c71ae91f1976746b380a8aada8676d7ae084fdc5 Author: Ed Maste AuthorDate: 2022-04-07 00:19:54 +0000 Commit: Ed Maste CommitDate: 2022-04-07 00:26:43 +0000 vidcontrol: disable p, P, and H when vt(4) is in use These options use the CONS_SCRSHOT ioctl to capture the contents of the current console, which is not yet supported by vt(4). Disable the options when vt(4) is in use rather than emitting a possibly confusing error message. This change should be reverted if CONS_SCRSHOT is implemented for vt(4). PR: 263099 MFC after: 1 week Sponsored by: The FreeBSD Foundation --- usr.sbin/vidcontrol/vidcontrol.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/vidcontrol/vidcontrol.c b/usr.sbin/vidcontrol/vidcontrol.c index f5bc76acc543..3e0ab102ae8c 100644 --- a/usr.sbin/vidcontrol/vidcontrol.c +++ b/usr.sbin/vidcontrol/vidcontrol.c @@ -186,7 +186,7 @@ usage(void) { if (vt4_mode) fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n%s\n", -"usage: vidcontrol [-CHPpx] [-b color] [-c appearance] [-f [[size] file]]", +"usage: vidcontrol [-Cx] [-b color] [-c appearance] [-f [[size] file]]", " [-g geometry] [-h size] [-i active | adapter | mode]", " [-M char] [-m on | off]", " [-r foreground background] [-S on | off] [-s number]", @@ -1439,7 +1439,7 @@ main(int argc, char **argv) dumpopt = DUMP_FBF; termmode = NULL; if (vt4_mode) - opts = "b:Cc:fg:h:Hi:M:m:pPr:S:s:T:t:x"; + opts = "b:Cc:fg:h:i:M:m:r:S:s:T:t:x"; else opts = "b:Cc:deE:fg:h:Hi:l:LM:m:pPr:S:s:T:t:x";