From owner-svn-src-head@FreeBSD.ORG Tue Jun 4 03:47:22 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 1AD37F0C; Tue, 4 Jun 2013 03:47:22 +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 F080918CE; Tue, 4 Jun 2013 03:47:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r543lLIs008528; Tue, 4 Jun 2013 03:47:21 GMT (envelope-from dteske@svn.freebsd.org) Received: (from dteske@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r543lL0G008524; Tue, 4 Jun 2013 03:47:21 GMT (envelope-from dteske@svn.freebsd.org) Message-Id: <201306040347.r543lL0G008524@svn.freebsd.org> From: Devin Teske Date: Tue, 4 Jun 2013 03:47:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251364 - in 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, 04 Jun 2013 03:47:22 -0000 Author: dteske Date: Tue Jun 4 03:47:21 2013 New Revision: 251364 URL: http://svnweb.freebsd.org/changeset/base/251364 Log: Use f_shell_escape() instead of forking to awk. In this case, the replacement comes with a great performance increase (as f_shell_escape() uses the built-in based f_replaceall() which out-performs forking to awk(1)). This should also improve readability slightly. Modified: head/usr.sbin/bsdconfig/bsdconfig head/usr.sbin/bsdconfig/share/device.subr head/usr.sbin/bsdconfig/share/variable.subr Modified: head/usr.sbin/bsdconfig/bsdconfig ============================================================================== --- head/usr.sbin/bsdconfig/bsdconfig Tue Jun 4 03:38:16 2013 (r251363) +++ head/usr.sbin/bsdconfig/bsdconfig Tue Jun 4 03:47:21 2013 (r251364) @@ -167,7 +167,6 @@ dialog_menu_main() local defaultitem= # Calculated below local hline= - local sanitize_awk="{ gsub(/'/, \"'\\\\''\"); print }" local menuitem menu_title menu_help menu_selection index=2 for menuitem in $( cd $BSDCFG_LIBE && ls -d [0-9][0-9][0-9].* ); do [ $index -lt ${#DIALOG_MENU_TAGS} ] || break @@ -185,8 +184,8 @@ dialog_menu_main() menu_program="$menuitem/$menu_program" esac - menu_title=$( echo "$menu_title" | awk "$sanitize_awk" ) - menu_help=$( echo "$menu_help" | awk "$sanitize_awk" ) + f_shell_escape "$menu_title" menu_title + f_shell_escape "$menu_help" menu_help setvar "menu_program$tag" "$menu_program" menu_list="$menu_list '$tag' '$menu_title' '$menu_help'" Modified: head/usr.sbin/bsdconfig/share/device.subr ============================================================================== --- head/usr.sbin/bsdconfig/share/device.subr Tue Jun 4 03:38:16 2013 (r251363) +++ head/usr.sbin/bsdconfig/share/device.subr Tue Jun 4 03:47:21 2013 (r251364) @@ -598,12 +598,10 @@ f_device_menu() done [ "$devs" ] || return $FAILURE - local sanitize_awk="{ gsub(/'/, \"'\\\\''\"); print }" - local desc menu_list= for dev in $devs; do device_$dev get desc desc - desc=$( echo "$desc" | awk "$sanitize_awk" ) + f_shell_escape "$desc" desc menu_list="$menu_list '$dev' '$desc'" done Modified: head/usr.sbin/bsdconfig/share/variable.subr ============================================================================== --- head/usr.sbin/bsdconfig/share/variable.subr Tue Jun 4 03:38:16 2013 (r251363) +++ head/usr.sbin/bsdconfig/share/variable.subr Tue Jun 4 03:47:21 2013 (r251364) @@ -32,6 +32,7 @@ BSDCFG_SHARE="/usr/share/bsdconfig" . $BSDCFG_SHARE/common.subr || exit 1 f_dprintf "%s: loading includes..." variable.subr f_include $BSDCFG_SHARE/dialog.subr +f_include $BSDCFG_SHARE/strings.subr ############################################################ GLOBALS @@ -130,12 +131,12 @@ f_variable_set_defaults() # f_dump_variables() { - local err sanitize_awk="{ gsub(/'/, \"'\\\\''\"); print }" + local err if ! err=$( ( for handle in $VARIABLES; do f_getvar $handle var || continue f_getvar $var value || continue - value=$( echo "$value" | awk "$sanitize_awk" ) + f_shell_escape "$value" value printf "%s='%s'\n" "$var" "$value" done > "$VARIABLE_DUMPFILE" ) 2>&1 ); then