![[BACK]](/icons/back.gif){kind=icon}
Up to [local] / src / usr.bin / sed
Request diff between arbitrary revisions
Default branch: MAIN
Revision 1.51 / (download) - annotate - [select for diffs], Mon Dec 26 19:16:02 2022 UTC (16 months, 3 weeks ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE,
OPENBSD_7_5,
OPENBSD_7_4_BASE,
OPENBSD_7_4,
OPENBSD_7_3_BASE,
OPENBSD_7_3,
HEAD
Changes since 1.50: +2 -2 lines
Diff to previous 1.50 (colored)
spelling fixes; from paul tagliamonte amendments to his diff are noted on tech
Revision 1.50 / (download) - annotate - [select for diffs], Fri Dec 7 14:45:40 2018 UTC (5 years, 5 months ago) by schwarze
Branch: MAIN
CVS Tags: OPENBSD_7_2_BASE,
OPENBSD_7_2,
OPENBSD_7_1_BASE,
OPENBSD_7_1,
OPENBSD_7_0_BASE,
OPENBSD_7_0,
OPENBSD_6_9_BASE,
OPENBSD_6_9,
OPENBSD_6_8_BASE,
OPENBSD_6_8,
OPENBSD_6_7_BASE,
OPENBSD_6_7,
OPENBSD_6_6_BASE,
OPENBSD_6_6,
OPENBSD_6_5_BASE,
OPENBSD_6_5
Changes since 1.49: +2 -2 lines
Diff to previous 1.49 (colored)
As an extension to POSIX, for consistency with our behaviour for the "b" and "t" commands with a label, and for compatibility with GNU sed, also accept ";" followed by another command after "b" and "t" commands without a label: branch to the end of the script instead of erroring out. Parsing is unchanged. Missing feature reported by Lars dot Nooden at gmail dot com on bugs@. OK martijn@ millert@
Revision 1.49 / (download) - annotate - [select for diffs], Tue Aug 14 18:10:09 2018 UTC (5 years, 9 months ago) by schwarze
Branch: MAIN
CVS Tags: OPENBSD_6_4_BASE,
OPENBSD_6_4
Changes since 1.48: +32 -20 lines
Diff to previous 1.48 (colored)
Improve consistency of the substitution command further.
When the opening square bracket ('[') is abused as the delimiter, the regular
expression contains a bracket expression, and the bracket expression contains
another opening square bracket (sick! - i mean, sic!), then do not require
escaping that innermost bracket and treat a preceding backslash as a literal
backslash character, in accordance with POSIX:
$ printf 'x[x\\x\n' | sed 's[\[[][R[g'
xRx\x
$ printf 'x[x\\x\n' | sed 's[\[\[][R[g'
xRxRx
While here, also make the implementation more readable and insert
some comments.
Joint work with martijn@ (started during g2k18) and OK martijn@.
Revision 1.48 / (download) - annotate - [select for diffs], Mon Jul 9 09:43:54 2018 UTC (5 years, 10 months ago) by schwarze
Branch: MAIN
Changes since 1.47: +3 -3 lines
Diff to previous 1.47 (colored)
When using '[' as the delimiter in sed(1) s/// (don't do that, of course)
and then including '[' in the regular expression by prepending a backslash
to it, remove the backslash before feeding the RE to the RE engine, just
like we already do it for other special characters like .^$*+?{(|.
This makes sed 's[\[xy][...[' treat the xy thingy as a char class.
Joint work with martijn@, OK guenther@ martijn@
Revision 1.47 / (download) - annotate - [select for diffs], Wed Dec 13 16:07:54 2017 UTC (6 years, 5 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_6_3_BASE,
OPENBSD_6_3
Changes since 1.46: +3 -4 lines
Diff to previous 1.46 (colored)
Fix array index by signed char; from martijn@
Revision 1.46 / (download) - annotate - [select for diffs], Wed Dec 13 16:06:34 2017 UTC (6 years, 5 months ago) by millert
Branch: MAIN
Changes since 1.45: +4 -4 lines
Diff to previous 1.45 (colored)
Fix sign compare warnings; OK martijn@
Revision 1.45 / (download) - annotate - [select for diffs], Tue Dec 12 12:52:01 2017 UTC (6 years, 5 months ago) by martijn
Branch: MAIN
Changes since 1.44: +3 -3 lines
Diff to previous 1.44 (colored)
Fix 2 bugs introduced by previous. Pointed out by kshe59 <at> zoho <dot> eu OK millert@
Revision 1.44 / (download) - annotate - [select for diffs], Mon Dec 11 13:25:57 2017 UTC (6 years, 5 months ago) by martijn
Branch: MAIN
Changes since 1.43: +57 -43 lines
Diff to previous 1.43 (colored)
Fix and change y command in the following ways: - When 'n' is used as a delimiter escaping 'n' will remain a newline instead of becoming a 'n' character. This is how POSIX specifies how this should work. Other implementations tested also do this wrong. - '[' and maybe other characters are not special during the parsing of the y command and don't need to be matched or treated special in any way. - POSIX specifies that a backslash followed by anything other than the delimiter, 'n', and another backslash, as well as repeating characters in string1 are unspecified. Since the various implementations handle these situations in opposing ways choose to error out on them to prevent people falling into the pitfall of expecting identical behaviour on various implementations. Inspired by the sed.1 patch by kshe59 <at> zoho <dot> eu Feedback and OK millert@ Manpage bits OK jmc@
Revision 1.43 / (download) - annotate - [select for diffs], Fri Dec 8 18:41:59 2017 UTC (6 years, 5 months ago) by martijn
Branch: MAIN
Changes since 1.42: +9 -23 lines
Diff to previous 1.42 (colored)
Make the r command filename obligatory, similar to what FreeBSD and NetBSD do for several years. While here make corresponding error message for missing read and write file consistent between commands/flag, and shrink the the code of the w flag of the s command by making it use the same code as the w command. Prompted by a larger diff by kshe59 <at> zoho <dot> eu OK millert@
Revision 1.42 / (download) - annotate - [select for diffs], Tue Aug 1 18:05:53 2017 UTC (6 years, 9 months ago) by martijn
Branch: MAIN
CVS Tags: OPENBSD_6_2_BASE,
OPENBSD_6_2
Changes since 1.41: +8 -3 lines
Diff to previous 1.41 (colored)
Apply stricter pledge rules if possible. These are based on the usage of the 'w' and 'r' functions and the 'w' flag to the 's' function. If non of the above is used and input is being read from stdin, we drop all the way down to stdio! Original inspiration by benno@. OK millert@
Revision 1.41 / (download) - annotate - [select for diffs], Fri Jan 20 10:26:16 2017 UTC (7 years, 3 months ago) by krw
Branch: MAIN
CVS Tags: OPENBSD_6_1_BASE,
OPENBSD_6_1
Changes since 1.40: +4 -6 lines
Diff to previous 1.40 (colored)
Split error() into error() and warning() so error() can be marked __dead to appease gcc. ok procter@ deraadt@
Revision 1.40 / (download) - annotate - [select for diffs], Mon Oct 26 22:24:44 2015 UTC (8 years, 6 months ago) by jca
Branch: MAIN
CVS Tags: OPENBSD_6_0_BASE,
OPENBSD_6_0,
OPENBSD_5_9_BASE,
OPENBSD_5_9
Changes since 1.39: +3 -3 lines
Diff to previous 1.39 (colored)
Tidy up error() levels: merge COMPILE and COMPILE2, and kill ERROR (unused) ok tobias@
Revision 1.39 / (download) - annotate - [select for diffs], Mon Oct 26 14:08:47 2015 UTC (8 years, 6 months ago) by mmcc
Branch: MAIN
Changes since 1.38: +40 -40 lines
Diff to previous 1.38 (colored)
Rename err() to error() to prevent confusion with the stdlib function. Discussed with jca@.
Revision 1.38 / (download) - annotate - [select for diffs], Tue Jun 23 22:52:55 2015 UTC (8 years, 10 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_5_8_BASE,
OPENBSD_5_8
Changes since 1.37: +2 -2 lines
Diff to previous 1.37 (colored)
POSIX specifies that that multiple '!' characters preceding a function should be treated as a single negation. From FreeBSD via Liviu Daia.
Revision 1.37 / (download) - annotate - [select for diffs], Fri Dec 12 03:32:55 2014 UTC (9 years, 5 months ago) by jsg
Branch: MAIN
CVS Tags: OPENBSD_5_7_BASE,
OPENBSD_5_7
Changes since 1.36: +5 -2 lines
Diff to previous 1.36 (colored)
Bounds check the file path used in the 'w' command. Modified version of a diff from Sebastien Marie to prevent a crash found by Sebastien with the afl fuzzer.
Revision 1.36 / (download) - annotate - [select for diffs], Wed Oct 8 04:19:08 2014 UTC (9 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.35: +3 -3 lines
Diff to previous 1.35 (colored)
add a xreallocarray() like the existing fatal xmalloc(), and use it to detect potential integer. ok doug
Revision 1.35 / (download) - annotate - [select for diffs], Thu Nov 28 18:24:55 2013 UTC (10 years, 5 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_5_6_BASE,
OPENBSD_5_6,
OPENBSD_5_5_BASE,
OPENBSD_5_5
Changes since 1.34: +5 -4 lines
Diff to previous 1.34 (colored)
unsigned char for ctype ok krw okan
Revision 1.34 / (download) - annotate - [select for diffs], Mon Nov 15 20:26:00 2010 UTC (13 years, 6 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_5_4_BASE,
OPENBSD_5_4,
OPENBSD_5_3_BASE,
OPENBSD_5_3,
OPENBSD_5_2_BASE,
OPENBSD_5_2,
OPENBSD_5_1_BASE,
OPENBSD_5_1,
OPENBSD_5_0_BASE,
OPENBSD_5_0,
OPENBSD_4_9_BASE,
OPENBSD_4_9
Changes since 1.33: +3 -2 lines
Diff to previous 1.33 (colored)
NUL-terminate buffer in compiler_text() after realloc, not before. Now that we have dynamically sized buffers there may not be room for the NUL until after realloc.
Revision 1.33 / (download) - annotate - [select for diffs], Thu Jul 1 17:04:24 2010 UTC (13 years, 10 months ago) by naddy
Branch: MAIN
CVS Tags: OPENBSD_4_8_BASE,
OPENBSD_4_8
Changes since 1.32: +10 -7 lines
Diff to previous 1.32 (colored)
Follow POSIX (IEEE Std 1003.1, 2004 Edition) in the implementation of the y (translate) command. "If a backslash character is immediately followed by a backslash character in string1 or string2, the two backslash characters shall be counted as a single literal backslash character" From FreeBSD; ok millert@ halex@
Revision 1.32 / (download) - annotate - [select for diffs], Thu Jul 1 17:02:02 2010 UTC (13 years, 10 months ago) by naddy
Branch: MAIN
Changes since 1.31: +2 -2 lines
Diff to previous 1.31 (colored)
Allow [ to be used as a delimiter. From FreeBSD; ok millert@ halex@
Revision 1.31 / (download) - annotate - [select for diffs], Tue Oct 27 23:59:43 2009 UTC (14 years, 6 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_4_7_BASE,
OPENBSD_4_7
Changes since 1.30: +1 -6 lines
Diff to previous 1.30 (colored)
rcsid[] and sccsid[] and copyright[] are essentially unmaintained (and unmaintainable). these days, people use source. these id's do not provide any benefit, and do hurt the small install media (the 33,000 line diff is essentially mechanical) ok with the idea millert, ok dms
Revision 1.30 / (download) - annotate - [select for diffs], Fri Oct 23 15:24:41 2009 UTC (14 years, 6 months ago) by reyk
Branch: MAIN
Changes since 1.29: +2 -3 lines
Diff to previous 1.29 (colored)
When adding text due to an a, c, or i command, don't eat the space(s) at the beginning of the lines since the addition is supposed to be "verbatim". From NetBSD, also matches the bahaviour of GNU sed ok millert@
Revision 1.29 / (download) - annotate - [select for diffs], Fri Aug 7 03:30:56 2009 UTC (14 years, 9 months ago) by djm
Branch: MAIN
Changes since 1.28: +3 -3 lines
Diff to previous 1.28 (colored)
add -E flag to compile regular expressions using the extended POSIX syntax. The -E flag is compatible with the other BSDs and OSX. -r is also provided as an alias for compatibility with GNU sed. feedback from jmc@ and millert@ ok millert@ pyr@ henning@ marco@
Revision 1.28 / (download) - annotate - [select for diffs], Thu Oct 16 16:34:32 2008 UTC (15 years, 7 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_4_6_BASE,
OPENBSD_4_6,
OPENBSD_4_5_BASE,
OPENBSD_4_5
Changes since 1.27: +20 -30 lines
Diff to previous 1.27 (colored)
Move memory allocation closer to where it is needed. Also make a distinction between len and size. OK deraadt@
Revision 1.27 / (download) - annotate - [select for diffs], Thu Oct 9 21:14:58 2008 UTC (15 years, 7 months ago) by millert
Branch: MAIN
Changes since 1.26: +5 -5 lines
Diff to previous 1.26 (colored)
Now that len is set later in compile_subst() we need to move the xmalloc call that goes with it.
Revision 1.26 / (download) - annotate - [select for diffs], Thu Oct 9 16:40:56 2008 UTC (15 years, 7 months ago) by millert
Branch: MAIN
Changes since 1.25: +6 -3 lines
Diff to previous 1.25 (colored)
In compile_subst(), adjust for the fact that the initial buffer that is passed in may now be larger than _POSIX2_LINE_MAX. Thanks to pedro@ for the test case. OK pedro@
Revision 1.25 / (download) - annotate - [select for diffs], Wed Oct 8 17:26:47 2008 UTC (15 years, 7 months ago) by millert
Branch: MAIN
Changes since 1.24: +49 -26 lines
Diff to previous 1.24 (colored)
Allow sed to handle arbitrarily long lines. Also plug a memory leak noticed in the process. Closes PR 5303. OK otto@ deraadt@
Revision 1.24 / (download) - annotate - [select for diffs], Tue Mar 20 03:50:39 2007 UTC (17 years, 2 months ago) by tedu
Branch: MAIN
CVS Tags: OPENBSD_4_4_BASE,
OPENBSD_4_4,
OPENBSD_4_3_BASE,
OPENBSD_4_3,
OPENBSD_4_2_BASE,
OPENBSD_4_2
Changes since 1.23: +3 -3 lines
Diff to previous 1.23 (colored)
remove some bogus *p tests from charles longeau ok deraadt millert
Revision 1.23 / (download) - annotate - [select for diffs], Tue Jan 9 08:37:44 2007 UTC (17 years, 4 months ago) by otto
Branch: MAIN
CVS Tags: OPENBSD_4_1_BASE,
OPENBSD_4_1
Changes since 1.22: +7 -3 lines
Diff to previous 1.22 (colored)
Accept empty command, from Matthew R. Dempsky; ok deraadt@ millert@
Revision 1.22 / (download) - annotate - [select for diffs], Mon Oct 9 00:23:56 2006 UTC (17 years, 7 months ago) by tedu
Branch: MAIN
Changes since 1.21: +34 -24 lines
Diff to previous 1.21 (colored)
pretty. the comma operator should not be used to cram two statements into an if without braces, or worse, into a return.
Revision 1.21 / (download) - annotate - [select for diffs], Mon Apr 11 07:11:44 2005 UTC (19 years, 1 month ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_4_0_BASE,
OPENBSD_4_0,
OPENBSD_3_9_BASE,
OPENBSD_3_9,
OPENBSD_3_8_BASE,
OPENBSD_3_8
Changes since 1.20: +5 -5 lines
Diff to previous 1.20 (colored)
spacing
Revision 1.20 / (download) - annotate - [select for diffs], Sat Jul 10 11:41:26 2004 UTC (19 years, 10 months ago) by otto
Branch: MAIN
CVS Tags: OPENBSD_3_7_BASE,
OPENBSD_3_7,
OPENBSD_3_6_BASE,
OPENBSD_3_6
Changes since 1.19: +3 -3 lines
Diff to previous 1.19 (colored)
xmalloc()->xrealloc() so that patterns larger than _POSIX2_LINE_MAX*2-1 work. From mycroft@netbsd. ok millert@
Revision 1.19 / (download) - annotate - [select for diffs], Fri Jul 9 19:39:40 2004 UTC (19 years, 10 months ago) by otto
Branch: MAIN
Changes since 1.18: +26 -5 lines
Diff to previous 1.18 (colored)
From the other BSDs: fix a bug that made sed(1) fail if the last character of the line buffer was a backslash. ok deraadt@
Revision 1.18 / (download) - annotate - [select for diffs], Sun Jun 13 17:11:17 2004 UTC (19 years, 11 months ago) by deraadt
Branch: MAIN
Changes since 1.17: +3 -3 lines
Diff to previous 1.17 (colored)
1-byte overflow; ryo@nerv.org, otto ok
Revision 1.17 / (download) - annotate - [select for diffs], Tue Feb 17 16:13:33 2004 UTC (20 years, 3 months ago) by otto
Branch: MAIN
CVS Tags: OPENBSD_3_5_BASE,
OPENBSD_3_5
Changes since 1.16: +9 -5 lines
Diff to previous 1.16 (colored)
Unbreak numeric flag parsing. Based on a fix from Jared Yanovich; this version with millert@. Resolves PR 3677. ok millert@
Revision 1.16 / (download) - annotate - [select for diffs], Tue Oct 7 17:56:26 2003 UTC (20 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.15: +30 -13 lines
Diff to previous 1.15 (colored)
handle ; terminators for strings like other sed programs do. this is apparently an extension, but without it you cannot express longer labelled sed scripts as one-liners. noted by seb@todesplanet.de apr 2002. also noted by cerille lefevre a bit later. fixed by otto and myself, tested on tree builds to be careful
Revision 1.15 / (download) - annotate - [select for diffs], Tue Jun 10 22:20:50 2003 UTC (20 years, 11 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_3_4_BASE,
OPENBSD_3_4
Changes since 1.14: +17 -36 lines
Diff to previous 1.14 (colored)
mostly ansi cleanup; pval ok
Revision 1.14 / (download) - annotate - [select for diffs], Tue Jun 3 02:56:16 2003 UTC (20 years, 11 months ago) by millert
Branch: MAIN
Changes since 1.13: +3 -7 lines
Diff to previous 1.13 (colored)
Remove the advertising clause in the UCB license which Berkeley rescinded 22 July 1999. Proofed by myself and Theo.
Revision 1.13 / (download) - annotate - [select for diffs], Tue Jul 9 21:31:03 2002 UTC (21 years, 10 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_3_3_BASE,
OPENBSD_3_3,
OPENBSD_3_2_BASE,
OPENBSD_3_2
Changes since 1.12: +3 -6 lines
Diff to previous 1.12 (colored)
make sed r command not bail out. try sed -e "/a/r" vtamara@wimsey.informatik.uni-kl.de, pr 2755
Revision 1.12 / (download) - annotate - [select for diffs], Tue Jun 11 06:16:36 2002 UTC (21 years, 11 months ago) by jsyn
Branch: MAIN
Changes since 1.11: +4 -4 lines
Diff to previous 1.11 (colored)
kill err(3) newlines; ok miod@, deraadt@
Revision 1.11 / (download) - annotate - [select for diffs], Sat Feb 16 21:27:52 2002 UTC (22 years, 3 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_3_1_BASE,
OPENBSD_3_1
Changes since 1.10: +16 -16 lines
Diff to previous 1.10 (colored)
Part one of userland __P removal. Done with a simple regexp with some minor hand editing to make comments line up correctly. Another pass is forthcoming that handles the cases that could not be done automatically.
Revision 1.10 / (download) - annotate - [select for diffs], Mon Nov 19 19:02:16 2001 UTC (22 years, 6 months ago) by mpech
Branch: MAIN
Changes since 1.9: +12 -12 lines
Diff to previous 1.9 (colored)
kill more registers millert@ ok
Revision 1.9 / (download) - annotate - [select for diffs], Thu Sep 24 03:00:59 1998 UTC (25 years, 8 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_3_0_BASE,
OPENBSD_3_0,
OPENBSD_2_9_BASE,
OPENBSD_2_9,
OPENBSD_2_8_BASE,
OPENBSD_2_8,
OPENBSD_2_7_BASE,
OPENBSD_2_7,
OPENBSD_2_6_BASE,
OPENBSD_2_6,
OPENBSD_2_5_BASE,
OPENBSD_2_5,
OPENBSD_2_4_BASE,
OPENBSD_2_4
Changes since 1.8: +3 -3 lines
Diff to previous 1.8 (colored)
correct sccsid, not like it really matters
Revision 1.8 / (download) - annotate - [select for diffs], Tue Sep 22 21:21:43 1998 UTC (25 years, 8 months ago) by brian
Branch: MAIN
Changes since 1.7: +3 -2 lines
Diff to previous 1.7 (colored)
Terminate our output string correctly if we've got an ``a'' command that has an escaped newline on the last line of the last script that we're processing.
Revision 1.7 / (download) - annotate - [select for diffs], Sun Feb 15 10:38:35 1998 UTC (26 years, 3 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_2_3_BASE,
OPENBSD_2_3
Changes since 1.6: +3 -3 lines
Diff to previous 1.6 (colored)
fix a comment
Revision 1.6 / (download) - annotate - [select for diffs], Wed Jan 21 03:51:49 1998 UTC (26 years, 4 months ago) by millert
Branch: MAIN
Changes since 1.5: +3 -3 lines
Diff to previous 1.5 (colored)
Back out last change. ed and sed should not use extended regular expressions.
Revision 1.5 / (download) - annotate - [select for diffs], Sun Jan 18 22:01:53 1998 UTC (26 years, 4 months ago) by millert
Branch: MAIN
Changes since 1.4: +3 -3 lines
Diff to previous 1.4 (colored)
Support extended (modern) instead of basic (obsolescent) regular expressions. hubert.feyrer@rz.uni-regensburg.de
Revision 1.4 / (download) - annotate - [select for diffs], Fri Nov 14 03:59:25 1997 UTC (26 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.3: +7 -7 lines
Diff to previous 1.3 (colored)
fix for a line continuation bug, more than a year ald. work by mckusick, bostic, mark@linus.demon.co.uk, davidg, and bde.
Revision 1.3 / (download) - annotate - [select for diffs], Mon Apr 28 20:23:19 1997 UTC (27 years ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_2_2_BASE,
OPENBSD_2_2,
OPENBSD_2_1_BASE,
OPENBSD_2_1
Changes since 1.2: +3 -3 lines
Diff to previous 1.2 (colored)
Use strtoul() not strtol() when assigning to an unsigned long.
Revision 1.2 / (download) - annotate - [select for diffs], Wed Jun 26 05:39:05 1996 UTC (27 years, 10 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_2_0_BASE,
OPENBSD_2_0
Changes since 1.1: +3 -1 lines
Diff to previous 1.1 (colored)
rcsid
Revision 1.1.1.1 / (download) - annotate - [select for diffs] (vendor branch), Wed Oct 18 08:46:05 1995 UTC (28 years, 7 months ago) by deraadt
CVS Tags: netbsd_1_1
Changes since 1.1: +0 -0 lines
Diff to previous 1.1 (colored)
initial import of NetBSD tree
Revision 1.1 / (download) - annotate - [select for diffs], Wed Oct 18 08:46:05 1995 UTC (28 years, 7 months ago) by deraadt
Branch: MAIN
Initial revision