util-linux/util-linux-2.11y-multibyte.patch

27 lines
761 B
Diff
Raw Normal View History

auto-import changelog data from util-linux-2.11y-9.src.rpm Mon Feb 24 2003 Elliot Lee <sopwith@redhat.com> - rebuilt Wed Feb 19 2003 Elliot Lee <sopwith@redhat.com> 2.11y-8 - ipcs-84243.patch to fix #84243 Thu Feb 13 2003 Yukihiro Nakai <ynakai@redhat.com> 2.11y-7 - Update moremisc patch to fix swprintf()'s minimum field (bug #83361). Mon Feb 03 2003 Elliot Lee <sopwith@redhat.com> 2.11y-6 - Fix mcookie segfault on many 64-bit architectures (bug #83345). Mon Feb 03 2003 Tim Waugh <twaugh@redhat.com> 2.11y-5 - Fix underlined multibyte characters (bug #83376). Sun Feb 02 2003 Florian La Roche <Florian.LaRoche@redhat.de> - rebuild to have again a s390 rpm - disable some more apps for mainframe Wed Jan 29 2003 Elliot Lee <sopwith@redhat.com> 2.11y-4 - util-linux-2.11y-umask-82552.patch Wed Jan 22 2003 Tim Powers <timp@redhat.com> - rebuilt Mon Jan 13 2003 Elliot Lee <sopwith@redhat.com> 2.11y-2 - Fix #81069, #75421 Mon Jan 13 2003 Elliot Lee <sopwith@redhat.com> 2.11y-1 - Update to 2.11y - Fix #80953 - Update patch0, patch107, patch117, patch120 for 2.11y - Remove patch60, patch61, patch207, patch211, patch212, patch119, patch121 - Remove patch122, patch200 Wed Oct 30 2002 Elliot Lee <sopwith@redhat.com> 2.11w-2 - Remove some crack/unnecessary patches while submitting stuff upstream. - Build with -D_FILE_OFFSET_BITS=64 Tue Oct 29 2002 Elliot Lee <sopwith@redhat.com> 2.11w-1 - Update to 2.11w, resolve patch conflicts Tue Oct 08 2002 Phil Knirsch <pknirsch@redhat.com> 2.11r-10hammer.3 - Extended util-linux-2.11b-s390x patch to work again. Thu Oct 03 2002 Elliot Lee <sopwith@redhat.com> 2.11r-10hammer.2 - Add patch122 for hwclock on x86_64 Thu Sep 12 2002 Than Ngo <than@redhat.com> 2.11r-10hammer.1 - Fixed pam config files Wed Sep 11 2002 Bernhard Rosenkraenzer <bero@redhat.com> 2.11r-10hammer - Port to hammer
2004-09-13 20:57:34 +00:00
--- util-linux-2.11y/text-utils/more.c.multibyte 2003-02-03 16:22:32.000000000 +0000
+++ util-linux-2.11y/text-utils/more.c 2003-02-03 17:03:45.000000000 +0000
@@ -1163,7 +1163,23 @@
my_putstring(state ? ULenter : ULexit);
}
if (c != ' ' || pstate == 0 || state != 0 || ulglitch == 0)
+#ifdef ENABLE_WIDECHAR
+ {
+ wchar_t wc;
+ size_t mblength;
+ mbstate_t state;
+ memset (&state, '\0', sizeof (mbstate_t));
+ s--; n++;
+ mblength = mbrtowc (&wc, s, n, &state);
+ if (mblength == (size_t) -2 || mblength == (size_t) -1)
+ mblength = 1;
+ while (mblength--)
+ putchar (*s++);
+ n += mblength;
+ }
+#else
putchar(c);
+#endif /* ENABLE_WIDECHAR */
if (state && *chUL) {
pr(chBS);
my_putstring(chUL);