Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F177583070
D61584.1794797963.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Flag For Later
Award Token
Authored By
Unknown
Size
12 KB
Referenced Files
None
Subscribers
None
D61584.1794797963.diff
View Options
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="7.3.1 Oct-17,2026"
+SYSRC_VERSION="7.4 Nov-14,2026"
#
# Options
@@ -769,6 +769,8 @@
*) # ASSIGN
if [ "$SHOW_FILE" ]; then
before=$( f_sysrc_find "$NAME" )
+ elif [ "$CHECK_ONLY" ]; then
+ before=$( f_sysrc_get_raw "$NAME" )
else
before=$( f_sysrc_get "$NAME" )
fi
diff --git a/usr.sbin/sysrc/sysrc.subr b/usr.sbin/sysrc/sysrc.subr
--- a/usr.sbin/sysrc/sysrc.subr
+++ b/usr.sbin/sysrc/sysrc.subr
@@ -294,6 +294,488 @@
)
}
+# f_sysrc_get_raw $varname
+#
+# Without expanding the value (e.g., in the case of `-c' check), get a system
+# configuration setting from the collection of system-configuration files (in
+# order: /etc/defaults/rc.conf /etc/rc.conf and /etc/rc.conf.local)
+#
+# Much of the complexity here is to handle things like:
+#
+# 1. Even-vs-Odd backslash count
+# a. preceding things like ", ', $, `, NL, etc.
+# 2. Single-vs-Double quoting
+# 3. Dollar quoting
+# a. $'\t' to expand escapes (in example, a real tab)
+# b. $"File not found." i18n translation; for example:
+# export LC_ALL=es_ES.UTF-8
+# export TEXTDOMAIN=bash
+# export TEXTDOMAINDIR=/usr/local/share/locale
+# bash -c 'echo $"%s: not found"' -> %s: no encontrado
+# NB: /bin/sh has no *.mo files but the syntax should still be supported
+# 4. Compound quoting
+# a. single-with-double or vice-versa ["a"'b' or 'c'"d"]
+# b. bare-with-quoted [abc\ '123' or "def"\ 456]
+# c. joined arithmetic ["foo"$(( 1 + 1 ))]
+# d. joined command substitutions ["bar"`baz` or "bar"$( baz )]
+# 5. Parameter expansions
+# a. Without quotes [${abc#123}]
+# b. With quotes [${foo#"bar"} or ${bar#'baz'}]
+# c. Quoted with same quotes ["${foo#"bar"}"]
+# d. Single-quoted literal compound ['${foo#'bar'}']
+# e. With whitespace [${foo#bar baz}]
+# f. Nested [${foo#`bar ${baz}`}]
+# 6. Newlines and line continuations
+# a. Inside single-quotes
+# b. Inside double-quotes
+# c. Unquoted using a trailing backslash at the end of the line
+# 7. Multi-assignment lines [foo=bar bar=baz]
+# a. With various flavors of quoting or joined statements
+# [foo="abc"`def 123`${ghi#"456"} bar=baz]
+# [foo=abc;bar=baz]
+# NB: Only works to return correct value if requested variable
+# is the first word assignment (e.g., asking for foo).
+# 8. Combinations and mixtures of the above
+#
+# NOTE: Additional shell parameter-expansion formats are supported. For
+# example, passing an argument of "hostname%%.*" (properly quoted) will
+# return the hostname up to (but not including) the first `.' (see sh(1),
+# "Parameter Expansion" for more information on additional formats).
+#
+f_sysrc_get_raw_awk='
+# Variables that should be defined on the invocation line:
+# -v varname="varname"
+#
+BEGIN {
+ # NB: Should be same regex as f_sysrc_find()
+ regex = sprintf("^[[:space:]]*%s=", varname)
+ value = ""
+}
+
+#
+# Quote-remove one assignment word starting at start
+# NB: Supports varname=value othervar=othervalue ...
+#
+function read_value(start, out, q, ch)
+{
+ q_i = start
+ q_at_nl = 0
+ sq = "\047"
+ out = ""
+ q = 0
+ while (next_char()) {
+ ch = q_c
+ if ( q == 1 ) {
+ if ( ch == sq ) {
+ q = 0
+ continue
+ }
+ out = out ch
+ continue
+ }
+ if ( q == 2 ) {
+ if ( ch == "\\" ) {
+ if ( !next_char() ) {
+ out = out "\\"
+ break
+ }
+ ch = q_c
+ if ( ch == "\n" ) continue
+ if ( ch == "$" || ch == "`" ||
+ ch == "\"" || ch == "\\" )
+ out = out ch
+ else
+ out = out "\\" ch
+ continue
+ }
+ if ( ch == "\"" ) {
+ q = 0
+ continue
+ }
+ if ( ch == "$" ) {
+ out = out read_dollar(1)
+ continue
+ }
+ if ( ch == "`" ) {
+ out = out read_bquote()
+ continue
+ }
+ out = out ch
+ continue
+ }
+ if ( ch == sq ) {
+ q = 1
+ continue
+ }
+ if ( ch == "\"" ) {
+ q = 2
+ continue
+ }
+ if ( ch == "\\" ) {
+ if ( !next_char() ) {
+ out = out "\\"
+ break
+ }
+ if ( q_c == "\n" ) continue
+ out = out q_c
+ continue
+ }
+ if ( word_end(ch) ) break
+ if ( ch == "$" ) {
+ out = out read_dollar()
+ continue
+ }
+ if ( ch == "`" ) {
+ out = out read_bquote()
+ continue
+ }
+ out = out ch
+ }
+ return out
+}
+
+function word_end(ch)
+{
+ if ( ch == "\n" || ch == " " || ch == "\t" ) return 1
+ if ( ch == ";" || ch == "&" || ch == "|" ) return 1
+ if ( ch == "<" || ch == ">" || ch == "(" || ch == ")" ) return 1
+ return 0
+}
+
+function next_char( r)
+{
+ if ( q_i <= length($0) ) {
+ q_c = substr($0, q_i, 1)
+ q_i++
+ return 1
+ }
+ if ( q_at_nl ) {
+ r = getline
+ if ( r <= 0 ) return 0
+ q_at_nl = 0
+ if ( length($0) == 0 ) {
+ q_c = "\n"
+ q_at_nl = 1
+ q_i = 1
+ return 1
+ }
+ q_c = substr($0, 1, 1)
+ q_i = 2
+ return 1
+ }
+ q_c = "\n"
+ q_at_nl = 1
+ return 1
+}
+
+function peek_char()
+{
+ if ( q_i <= length($0) ) return substr($0, q_i, 1)
+ if ( q_at_nl ) return ""
+ return "\n"
+}
+
+# Copy one expansion without running it. inq means the $ is already
+# inside double quotes; a dollar quote is kept whole only when unquoted.
+function read_dollar(inq, p)
+{
+ p = peek_char()
+ if ( p == "(" ) {
+ next_char()
+ if ( peek_char() == "(" ) {
+ next_char()
+ return read_arith()
+ }
+ return read_cmd()
+ }
+ if ( p == "{" ) {
+ next_char()
+ return read_param()
+ }
+ if ( !inq && (p == sq || p == "\"") )
+ return read_dolquote()
+ return "$"
+}
+
+# Dollar-single or dollar-double quote; marks kept, escapes left as written
+function read_dolquote( out, qch, ch)
+{
+ qch = peek_char()
+ next_char()
+ out = "$" qch
+ while (next_char()) {
+ ch = q_c
+ if ( ch == "\\" ) {
+ out = out ch
+ if ( !next_char() ) break
+ out = out q_c
+ continue
+ }
+ out = out ch
+ if ( ch == qch ) break
+ }
+ return out
+}
+
+function read_cmd( out, depth, q, ch)
+{
+ out = "$("
+ depth = 1
+ q = 0
+ while (depth > 0 && next_char()) {
+ ch = q_c
+ if ( q == 1 ) {
+ out = out ch
+ if ( ch == sq ) q = 0
+ continue
+ }
+ if ( q == 2 ) {
+ if ( ch == "\\" ) {
+ out = out ch
+ if ( !next_char() ) break
+ out = out q_c
+ continue
+ }
+ out = out ch
+ if ( ch == "\"" ) q = 0
+ continue
+ }
+ if ( ch == sq ) {
+ out = out ch
+ q = 1
+ continue
+ }
+ if ( ch == "\"" ) {
+ out = out ch
+ q = 2
+ continue
+ }
+ if ( ch == "\\" ) {
+ out = out ch
+ if ( !next_char() ) break
+ out = out q_c
+ continue
+ }
+ if ( ch == "$" ) {
+ out = out read_dollar()
+ continue
+ }
+ if ( ch == "`" ) {
+ out = out read_bquote()
+ continue
+ }
+ if ( ch == "(" ) depth++
+ else if ( ch == ")" ) depth--
+ out = out ch
+ }
+ return out
+}
+
+function read_param( out, q, ch)
+{
+ out = "${"
+ q = 0
+ while (next_char()) {
+ ch = q_c
+ if ( q == 1 ) {
+ out = out ch
+ if ( ch == sq ) q = 0
+ continue
+ }
+ if ( q == 2 ) {
+ if ( ch == "\\" ) {
+ out = out ch
+ if ( !next_char() ) break
+ out = out q_c
+ continue
+ }
+ out = out ch
+ if ( ch == "\"" ) q = 0
+ continue
+ }
+ if ( ch == sq ) {
+ out = out ch
+ q = 1
+ continue
+ }
+ if ( ch == "\"" ) {
+ out = out ch
+ q = 2
+ continue
+ }
+ if ( ch == "\\" ) {
+ out = out ch
+ if ( !next_char() ) break
+ out = out q_c
+ continue
+ }
+ if ( ch == "$" ) {
+ out = out read_dollar()
+ continue
+ }
+ if ( ch == "`" ) {
+ out = out read_bquote()
+ continue
+ }
+ out = out ch
+ if ( ch == "}" ) break
+ }
+ return out
+}
+
+function read_arith( out, depth, ch)
+{
+ out = "$(("
+ depth = 0
+ while (next_char()) {
+ ch = q_c
+ if ( ch == "$" ) {
+ out = out read_dollar()
+ continue
+ }
+ if ( ch == "`" ) {
+ out = out read_bquote()
+ continue
+ }
+ if ( ch == "\\" ) {
+ out = out ch
+ if ( !next_char() ) break
+ out = out q_c
+ continue
+ }
+ if ( ch == "(" ) {
+ depth++
+ out = out ch
+ continue
+ }
+ if ( ch == ")" ) {
+ if ( depth > 0 ) {
+ depth--
+ out = out ch
+ continue
+ }
+ out = out ch
+ if ( peek_char() == ")" ) {
+ next_char()
+ out = out q_c
+ break
+ }
+ continue
+ }
+ out = out ch
+ }
+ return out
+}
+
+function read_bquote( out, q, ch, p)
+{
+ out = "`"
+ q = 0
+ while (next_char()) {
+ ch = q_c
+ if ( q == 1 ) {
+ out = out ch
+ if ( ch == sq ) q = 0
+ continue
+ }
+ if ( q == 2 ) {
+ if ( ch == "\\" ) {
+ out = out ch
+ if ( !next_char() ) break
+ out = out q_c
+ continue
+ }
+ out = out ch
+ if ( ch == "\"" ) q = 0
+ continue
+ }
+ if ( ch == sq ) {
+ out = out ch
+ q = 1
+ continue
+ }
+ if ( ch == "\"" ) {
+ out = out ch
+ q = 2
+ continue
+ }
+ if ( ch == "\\" ) {
+ p = peek_char()
+ out = out ch
+ if ( p == "$" || p == "`" ||
+ p == "\\" || p == "\n" ) {
+ if ( !next_char() ) break
+ out = out q_c
+ }
+ continue
+ }
+ if ( ch == "`" ) {
+ out = out ch
+ break
+ }
+ if ( ch == "$" ) {
+ out = out read_dollar()
+ continue
+ }
+ out = out ch
+ }
+ return out
+}
+
+/^[[:space:]]*(#|$)/ { next } # skip blank lines and comments
+match($0, regex) { value = read_value(RSTART + RLENGTH) }
+
+END { printf "%s\n", value }
+'
+f_sysrc_get_raw()
+{
+ local varname="${1%%[!$VALID_VARNAME_CHARS]*}"
+ local paramexp="${1#"$varname"}"
+ local file value
+
+ # Taint-check variable name
+ case "$varname" in
+ [0-9]*)
+ # Don't expand possible positional parameters
+ return $FAILURE ;;
+ *)
+ [ "$varname" ] || return $FAILURE
+ esac
+
+ if ! file=$( f_sysrc_find "$varname" ); then
+ #
+ # Like f_sysrc_get() given an unset variable, return no value
+ # with success unless paramexp specifically requests error
+ #
+ case "$paramexp" in
+ "?"*)
+ # Same exit status as: f_sysrc_get 'varname?'
+ return 2 ;;
+ esac
+ echo
+ return $SUCCESS
+ fi
+
+ #
+ # To get the raw value, we cannot simply source the file,
+ # we must instead read the file
+ #
+ value=$( awk -v varname="$varname" "$f_sysrc_get_raw_awk" "$file" )
+
+ #
+ # This must be the last functional line for the function to preserve
+ # the return status from formats such as "varname:?" (see "Parameter
+ # Expansion" in sh(1) for more information).
+ #
+ # NB: The parameter expansion "varname?" cannot work here because if
+ # f_sysrc_find() did not find a setting, we have not reached this point
+ # but instead returned error status. So if we reach here, that means we
+ # already know the variable is set. Parameter expansion "varname:?"
+ # does still have meaning to test that the value is non-NULL.
+ #
+ eval printf "'%s\\n'" '"${value'"$paramexp"'}"' 2> /dev/null
+}
+
# f_sysrc_service_configs [-a|-p] $name [$var_to_set]
#
# Get a list of optional `rc.conf.d' entries sourced by system `rc.d' script
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
@@ -262,6 +262,51 @@
sysrc -f "${SYSRC_CONF}" -c test_enable=YES test_list-=item1
}
+atf_test_case c_flag_quoting
+c_flag_quoting_head()
+{
+ atf_set "descr" "Verify -c compares raw assignment text"
+}
+c_flag_quoting_body()
+{
+ local msg
+
+ # PR 299413: the expanded value is " -J 15"
+ 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" \
+ 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" \
+ sysrc -f "${SYSRC_CONF}" -v -c 'cron_flags=$cron_flags -J 16'
+
+ # Same raw text in the other quote forms
+ printf '%s\n' "cron_flags='\$cron_flags -J 15'" > "${SYSRC_CONF}"
+ atf_check sysrc -f "${SYSRC_CONF}" -c 'cron_flags=$cron_flags -J 15'
+ printf '%s\n' 'cron_flags=$cron_flags\ -J\ 15' > "${SYSRC_CONF}"
+ atf_check sysrc -f "${SYSRC_CONF}" -c 'cron_flags=$cron_flags -J 15'
+ printf '%s\n' "cron_flags='\$cron_flags'\" -J 15\"" > "${SYSRC_CONF}"
+ atf_check sysrc -f "${SYSRC_CONF}" -c 'cron_flags=$cron_flags -J 15'
+
+ # Dollar quotes keep their quote marks
+ 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" \
+ sysrc -f "${SYSRC_CONF}" -v -c 'cron_flags=$"%s: file not found"'
+ atf_check -s exit:1 \
+ 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" \
+ sysrc -f "${SYSRC_CONF}" -v -c "cron_flags=\$'a\\tb'"
+ atf_check -s exit:1 \
+ sysrc -f "${SYSRC_CONF}" -c 'cron_flags=$a\tb'
+}
+
atf_test_case d_flag cleanup
d_flag_head()
{
@@ -345,6 +390,7 @@
atf_add_test_case a_flag
atf_add_test_case A_flag
atf_add_test_case c_flag
+ atf_add_test_case c_flag_quoting
atf_add_test_case d_flag
atf_add_test_case f_flag
atf_add_test_case F_flag
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Mon, Nov 16, 2:59 AM (1 h, 24 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41750246
Default Alt Text
D61584.1794797963.diff (12 KB)
Attached To
Mode
D61584: sysrc: Add -r raw and fixup -c assignment check
Attached
Detach File
Event Timeline