From owner-svn-src-head@FreeBSD.ORG  Sat Jun  8 21:45:32 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 94A87910;
 Sat,  8 Jun 2013 21:45:32 +0000 (UTC)
 (envelope-from dteske@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 86E5B161E;
 Sat,  8 Jun 2013 21:45:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r58LjWjw023521;
 Sat, 8 Jun 2013 21:45:32 GMT (envelope-from dteske@svn.freebsd.org)
Received: (from dteske@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r58LjWV7023520;
 Sat, 8 Jun 2013 21:45:32 GMT (envelope-from dteske@svn.freebsd.org)
Message-Id: <201306082145.r58LjWV7023520@svn.freebsd.org>
From: Devin Teske <dteske@FreeBSD.org>
Date: Sat, 8 Jun 2013 21:45:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251557 - head/usr.sbin/bsdconfig/startup/share
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 08 Jun 2013 21:45:32 -0000

Author: dteske
Date: Sat Jun  8 21:45:32 2013
New Revision: 251557
URL: http://svnweb.freebsd.org/changeset/base/251557

Log:
  Fix a bug introduced with r251190, in which a small hunk was forgotten in
  the performance conversion process.
  
  The effect of this was the following error when selecting the menu
  "Startup"->"View/Edit Startup Configuration"->"Add New"->"Add From List":
  
  [: -eq: unexpected operator
  
  By running `bsdconfig -d' as root to enable debugging, this turns into:
  
  DEBUG: f_getvar: var=[text] value=[
  Error: Expected a number for token 4 of --menu.
  Use --help to list options.] r=0
  [: -eq: unexpected operator
  
  Indicating that the fourth token for --menu which should be $height was
  instead a string (the first item of $menu_list) because it was using the
  old size-calculation method and $size was now null (needed to use instead
  the new size variables of $height $width and $rows).

Modified:
  head/usr.sbin/bsdconfig/startup/share/rcconf.subr

Modified: head/usr.sbin/bsdconfig/startup/share/rcconf.subr
==============================================================================
--- head/usr.sbin/bsdconfig/startup/share/rcconf.subr	Sat Jun  8 21:33:09 2013	(r251556)
+++ head/usr.sbin/bsdconfig/startup/share/rcconf.subr	Sat Jun  8 21:45:32 2013	(r251557)
@@ -437,7 +437,8 @@ f_dialog_input_rclist()
 		--ok-label \"\$msg_ok\"            \
 		--cancel-label \"\$msg_cancel\"    \
 		${SHOW_DESC:+--item-help}          \
-		--menu \"\$prompt\" $size          \
+		--menu \"\$prompt\"                \
+		$height $width $rows               \
 		$menu_list                         \
 		2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
 	)