Paths

Table of Contentst

Differential D24079

Read commands from stdin when -f - is passed to sed(1)
ClosedPublic
Actions

Authored by 0mp on Mar 15 2020, 10:33 PM.

Tags

None

Referenced Files

	Unknown Object (File)
	Sat, Nov 23, 12:45 PM

	Unknown Object (File)
	Thu, Nov 21, 2:04 PM

	Unknown Object (File)
	Thu, Nov 21, 12:10 PM

	Unknown Object (File)
	Thu, Nov 14, 3:02 AM

	Unknown Object (File)
	Thu, Nov 7, 6:10 AM

	Unknown Object (File)
	Tue, Oct 29, 3:49 PM

	Unknown Object (File)
	Oct 20 2024, 11:11 PM

	Unknown Object (File)
	Oct 16 2024, 4:56 AM

View All 93 Files

Subscribers

Details

Reviewers

kevans
pfg

Group Reviewers

Commits

rS362688: MFC 362017, 362039, 362071:
rS362687: MFC 362017, 362039, 362071:
rS362017: Read commands from stdin when -f - is passed to sed(1)

Summary

Read commands from stdin when -f - is passed to sed(1)

This patch teaches sed to interpret the a file name of "-" in
a special way when given to the -f flag. 

This behavior is present in GNU sed.

PR: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=244872

Test Plan

make check

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

0mp created this revision.Mar 15 2020, 10:33 PM

Harbormaster completed remote builds in B29956: Diff 69553.Mar 15 2020, 10:33 PM

0mp added inline comments.Mar 15 2020, 10:38 PM

usr.bin/sed/main.c
199 ↗	(On Diff #69553)	There has to be at least one input file specified.
245 ↗	(On Diff #69553)	I am not sure if it makes any difference if I try to avoid depending on the presence of `/dev/stdin` by using the 0th descriptor here instead.
247 ↗	(On Diff #69553)	Is `stdin` name here alright? Perhaps it could be changed to `-`?

0mp edited the summary of this revision. (Show Details)Mar 15 2020, 10:45 PM

0mp retitled this revision from Read commands from stdin when -f - are passed to sed(1) to Read commands from stdin when -f - is passed to sed(1).Mar 16 2020, 3:48 PM

0mp edited the summary of this revision. (Show Details)

LGTM, but I have no time to test.
Note that this type of changes should be checked with an exxp-run

In D24079#529828, @pfg wrote:

LGTM, but I have no time to test.
Note that this type of changes should be checked with an exxp-run

Thanks! I'll open a PR on bugzilla for that.

0mp edited the summary of this revision. (Show Details)Mar 17 2020, 10:53 PM

tobik added a subscriber: tobik.Mar 18 2020, 12:08 AM

tobik added inline comments.

usr.bin/sed/main.c
245–246 ↗	(On Diff #69553)	Can this not just be `f = stdin`?

Do not open stdin again.

Harbormaster completed remote builds in B29992: Diff 69633.Mar 18 2020, 1:57 PM

0mp marked an inline comment as done.Mar 18 2020, 1:57 PM

0mp added inline comments.

usr.bin/sed/main.c
245–246 ↗	(On Diff #69553)	Good catch! The tests are still passing.

Rebase

Harbormaster completed remote builds in B30059: Diff 69794.Mar 23 2020, 1:04 PM

Rebase

Harbormaster completed remote builds in B30060: Diff 69795.Mar 23 2020, 1:05 PM

In D24079#529828, @pfg wrote:

LGTM, but I have no time to test.
Note that this type of changes should be checked with an exxp-run

Exp-run seems fine: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=244872#c3

kaktus added a subscriber: kaktus.Apr 15 2020, 1:32 PM

Ping?

pfg accepted this revision.Jun 7 2020, 2:52 PM

This revision is now accepted and ready to land.Jun 7 2020, 2:52 PM

Closed by commit rS362017: Read commands from stdin when -f - is passed to sed(1) (authored by 0mp). · Explain WhyJun 10 2020, 7:24 PM

This revision was automatically updated to reflect the committed changes.

0mp added a commit: rS362017: Read commands from stdin when -f - is passed to sed(1).

Herald added a reviewer: manpages. · View Herald TranscriptJun 10 2020, 7:24 PM

Herald added a subscriber: imp. · View Herald Transcript

0mp added a commit: rS362687: MFC 362017, 362039, 362071:.Jun 27 2020, 2:27 PM

0mp added a commit: rS362688: MFC 362017, 362039, 362071:.Jun 27 2020, 2:31 PM

Revision Contents
Changeset List

Path

Size

head/

usr.bin/

sed/

18 lines

10 lines

tests/

57 lines

Diff 72941

head/usr.bin/sed/main.c

Loading...

head/usr.bin/sed/sed.1

Loading...

head/usr.bin/sed/tests/sed2_test.sh

Loading...