aboutsummaryrefslogtreecommitdiffstats
path: root/package/busybox/patches/000-upstream-sed.patch
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2010-06-16 13:24:11 +0000
committerNicolas Thill <nico@openwrt.org>2010-06-16 13:24:11 +0000
commit3dc2c3bb4d4569ab3387934ce55cca9adda42eae (patch)
tree59db0c8fcfba666a8c67537f41ef2ec1a71f378b /package/busybox/patches/000-upstream-sed.patch
parent3e52d0529655eacc581dd1fa14553191f0fc9c1e (diff)
downloadupstream-3dc2c3bb4d4569ab3387934ce55cca9adda42eae.tar.gz
upstream-3dc2c3bb4d4569ab3387934ce55cca9adda42eae.tar.bz2
upstream-3dc2c3bb4d4569ab3387934ce55cca9adda42eae.zip
package/busybox: update to 1.16.2 (bug fix release)
SVN-Revision: 21813
Diffstat (limited to 'package/busybox/patches/000-upstream-sed.patch')
-rw-r--r--package/busybox/patches/000-upstream-sed.patch45
1 files changed, 0 insertions, 45 deletions
diff --git a/package/busybox/patches/000-upstream-sed.patch b/package/busybox/patches/000-upstream-sed.patch
deleted file mode 100644
index 9842cc86b0..0000000000
--- a/package/busybox/patches/000-upstream-sed.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/editors/sed.c
-+++ b/editors/sed.c
-@@ -936,7 +936,15 @@ static void process_files(void)
- /* Skip blocks of commands we didn't match */
- if (sed_cmd->cmd == '{') {
- if (sed_cmd->invert ? matched : !matched) {
-- while (sed_cmd->cmd != '}') {
-+ unsigned nest_cnt = 0;
-+ while (1) {
-+ if (sed_cmd->cmd == '{')
-+ nest_cnt++;
-+ if (sed_cmd->cmd == '}') {
-+ nest_cnt--;
-+ if (nest_cnt == 0)
-+ break;
-+ }
- sed_cmd = sed_cmd->next;
- if (!sed_cmd)
- bb_error_msg_and_die("unterminated {");
-@@ -1031,7 +1039,7 @@ static void process_files(void)
- case 'c':
- /* Only triggers on last line of a matching range. */
- if (!sed_cmd->in_match)
-- sed_puts(sed_cmd->string, NO_EOL_CHAR);
-+ sed_puts(sed_cmd->string, '\n');
- goto discard_line;
-
- /* Read file, append contents to output */
---- a/testsuite/sed.tests
-+++ b/testsuite/sed.tests
-@@ -248,4 +248,14 @@ testing "sed beginning (^) matches only
- ">/usr</>lib<\n" "" \
- "/usr/lib\n"
-
-+testing "sed c" \
-+ "sed 'crepl'" \
-+ "repl\nrepl\n" "" \
-+ "first\nsecond\n"
-+
-+testing "sed nested {}s" \
-+ "sed '/asd/ { p; /s/ { s/s/c/ }; p; q }'" \
-+ "qwe\nasd\nacd\nacd\n" "" \
-+ "qwe\nasd\nzxc\n"
-+
- exit $FAILCOUNT