From owner-svn-src-head@FreeBSD.ORG Tue Jun 18 08:54:03 2013 Return-Path: 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 2CF8EEC8; Tue, 18 Jun 2013 08:54:03 +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 1E76117F5; Tue, 18 Jun 2013 08:54:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5I8s35C073172; Tue, 18 Jun 2013 08:54:03 GMT (envelope-from dteske@svn.freebsd.org) Received: (from dteske@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5I8s2ZX073171; Tue, 18 Jun 2013 08:54:02 GMT (envelope-from dteske@svn.freebsd.org) Message-Id: <201306180854.r5I8s2ZX073171@svn.freebsd.org> From: Devin Teske Date: Tue, 18 Jun 2013 08:54:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251912 - head/usr.sbin/bsdconfig/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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Jun 2013 08:54:03 -0000 Author: dteske Date: Tue Jun 18 08:54:02 2013 New Revision: 251912 URL: http://svnweb.freebsd.org/changeset/base/251912 Log: Change the f_dialog_msgbox() arguments in `dialog.subr' to accomodate an $hline argument for setting the --hline parameter value. This change does not effect any current modules as it turns out that not one single usage of f_dialog_msgbox() relied on accepting more than a first argument (read: all occurrences quoted the first parameter; so $* was never depended upon). This will allow some custom invocations of --msgbox to roll over to this function (for example, in `mouse/disable'). Modified: head/usr.sbin/bsdconfig/share/dialog.subr Modified: head/usr.sbin/bsdconfig/share/dialog.subr ============================================================================== --- head/usr.sbin/bsdconfig/share/dialog.subr Tue Jun 18 08:40:16 2013 (r251911) +++ head/usr.sbin/bsdconfig/share/dialog.subr Tue Jun 18 08:54:02 2013 (r251912) @@ -1501,7 +1501,7 @@ f_xdialog_info() ############################################################ MSGBOX FUNCTIONS -# f_dialog_msgbox $msg_text ... +# f_dialog_msgbox $msg_text [$hline] # # Throw up a dialog(1) msgbox. The msgbox remains until the user presses ENTER # or ESC, acknowledging the modal dialog. @@ -1511,12 +1511,13 @@ f_xdialog_info() # f_dialog_msgbox() { - local msg_text="$*" height width + local msg_text="$1" hline="$2" height width f_dialog_buttonbox_size height width \ - "$DIALOG_TITLE" "$DIALOG_BACKTITLE" "$msg_text" + "$DIALOG_TITLE" "$DIALOG_BACKTITLE" "$msg_text" "$hline" $DIALOG \ --title "$DIALOG_TITLE" \ --backtitle "$DIALOG_BACKTITLE" \ + --hline "$hline" \ --ok-label "$msg_ok" \ --msgbox "$msg_text" $height $width }