Attachment 152905 Details for Bug 236900 – Fix for RHEL-3

[patch] Fix for RHEL-3

sed-4.0.7-escapes.patch (text/plain), 1.53 KB, created by Petr Machata on 2007-04-18 13:42:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Petr Machata

Created: 2007-04-18 13:42:27 UTC

Size: 1.53 KB

patch

obsolete

>diff -urp sed-4.0.7/sed/compile.c sed-4.0.7-pm/sed/compile.c
>--- sed-4.0.7/sed/compile.c	2007-04-18 15:29:42.000000000 +0200
>+++ sed-4.0.7-pm/sed/compile.c	2007-04-18 15:28:39.000000000 +0200
>@@ -964,6 +964,17 @@ compile_address(addr, ch)
>   return TRUE;
> }
> 
>+static int
>+strip_double_backslash (char * string)
>+{
>+  char * it, * jt;
>+  for (it = jt = string; *jt; *it++ = *jt++)
>+    if (*jt == '\\')
>+      ++jt;
>+  *it = 0;
>+  return jt - it;
>+}
>+
> /* Read a program (or a subprogram within `{' `}' pairs) in and store
>    the compiled form in `*vector'.  Return a pointer to the new vector.  */
> static struct vector *compile_program P_((struct vector *));
>@@ -1237,6 +1250,7 @@ compile_program(vector)
> 	      bad_prog(_(UNTERM_Y_CMD));
> 
> 	    len = normalize_text(get_buffer(b), size_buffer(b));
>+	    len -= strip_double_backslash (get_buffer(b));
> 	    b3 = init_buffer();
> 	    add_buffer (b3, get_buffer(b), len);
> 	    free_buffer (b);
>@@ -1275,6 +1289,7 @@ compile_program(vector)
>                 idx = 0;
> 		len = normalize_text(dest_buf, size_buffer(b2));
> 		dest_buf[len] = '\0';
>+		len -= strip_double_backslash (dest_buf);
> 
>                 /* trans_pairs = {src(0), dest(0), src(1), dest(1), ..., NULL}
>                      src(i) : pointer to i-th source character.
>@@ -1327,6 +1342,7 @@ compile_program(vector)
> 
> 		len = normalize_text(dstring, size_buffer(b2));
> 		dstring[len] = '\0';
>+		strip_double_backslash (dstring);
> 		while (*dstring && *ustring)
> 		  cur_cmd->x.translate[*ustring++] = *dstring++;
> 		if (*ustring || *dstring)

Actions: View | Diff

Attachments on bug 236900: 152905