d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sysrc.subr: Fix handling of files with missing newline at EOF

Browse Source 
PR:		bin/203435
Reported by:	Andreas Sommer <andreas.sommer87@googlemail.com>
MFC after:	1 week
X-MFC-to:	stable/11
Sponsored by:	Smule, Inc.
This commit is contained in:
Devin Teske 2018-06-17 06:03:48 +00:00
parent f438a1434e
commit 181560bbbf
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=335280
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
usr.sbin/bsdconfig/share/sysrc.subr
View File

@ -559,6 +559,13 @@ f_sysrc_set()
# If not found, append new value to last file and return.
#
if [ "$not_found" ]; then
# Add a newline if missing before appending to the file
awk 'BEGIN { wc = 0 } NR == 1 {
(cmd = "wc -l " FILENAME) | getline
close(cmd)
wc = $1
} END { exit wc != NR }' "$file" ||
echo >> "$file" || return $?
echo "$varname=\"$new_value\"" >> "$file"
return $?
fi
@ -606,8 +613,11 @@ f_sysrc_set()
#
# Operate on the matching file, replacing only the last occurrence.
#
# Use awk to ensure LF at end of each line, else files without ending
# LF will trigger a bug in `tail -r' where last two lines are joined.
#
local new_contents retval
new_contents=$( tail -r $file 2> /dev/null )
new_contents=$( awk 1 "$file" 2> /dev/null | tail -r )
new_contents=$( echo "$new_contents" | awk -v varname="$varname" \
-v new_value="$new_value" "$f_sysrc_set_awk" )
retval=$?