From owner-svn-src-stable@freebsd.org  Tue Aug  4 15:15:07 2015
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 842149B34D5;
 Tue,  4 Aug 2015 15:15:07 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 74AE9145A;
 Tue,  4 Aug 2015 15:15:07 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t74FF7fm055003;
 Tue, 4 Aug 2015 15:15:07 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t74FF7gC055002;
 Tue, 4 Aug 2015 15:15:07 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201508041515.t74FF7gC055002@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Tue, 4 Aug 2015 15:15:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r286291 - stable/10/usr.sbin/vidcontrol
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 04 Aug 2015 15:15:07 -0000

Author: emaste
Date: Tue Aug  4 15:15:06 2015
New Revision: 286291
URL: https://svnweb.freebsd.org/changeset/base/286291

Log:
  MFC r281581: vidcontrol: make size argument optional again for syscons
  
  r273544 (MFC in r273921) changed the -f option allow no arguments in vt
  mode (used to reset the font back to the default), but broke the
  optionality of the size argument for syscons. Drop the required argument
  from syscons' optstring for -f so the optional argument handler works
  the same way for both syscons and vt.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/usr.sbin/vidcontrol/vidcontrol.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/vidcontrol/vidcontrol.c
==============================================================================
--- stable/10/usr.sbin/vidcontrol/vidcontrol.c	Tue Aug  4 15:04:28 2015	(r286290)
+++ stable/10/usr.sbin/vidcontrol/vidcontrol.c	Tue Aug  4 15:15:06 2015	(r286291)
@@ -1343,7 +1343,7 @@ main(int argc, char **argv)
 	if (vt4_mode)
 		opts = "b:Cc:fg:h:Hi:M:m:pPr:S:s:T:t:x";
 	else
-		opts = "b:Cc:df:g:h:Hi:l:LM:m:pPr:S:s:T:t:x";
+		opts = "b:Cc:dfg:h:Hi:l:LM:m:pPr:S:s:T:t:x";
 
 	while ((opt = getopt(argc, argv, opts)) != -1)
 		switch(opt) {