Page MenuHomeFreeBSD

D61741.1795175442.diff
No OneTemporary

Authored By
Unknown
Size
5 KB
Referenced Files
None
Subscribers
None

D61741.1795175442.diff

diff --git a/usr.sbin/sysrc/sysrc b/usr.sbin/sysrc/sysrc
--- a/usr.sbin/sysrc/sysrc
+++ b/usr.sbin/sysrc/sysrc
@@ -16,7 +16,7 @@
#
# Version information
#
-SYSRC_VERSION="9.0 Nov-18,2026"
+SYSRC_VERSION="9.1 Nov-18,2026"
#
# Options
@@ -880,24 +880,27 @@
#
# If `-c' is passed, simply compare and move on
+ # NB: `-e' ignored when given `-c'
#
if [ "$CHECK_ONLY" ]; then
if ! IGNORED=$( f_sysrc_get "$NAME?" ); then
status=$FAILURE
- [ "$VERBOSE" ] &&
- echo "$NAME: not currently set"
- shift 1
- continue
+ [ "$QUIET" ] ||
+ f_err "%s: not currently set\n" "$NAME"
elif [ "$new" != "$before" ]; then
status=$FAILURE
if [ "$VERBOSE" ]; then
- echo -n "$( f_sysrc_find "$NAME" ): "
- echo -n "$NAME: would change from "
- echo "\`$before' to \`$new'"
+ f_err "%s: %s: would change %s\n" \
+ "$( f_sysrc_find "$NAME" )" \
+ "$NAME" \
+ "from \`$before' to \`$new'"
+ elif [ ! "$QUIET" ]; then
+ f_err "%s: value differs\n" "$NAME"
fi
elif [ "$VERBOSE" ]; then
- echo -n "$( f_sysrc_find "$NAME" ): "
- echo "$NAME: already set to \`$before'"
+ f_err "%s: %s: already set to \`%s'\n" \
+ "$( f_sysrc_find "$NAME" )" \
+ "$NAME" "$before"
fi
shift 1
continue
diff --git a/usr.sbin/sysrc/tests/sysrc_test.sh b/usr.sbin/sysrc/tests/sysrc_test.sh
--- a/usr.sbin/sysrc/tests/sysrc_test.sh
+++ b/usr.sbin/sysrc/tests/sysrc_test.sh
@@ -234,31 +234,39 @@
# Test rc variable assignment
atf_check sysrc -f "${SYSRC_CONF}" -c test_enable=NO
- atf_check -s exit:1 sysrc -f "${SYSRC_CONF}" -c test_enable=YES
- atf_check -s exit:1 sysrc -f "${SYSRC_CONF}" -c noexist=YES
+ atf_check -s exit:1 -e inline:"test_enable: value differs\n" \
+ sysrc -f "${SYSRC_CONF}" -c test_enable=YES
+ atf_check -s exit:1 -e inline:"noexist: not currently set\n" \
+ sysrc -f "${SYSRC_CONF}" -c noexist=YES
# Test appending rc variables
atf_check sysrc -f "${SYSRC_CONF}" -c test_list+=item1
- atf_check -s exit:1 sysrc -f "${SYSRC_CONF}" -c test_list+=item3
- atf_check -s exit:1 sysrc -f "${SYSRC_CONF}" -c noexist+=item1
+ atf_check -s exit:1 -e inline:"test_list: value differs\n" \
+ sysrc -f "${SYSRC_CONF}" -c test_list+=item3
+ atf_check -s exit:1 -e inline:"noexist: not currently set\n" \
+ sysrc -f "${SYSRC_CONF}" -c noexist+=item1
atf_check sysrc -f "${SYSRC_CONF}" -c test_enable=NO test_list+=item1
- atf_check -s exit:1 \
+ atf_check -s exit:1 -e inline:"test_enable: value differs\n" \
sysrc -f "${SYSRC_CONF}" -c test_enable=YES test_list+=item1
- atf_check -s exit:1 \
+ atf_check -s exit:1 -e inline:"test_list: value differs\n" \
sysrc -f "${SYSRC_CONF}" -c test_enable=NO test_list+=item3
atf_check -s exit:1 \
+ -e inline:"test_enable: value differs\ntest_list: value differs\n" \
sysrc -f "${SYSRC_CONF}" -c test_enable=YES test_list+=item3
# Test subracting rc variables
atf_check sysrc -f "${SYSRC_CONF}" -c test_list-=item3
- atf_check -s exit:1 sysrc -f "${SYSRC_CONF}" -c test_list-=item1
- atf_check -s exit:1 sysrc -f "${SYSRC_CONF}" -c noexist-=item1
+ atf_check -s exit:1 -e inline:"test_list: value differs\n" \
+ sysrc -f "${SYSRC_CONF}" -c test_list-=item1
+ atf_check -s exit:1 -e inline:"noexist: not currently set\n" \
+ sysrc -f "${SYSRC_CONF}" -c noexist-=item1
atf_check sysrc -f "${SYSRC_CONF}" -c test_enable=NO test_list-=item3
- atf_check -s exit:1 \
+ atf_check -s exit:1 -e inline:"test_enable: value differs\n" \
sysrc -f "${SYSRC_CONF}" -c test_enable=YES test_list-=item3
- atf_check -s exit:1 \
+ atf_check -s exit:1 -e inline:"test_list: value differs\n" \
sysrc -f "${SYSRC_CONF}" -c test_enable=NO test_list-=item1
atf_check -s exit:1 \
+ -e inline:"test_enable: value differs\ntest_list: value differs\n" \
sysrc -f "${SYSRC_CONF}" -c test_enable=YES test_list-=item1
}
@@ -275,11 +283,11 @@
printf '%s\n' 'cron_flags="$cron_flags -J 15"' > "${SYSRC_CONF}"
msg="${SYSRC_CONF}: cron_flags: already set to"
msg="$msg \`\$cron_flags -J 15'"
- atf_check -o inline:"$msg\n" \
+ atf_check -e inline:"$msg\n" \
sysrc -f "${SYSRC_CONF}" -v -c 'cron_flags=$cron_flags -J 15'
msg="${SYSRC_CONF}: cron_flags: would change from"
msg="$msg \`\$cron_flags -J 15' to \`\$cron_flags -J 16'"
- atf_check -s exit:1 -o inline:"$msg\n" \
+ atf_check -s exit:1 -e inline:"$msg\n" \
sysrc -f "${SYSRC_CONF}" -v -c 'cron_flags=$cron_flags -J 16'
# Same raw text in the other quote forms
@@ -294,16 +302,16 @@
printf '%s\n' 'cron_flags=$"%s: file not found"' > "${SYSRC_CONF}"
msg="${SYSRC_CONF}: cron_flags: already set to"
msg="$msg \`\$\"%s: file not found\"'"
- atf_check -o inline:"$msg\n" \
+ atf_check -e inline:"$msg\n" \
sysrc -f "${SYSRC_CONF}" -v -c 'cron_flags=$"%s: file not found"'
- atf_check -s exit:1 \
+ atf_check -s exit:1 -e inline:"cron_flags: value differs\n" \
sysrc -f "${SYSRC_CONF}" -c 'cron_flags=$%s: file not found'
printf '%s\n' "cron_flags=\$'a\\tb'" > "${SYSRC_CONF}"
msg="${SYSRC_CONF}: cron_flags: already set to"
msg="$msg \`\$'a\\\\tb''"
- atf_check -o inline:"$msg\n" \
+ atf_check -e inline:"$msg\n" \
sysrc -f "${SYSRC_CONF}" -v -c "cron_flags=\$'a\\tb'"
- atf_check -s exit:1 \
+ atf_check -s exit:1 -e inline:"cron_flags: value differs\n" \
sysrc -f "${SYSRC_CONF}" -c 'cron_flags=$a\tb'
}
@@ -467,7 +475,7 @@
printf '%s\n' 'cron_flags="$cron_flags"' > "${SYSRC_CONF}"
msg="${SYSRC_CONF}: cron_flags: would change from"
msg="$msg \`\$cron_flags' to \`\$cron_flags -J 15'"
- atf_check -s exit:1 -o inline:"$msg\n" \
+ atf_check -s exit:1 -e inline:"$msg\n" \
sysrc -f "${SYSRC_CONF}" -v -c 'cron_flags.=-J 15'
atf_check -o inline:'cron_flags="$cron_flags"\n' \
cat "${SYSRC_CONF}"

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 20, 11:50 AM (9 h, 28 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41866432
Default Alt Text
D61741.1795175442.diff (5 KB)

Event Timeline