diff options
| author | Devin Teske <dteske@FreeBSD.org> | 2016-02-03 00:51:38 +0000 |
|---|---|---|
| committer | Devin Teske <dteske@FreeBSD.org> | 2016-02-03 00:51:38 +0000 |
| commit | 7883f9204b03dc2e7f7fca3f6e129cbf395208fc (patch) | |
| tree | 23066f472ec6bdb5de172f28e4dfebe899f7db60 /usr.sbin/bsdconfig | |
| parent | 97ee039909d4ceced842b97d44ef63caaa721b41 (diff) | |
| download | src-test2-7883f9204b03dc2e7f7fca3f6e129cbf395208fc.tar.gz src-test2-7883f9204b03dc2e7f7fca3f6e129cbf395208fc.zip | |
Notes
Diffstat (limited to 'usr.sbin/bsdconfig')
| -rw-r--r-- | usr.sbin/bsdconfig/share/strings.subr | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/usr.sbin/bsdconfig/share/strings.subr b/usr.sbin/bsdconfig/share/strings.subr index 1a4fe6ef081c..f1dbbd76a5e6 100644 --- a/usr.sbin/bsdconfig/share/strings.subr +++ b/usr.sbin/bsdconfig/share/strings.subr @@ -154,20 +154,25 @@ f_substr() # Similar to sprintf(3), write a string into $var_to_set using printf(1) syntax # (`$format [$arguments ...]'). # -f_sprintf() -{ - local __var_to_set="$1" - shift 1 # var_to_set - - case "$BASH_VERSION" in - 3.1*|4.*) - local __tmp +case "$BASH_VERSION" in +3.1*|4.*) + f_sprintf() + { + local __var_to_set="$1" __tmp + shift 1 # var_to_set printf -v __tmp "$@" eval "$__var_to_set"=\"\${__tmp%\$NL}\" - ;; - *) eval "$__var_to_set"=\$\( printf -- \"\$@\" \) - esac -} + } + ;; +*) + # NB: On FreeBSD, sh(1) runs this faster than bash(1) runs the above + f_sprintf() + { + local __var_to_set="$1" + shift 1 # var_to_set + eval "$__var_to_set"=\$\( printf -- \"\$@\" \) + } +esac # f_vsprintf $var_to_set $format $format_args # |