sync with sed--stable--4.1

2005-02-10  Paolo Bonzini  <bonzini@gnu.org>

	* testsuite/appquit.good, testsuite/appquit.inp,
	testsuite/appquit.sed: New testcase.
	* testsuite/readin.sed: Quit after the last r command.
	* testsuite/readin.good: Adjust.
	* sed/execute.c (execute_program): Dump the results of the
	a/r/R commands just before quitting.

2005-02-10  Paolo Bonzini  <bonzini@gnu.org>

	* sed/regexp.c: Fix off-by-one error in the "invalid reference
	to subexpression" message.  Debian bug 294339.

Patches applied:

 * bonzini@gnu.org--2004b/sed--stable--4.1--patch-42
   fix debian bug 294339

 * bonzini@gnu.org--2004b/sed--stable--4.1--patch-43
   fix crash on /\(\)/x

 * bonzini@gnu.org--2004b/sed--stable--4.1--patch-44
   fix a/r/R commands when q is encountered

git-archimport-id: bonzini@gnu.org--2004b/sed--ssed--3.61--patch-19
This commit is contained in:
Paolo Bonzini committed 2008-01-09 16:14:01 +01:00
1 parent a1f54d8aa8
commit faaf9ad2cd
11 files changed
+30 -6

No files matched your search

+14
View File
@@ -1,3 +1,17 @@
2005-02-10 Paolo Bonzini <bonzini@gnu.org>
* testsuite/appquit.good, testsuite/appquit.inp,
testsuite/appquit.sed: New testcase.
* testsuite/readin.sed: Quit after the last r command.
* testsuite/readin.good: Adjust.
* sed/execute.c (execute_program): Dump the results of the
a/r/R commands just before quitting.
2005-02-10 Paolo Bonzini <bonzini@gnu.org>
* sed/regexp.c: Fix off-by-one error in the "invalid reference
to subexpression" message. Debian bug 294339.
2005-02-08 Paolo Bonzini <bonzini@gnu.org>
* lib/obstack.h: include config.h.
+3 -1
View File
@@ -1,4 +1,4 @@
Sed 3.62 (aligned with GNU sed 4.1.3)
Sed 3.62 (aligned with GNU sed CVS at 2005-02-10)
* added a note to BUGS and the manual about changed interpretation
of `s|abc\|def||', and about localization issues.
@@ -7,6 +7,8 @@ Sed 3.62 (aligned with GNU sed 4.1.3)
* fixed `make check' in non-English locales.
* output the result of commands a, r, R when a q command is found.
-----------------------------------------------------------------------
Sed 3.61a
+1
View File
@@ -1466,6 +1466,7 @@ execute_program(vec, input)
case 'q':
if (!no_default_output)
output_line(line.active, line.length, line.chomped, &output_file);
dump_append_queue();
case 'Q':
return cur_cmd->x.int_arg == -1 ? 0 : cur_cmd->x.int_arg;
+1 -1
View File
@@ -113,7 +113,7 @@ compile_regex_1 (new_regex, needed_sub)
{
char buf[200];
sprintf(buf, _("invalid reference \\%d on `s' command's RHS"),
needed_sub);
needed_sub - 1);
bad_prog(buf);
}
}
+2 -1
View File
@@ -9,7 +9,7 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/pcre \
-I$(top_builddir)/intl -I$(top_srcdir)/intl
SEDTESTS = \
space enable sep inclib 8bit newjis xabcx dollar noeol noeolw \
space appquit enable sep inclib 8bit newjis xabcx dollar noeol noeolw \
numsub numsub2 numsub3 numsub4 numsub5 0range bkslashes \
head madding mac-mf empty xbxcx xbxcx3 recall recall2 xemacs \
fasts uniq manis khadafy linecnt eval distrib 8to7 \
@@ -28,6 +28,7 @@ EXTRA_DIST = runtest Makefile.tests \
8bit.good 8bit.inp 8bit.sed \
8to7.good 8to7.inp 8to7.sed \
allsub.good allsub.inp allsub.sed \
appquit.good appquit.inp appquit.sed \
binary.good binary.inp binary.sed binary2.sed binary3.sed \
bkslashes.good bkslashes.inp bkslashes.sed \
bsd.good bsd.sh \
+1 -1
View File
@@ -13,7 +13,7 @@ RM=rm -f
enable sep inclib 8bit 8to7 newjis xabcx dollar noeol bkslashes \
numsub head madding mac-mf empty xbxcx xbxcx3 recall recall2 xemacs \
fasts uniq manis linecnt khadafy allsub flipcase space::
appquit fasts uniq manis linecnt khadafy allsub flipcase space::
$(SEDENV) $(SED) -f $(srcdir)/$@.sed \
< $(srcdir)/$@.inp > $@.out
$(CMP) $(srcdir)/$@.good $@.out
+2
View File
@@ -0,0 +1,2 @@
doh
ok
+1
View File
@@ -0,0 +1 @@
doh
+4
View File
@@ -0,0 +1,4 @@
# Test appending quit
a\
ok
q
-2
View File
@@ -17,5 +17,3 @@ MOO
MOO
I live here, too.
MOO
I want freedom just as you.''
``The Weary Blues'', Langston Hughes
+1
View File
@@ -1 +1,2 @@
/\.$/r readin.in2
/too\.$/q