From nobody Mon Apr 11 12:15:49 2022 X-Original-To: dev-commits-src-branches@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 D53E11A990DD; Mon, 11 Apr 2022 12:15:49 +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 4KcSVs5hwqz4jK3; Mon, 11 Apr 2022 12:15:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649679349; 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=3hwqQAMBrlYpSXlUJrx2CnYZKJ86UxIjPMfdSsynP38=; b=o76vAzvPWZyS23O3m68O9ZdPvQrNigf1fQlQ0wVPX/AharL1+CCA+ZO8/M+Q0cts+JA0Ql fNM3gufmEOMXnc5dny8vaX9zW+/JSpmLvspcfmiFACZehFrNx96wU94AmSXLb6LS9aNk6V Ycx78Zflkz6ZOzwHHrwJ9w5qJod4uAnJYYDr7ZVEudpPxg04NFqHL7jaC/zqivHnvC5Zed xcqkewwiFLlecWLEeWaF6aNzvAo/L3WFGCy3lCShpUO57CZGaBa86C1a7jumABbrRpE8iO tE9WDtE+Rbs2wi9/3Dgh1z1IxwyJ8SseRRJ8C3I9Rkpoe1X2vOyWfxqE9Fst9g== 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 9566B22A99; Mon, 11 Apr 2022 12:15:49 +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 23BCFnLf008041; Mon, 11 Apr 2022 12:15:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23BCFnZ4008040; Mon, 11 Apr 2022 12:15:49 GMT (envelope-from git) Date: Mon, 11 Apr 2022 12:15:49 GMT Message-Id: <202204111215.23BCFnZ4008040@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: ef024be3755c - stable/13 - vidcontrol: disable p, P, and H when vt(4) is in use List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: ef024be3755c6e09e0caf5f1df989e9a09f54063 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649679349; 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=3hwqQAMBrlYpSXlUJrx2CnYZKJ86UxIjPMfdSsynP38=; b=r+3kzIPEyVAKKqv80U24EYFr1nqnkyaKT/GxmwmT7g8C0mkacLOd3spjbhJF1Qu4whuCPc YHBzwjN5Vrow5owpnmFjWpparjofu1mj20nDaqOuu6MXWm/M/tKfoLtJQmI5JcbxxtMaR2 Nm09ooKj3TScONVa3rEAp0a7f1I7ETAtsLyFcH0Qtg5cpUoz10dWTPUsyAd0bZ9+u4MwQV obYvBwhXJUWTxfbHV6HOkDhs2hu2qK/hQwBQKMhNqPLqUBeaZvH74eiX4ipynQ5RBfoEwR noKg3xdNUfwe77w7iN5nXLqfYio1vrrWSog9YNMHgOWB5D+CkscI/ewsGEuJJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649679349; a=rsa-sha256; cv=none; b=p7EIz2UECA8hGlpqYWupRnWciZYv/MxyoozWVgtxJ3uEUS5OHU+jrPYjlAf5T1kS2TqcYZ U3N414lVPAbuoXPXCriSmkga4WObj6Fgkw4TYozTS5xtaMv6VJ6MpQBguV0Zsukjz8//Sm Q28VNH76iSrY6qEbKsVujlctK5PGo9wAjC1OoAdOrF0CosPc2VD05qQa0HNHENERClNy6m v0Q/mIt0UxbQ96qwUhcd3jmITrl/Wq+LGhEuyVeFhIaciYFqrMgR8wCKwB9JekFv2SPl6L 0n+2YSI+n3gaknyGkSHjvkwP1kvn41bRWBfwuUVdwjhYPpZvQKmXLHTt5uIQxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ef024be3755c6e09e0caf5f1df989e9a09f54063 commit ef024be3755c6e09e0caf5f1df989e9a09f54063 Author: Ed Maste AuthorDate: 2022-04-06 23:39:19 +0000 Commit: Ed Maste CommitDate: 2022-04-11 12:15:22 +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 (cherry picked from commit c71ae91f1976746b380a8aada8676d7ae084fdc5) (cherry picked from commit 1f4442f71fa33a8ef6d3da808e32872fb23a5700) --- usr.sbin/vidcontrol/vidcontrol.1 | 6 +++++- usr.sbin/vidcontrol/vidcontrol.c | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/usr.sbin/vidcontrol/vidcontrol.1 b/usr.sbin/vidcontrol/vidcontrol.1 index e811d82c6865..6eee089c1972 100644 --- a/usr.sbin/vidcontrol/vidcontrol.1 +++ b/usr.sbin/vidcontrol/vidcontrol.1 @@ -13,7 +13,7 @@ .\" @(#)vidcontrol.1 .\" $FreeBSD$ .\" -.Dd October 20, 2018 +.Dd April 6, 2022 .Dt VIDCONTROL 1 .Os .Sh NAME @@ -388,12 +388,16 @@ For details about that format see .Sx Format of Video Buffer Dump below. +Supported only with +.Xr syscons 4 . .It Fl P Same as .Fl p , but dump contents of the video buffer in a plain text format ignoring nonprintable characters and information about text attributes. +Supported only with +.Xr syscons 4 . .It Fl H When used with .Fl p 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";