svn commit: r295108 - in head/usr.sbin/bsdconfig: . networking/share

Devin Teske dteske at FreeBSD.org
Mon Feb 1 00:56:20 UTC 2016


Typo in commit this commit message; s/snprintf/substr/ (for record
posterity)
-- 
Devin

On Mon, 2016-02-01 at 00:54 +0000, Devin Teske wrote:
> Author: dteske
> Date: Mon Feb  1 00:54:26 2016
> New Revision: 295108
> URL: https://svnweb.freebsd.org/changeset/base/295108
> 
> Log:
>   Utilize new `-v var_to_set' of f_snprintf()
> 
> Modified:
>   head/usr.sbin/bsdconfig/bsdconfig
>   head/usr.sbin/bsdconfig/networking/share/media.subr
>   head/usr.sbin/bsdconfig/networking/share/resolv.subr
> 
> Modified: head/usr.sbin/bsdconfig/bsdconfig
> =====================================================================
> =========
> --- head/usr.sbin/bsdconfig/bsdconfig	Mon Feb  1 00:44:29 2016	
> (r295107)
> +++ head/usr.sbin/bsdconfig/bsdconfig	Mon Feb  1 00:54:26 2016	
> (r295108)
> @@ -212,7 +212,7 @@ dialog_menu_main()
>  		 *) menu_program="$menuitem/$menu_program"
>  		esac
>  
> -		tag=$( f_substr "$DIALOG_MENU_TAGS" $index 1 )
> +		f_substr -v tag "$DIALOG_MENU_TAGS" $index 1
>  		setvar "menu_program$tag" "$menu_program"
>  
>  		f_shell_escape "$menu_title" menu_title
> @@ -256,7 +256,7 @@ dialog_menu_main()
>  		 *)
> menu_program="$BSDCFG_LOCAL_LIBE/$menuitem/$menu_program"
>  		esac
>  
> -		tag=$( f_substr "$DIALOG_MENU_TAGS" $index 1 )
> +		f_substr -v tag "$DIALOG_MENU_TAGS" $index 1
>  		setvar "menu_program$tag" "$menu_program"
>  
>  		f_shell_escape "$menu_title" menu_title
> 
> Modified: head/usr.sbin/bsdconfig/networking/share/media.subr
> =====================================================================
> =========
> --- head/usr.sbin/bsdconfig/networking/share/media.subr	Mon
> Feb  1 00:44:29 2016	(r295107)
> +++ head/usr.sbin/bsdconfig/networking/share/media.subr	Mon
> Feb  1 00:54:26 2016	(r295108)
> @@ -180,18 +180,18 @@ f_dialog_menu_media_options()
>  		f_ifconfig_media $interface | \
>  		( index=1
>  
> -		  echo "'$( f_substr "$DIALOG_MENU_TAGS" $index 1
> )'"
> -		  echo "'$opt_none'" 
> +		  f_substr -v tagn "$DIALOG_MENU_TAGS" $index 1
> +		  echo "'$tagn' '$opt_none'"
>  		  index=$(( $index + 1 ))
>  
> -		  echo "'$( f_substr "$DIALOG_MENU_TAGS" $index 1
> )'"
> -		  echo "'$opt_cust'" 
> +		  f_substr -v tagn "$DIALOG_MENU_TAGS" $index 1
> +		  echo "'$tagn' '$opt_cust'"
>  		  index=$(( $index + 1 ))
>  
>  		  while read media_options; do
>  		  	[ $index -lt ${#DIALOG_MENU_TAGS} ] ||
> break
> -		  	echo "'$( f_substr "$DIALOG_MENU_TAGS"
> $index 1 )'"
> -		  	echo "'$media_options'"
> +		  	f_substr -v tagn "$DIALOG_MENU_TAGS"
> $index 1
> +		  	echo "'$tagn' '$media_options'"
>  		  	index=$(( $index + 1 ))
>  		  done
>  		)
> 
> Modified: head/usr.sbin/bsdconfig/networking/share/resolv.subr
> =====================================================================
> =========
> --- head/usr.sbin/bsdconfig/networking/share/resolv.subr	Mon
> Feb  1 00:44:29 2016	(r295107)
> +++ head/usr.sbin/bsdconfig/networking/share/resolv.subr	Mon
> Feb  1 00:54:26 2016	(r295108)
> @@ -441,7 +441,7 @@ f_dialog_menu_nameservers()
>  
>  			for ns in $nameservers; do
>  				[ $index -lt ${#DIALOG_MENU_TAGS} ]
> || break
> -				tag=$( f_substr "$DIALOG_MENU_TAGS"
> $index 1 )
> +				f_substr -v tag "$DIALOG_MENU_TAGS"
> $index 1
>  				echo "'$tag nameserver' '$ns'"
>  				index=$(( $index + 1 ))
>  			done
> 


More information about the svn-src-head mailing list