X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=x2p%2Fs2p.PL;h=d1ce6ea45ed1ad299a56e8157a3f6098ef6f8568;hb=cd22a09c8c81e5e4c639c15ad19704a0d1e0c842;hp=0a8d5298d3050adfa8a4f14409183f7078a915bf;hpb=863b2ca087e42ff68afb6c3798e231d6d04e396b;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/x2p/s2p.PL b/x2p/s2p.PL
index 0a8d529..d1ce6ea 100644
--- a/x2p/s2p.PL
+++ b/x2p/s2p.PL
@@ -69,6 +69,7 @@ $0 =~ s/^.*?(\w+)[\.\w]*$/$1/;
 # (p)sed - a stream editor
 # History:  Aug 12 2000: Original version.
 #           Mar 25 2002: Rearrange generated Perl program.
+#           Jul 23 2007: Fix bug in regex stripping (M.Thorland)
 
 use strict;
 use integer;
@@ -742,15 +743,21 @@ sub Comment($$$$$$){
     0;
 }
 
-
-sub stripRegex($$){
-    my( $del, $sref ) = @_;
+# stripRegex from the current command. If we're in the first
+# part of s///, trailing spaces have to be kept as the initial
+# part of the replacement string.
+#
+sub stripRegex($$;$){
+    my( $del, $sref, $sub ) = @_;
     my $regex = $del;
     print "stripRegex:$del:$$sref:\n" if $useDEBUG;
     while( $$sref =~ s{^(.*?)(\\*)\Q$del\E(\s*)}{}s ){
         my $sl = $2;
 	$regex .= $1.$sl.$del;
 	if( length( $sl ) % 2 == 0 ){
+            if( $sub && (length( $3 ) > 0) ){
+                $$sref = $3 . $$sref;
+	    }
 	    return $regex;
 	}
 	$regex .= $3;
@@ -1353,7 +1360,7 @@ sub Parse(){
 	    }
 	    if( $cmd =~ s{^([^\\\n])}{} ){
 		my $del = $1;
-		my $regex = stripRegex( $del, \$cmd );
+		my $regex = stripRegex( $del, \$cmd, "s" );
 		if( ! defined( $regex ) ){
 		    Warn( "malformed regular expression", $fl );
 		    $error++;