git: c71ae91f1976 - main - vidcontrol: disable p, P, and H when vt(4) is in use

From: Ed Maste <emaste_at_FreeBSD.org>
Date: Thu, 07 Apr 2022 00:26:53 UTC
The branch main has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=c71ae91f1976746b380a8aada8676d7ae084fdc5

commit c71ae91f1976746b380a8aada8676d7ae084fdc5
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2022-04-07 00:19:54 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
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";