Page MenuHomeFreeBSD
Differential D47377

sed: fix commandline-given expression when -e is not used
ClosedPublic
Actions

Authored by cracauer on Nov 1 2024, 12:55 AM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Mar 4, 1:07 PM
Unknown Object (File)
Sat, Mar 1, 2:24 PM
Unknown Object (File)
Feb 17 2025, 3:24 PM
Unknown Object (File)
Feb 9 2025, 1:13 AM
Unknown Object (File)
Feb 8 2025, 6:47 AM
Unknown Object (File)
Feb 4 2025, 12:38 PM
Unknown Object (File)
Feb 4 2025, 12:36 PM
Unknown Object (File)
Feb 4 2025, 9:49 AM
View All 19 Files
Subscribers
imp

Details

Reviewers
des
0mp
Commits
rG0552fdc62caf: sed: fix commandline-given expression when -e is not used
Summary

Make explicit sed commands (first on commandline) behave the same
as those given with -e.

Without this patch the following two commands behave differently,
the second one being wrong:
echo ab | sed -e $'1 i\\\n--'
echo ab | sed $'1 i\\\n--'

Sponsored by: Klara, Inc.

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
usr.bin/
sed/
10 lines
tests/
13 lines

Diff 146117

View Options

usr.bin/sed/main.c

  • This file was copied to tests/sys/netpfil/pf/pft_read_ipfix.py.
Show First 20 Lines • Show All 68 Lines • ▼ Show 20 Lines atf_check -s exit:0 \
jexec alcatraz pflowctl -s ${pflow} proto 10 jexec alcatraz pflowctl -s ${pflow} proto 10
} }
basic_cleanup() basic_cleanup()
{ {
pft_cleanup pft_cleanup
} }
atf_test_case "state_defaults" "cleanup"
state_defaults_head()
{
atf_set descr 'Test set state-defaults pflow'
atf_set require.user root
atf_set require.progs scapy
}
state_defaults_body()
{
pflow_init
epair=$(vnet_mkepair)
ifconfig ${epair}a 192.0.2.2/24 up
vnet_mkjail alcatraz ${epair}b
jexec alcatraz ifconfig ${epair}b 192.0.2.1/24 up
# Sanity check
atf_check -s exit:0 -o ignore ping -c 1 192.0.2.1
jexec alcatraz pfctl -e
pft_set_rules alcatraz \
"pass"
pflow=$(jexec alcatraz pflowctl -c)
jexec alcatraz pflowctl -s ${pflow} dst 192.0.2.2:2055
# No flow data is generated because no states are marked for it.
ping -c 1 192.0.2.1
# Flush states to force pflow creation
jexec alcatraz pfctl -Fstates
atf_check -o match:"No data" \
$(atf_get_srcdir)/pft_read_ipfix.py --recvif ${epair}a --port 2055
# Expect pflow output with state-defaults pflow
pft_set_rules alcatraz \
"set state-defaults pflow" \
"pass"
ping -c 1 192.0.2.1
# We default to version 5
atf_check -o match:"^v=5.*" \
$(atf_get_srcdir)/pft_read_ipfix.py --recvif ${epair}a --port 2055
# Switch to version 10
jexec alcatraz pflowctl -s ${pflow} proto 10
ping -c 1 192.0.2.1
atf_check -o match:"^v=10.*" \
$(atf_get_srcdir)/pft_read_ipfix.py --recvif ${epair}a --port 2055
}
state_defaults_cleanup()
{
pft_cleanup
}
atf_init_test_cases() atf_init_test_cases()
{ {
atf_add_test_case "basic" atf_add_test_case "basic"
atf_add_test_case "state_defaults"
} }
View Options

usr.bin/sed/tests/sed2_test.sh

  • This file was copied to tests/sys/netpfil/pf/pft_read_ipfix.py.
Show First 20 Lines • Show All 68 Lines • ▼ Show 20 Lines atf_check -s exit:0 \
jexec alcatraz pflowctl -s ${pflow} proto 10 jexec alcatraz pflowctl -s ${pflow} proto 10
} }
basic_cleanup() basic_cleanup()
{ {
pft_cleanup pft_cleanup
} }
atf_test_case "state_defaults" "cleanup"
state_defaults_head()
{
atf_set descr 'Test set state-defaults pflow'
atf_set require.user root
atf_set require.progs scapy
}
state_defaults_body()
{
pflow_init
epair=$(vnet_mkepair)
ifconfig ${epair}a 192.0.2.2/24 up
vnet_mkjail alcatraz ${epair}b
jexec alcatraz ifconfig ${epair}b 192.0.2.1/24 up
# Sanity check
atf_check -s exit:0 -o ignore ping -c 1 192.0.2.1
jexec alcatraz pfctl -e
pft_set_rules alcatraz \
"pass"
pflow=$(jexec alcatraz pflowctl -c)
jexec alcatraz pflowctl -s ${pflow} dst 192.0.2.2:2055
# No flow data is generated because no states are marked for it.
ping -c 1 192.0.2.1
# Flush states to force pflow creation
jexec alcatraz pfctl -Fstates
atf_check -o match:"No data" \
$(atf_get_srcdir)/pft_read_ipfix.py --recvif ${epair}a --port 2055
# Expect pflow output with state-defaults pflow
pft_set_rules alcatraz \
"set state-defaults pflow" \
"pass"
ping -c 1 192.0.2.1
# We default to version 5
atf_check -o match:"^v=5.*" \
$(atf_get_srcdir)/pft_read_ipfix.py --recvif ${epair}a --port 2055
# Switch to version 10
jexec alcatraz pflowctl -s ${pflow} proto 10
ping -c 1 192.0.2.1
atf_check -o match:"^v=10.*" \
$(atf_get_srcdir)/pft_read_ipfix.py --recvif ${epair}a --port 2055
}
state_defaults_cleanup()
{
pft_cleanup
}
atf_init_test_cases() atf_init_test_cases()
{ {
atf_add_test_case "basic" atf_add_test_case "basic"
atf_add_test_case "state_defaults"
} }