rpms/sed/devel sed-4.1.5-str_append.patch, NONE, 1.1 sed.spec, 1.35, 1.36

[fedora-cvs-commits at redhat.com]

Author: pmachata

Update of /cvs/dist/rpms/sed/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14725

Modified Files:
	sed.spec 
Added Files:
	sed-4.1.5-str_append.patch 
Log Message:
- remove superfluous multibyte processing in str_append (#177246)


sed-4.1.5-str_append.patch:
 execute.c |   22 ----------------------
 1 files changed, 22 deletions(-)

--- NEW FILE sed-4.1.5-str_append.patch ---
diff -Bburp sed-4.1.5/sed/execute.c sed-4.1.5-my/sed/execute.c
--- sed-4.1.5/sed/execute.c	2006-08-02 12:59:30.000000000 +0200
+++ sed-4.1.5-my/sed/execute.c	2006-08-02 13:00:23.000000000 +0200
@@ -227,28 +227,6 @@ str_append(to, string, length)
     resize_line(to, new_length);
   MEMCPY(to->active + to->length, string, length);
   to->length = new_length;
-
-#ifdef HAVE_MBRTOWC
-  if (mb_cur_max == 1)
-    return;
-
-  while (length)
-    {
-      int n = MBRLEN (string, length, &to->mbstate);
-
-      /* An invalid sequence is treated like a singlebyte character. */
-      if (n == -1)
-	{
-	  memset (&to->mbstate, 0, sizeof (to->mbstate));
-	  n = 1;
-	}
-
-      if (n > 0)
-	length -= n;
-      else
-	break;
-    }
-#endif
 }
 
 static void str_append_modified P_((struct line *, const char *, size_t,


Index: sed.spec
===================================================================
RCS file: /cvs/dist/rpms/sed/devel/sed.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sed.spec	17 Jul 2006 08:59:43 -0000	1.35
+++ sed.spec	2 Aug 2006 11:47:08 -0000	1.36
@@ -5,12 +5,13 @@
 Summary: A GNU stream text editor.
 Name: sed
 Version: 4.1.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: Applications/Text
 Source0: ftp://ftp.gnu.org/pub/gnu/sed/sed-%{version}.tar.gz
 Source1: http://sed.sourceforge.net/sedfaq.txt
 Patch0: sed-4.1.5-bz185374.patch
+Patch1: sed-4.1.5-str_append.patch
 Prereq: /sbin/install-info
 Prefix: %{_prefix}
 Buildroot: %{_tmppath}/%{name}-root
@@ -27,6 +28,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --without-included-regex
@@ -65,6 +67,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Wed Aug  2 2006 Petr Machata <pmachata at redhat.com> - 4.1.5-4
+- remove superfluous multibyte processing in str_append (#177246)
+
 * Mon Jul 17 2006 Petr Machata <pmachata at redhat.com> - 4.1.5-3
 - use dist tag