diff options
author | hrs <hrs@FreeBSD.org> | 2011-09-13 02:46:22 +0000 |
---|---|---|
committer | hrs <hrs@FreeBSD.org> | 2011-09-13 02:46:22 +0000 |
commit | ce750aacfc656eeafcd42ef8b5dfc3f93d07caaf (patch) | |
tree | 61b97fc7e5fb16befee5a21d465e85162e5af28f /contrib/openresolv/libc.in | |
parent | 6a7d91769a91f7e4cbe398cc41202ef07e2a0e8a (diff) | |
download | FreeBSD-src-ce750aacfc656eeafcd42ef8b5dfc3f93d07caaf.zip FreeBSD-src-ce750aacfc656eeafcd42ef8b5dfc3f93d07caaf.tar.gz |
Merge from openresolv 3.4.4 in the vendor branch.
Approved by: re (kib)
Diffstat (limited to 'contrib/openresolv/libc.in')
-rw-r--r-- | contrib/openresolv/libc.in | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/contrib/openresolv/libc.in b/contrib/openresolv/libc.in index 4ceb0d2..cf0323e 100644 --- a/contrib/openresolv/libc.in +++ b/contrib/openresolv/libc.in @@ -30,6 +30,8 @@ SYSCONFDIR=@SYSCONFDIR@ LIBEXECDIR=@LIBEXECDIR@ VARDIR=@VARDIR@ IFACEDIR="$VARDIR/interfaces" +NL=" +" # sed may not be available, and this is faster on small files key_get_value() @@ -109,7 +111,7 @@ case "${resolv_conf_passthrough:-NO}" in fi done [ -z "$newest" ] && exit 0 - newconf="$(cat "$newest")\n" + newconf="$(cat "$newest")$NL" ;; *) [ -z "$RESOLVCONF" ] && eval "$(@PREFIX@/sbin/resolvconf -v)" @@ -118,13 +120,13 @@ case "${resolv_conf_passthrough:-NO}" in newns="$(uniqify $name_servers $NS $name_servers_append)" # Hold our new resolv.conf in a variable to save on temporary files - newconf="# Generated by resolvconf\n" + newconf="# Generated by resolvconf$NL" if [ -n "$resolv_conf_head" ]; then - newconf="$newconf$resolv_conf_head\n" + newconf="$newconf$resolv_conf_head$NL" fi - [ -n "$newsearch" ] && newconf="${newconf}search $newsearch\n" + [ -n "$newsearch" ] && newconf="${newconf}search $newsearch$NL" for n in $newns; do - newconf="${newconf}nameserver $n\n" + newconf="${newconf}nameserver $n$NL" done # Now get any configured options @@ -135,22 +137,22 @@ case "${resolv_conf_passthrough:-NO}" in for opt in $(uniqify $opts); do newconf="${newconf} $opt" done - newconf="$newconf\n" + newconf="$newconf$NL" fi if [ -n "$resolv_conf_tail" ]; then - newconf="$newconf$resolv_conf_tail\n" + newconf="$newconf$resolv_conf_tail$NL" fi ;; esac # Check if the file has actually changed or not if [ -e "$resolv_conf" ]; then - [ "$(cat "$resolv_conf")" = "$(printf "$newconf")" ] && exit 0 + [ "$(cat "$resolv_conf")" = "$(printf %s "$newconf")" ] && exit 0 fi # Create our resolv.conf now -(umask 022; printf "$newconf" >"$resolv_conf") +(umask 022; echo "$newconf" >"$resolv_conf") eval $libc_restart retval=0 |