Attachment 173156 Details for Bug 211499 – Patch from upstream

[patch] Patch from upstream

tmux-utf8-fix.diff (text/plain), 1.65 KB, created by Oleh Hushchenkov on 2016-08-01 11:21:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Oleh Hushchenkov

Created: 2016-08-01 11:21:50 UTC

Size: 1.65 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 419429)
>+++ Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	tmux
> PORTVERSION=	2.2
>+PORTREVISION=	1
> CATEGORIES=	sysutils
> MASTER_SITES=	https://github.com/tmux/tmux/releases/download/${PORTVERSION}/
> DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
>Index: files/patch-utf8.c
>===================================================================
>--- files/patch-utf8.c	(nonexistent)
>+++ files/patch-utf8.c	(working copy)
>@@ -0,0 +1,29 @@
>+--- utf8.c.orig	2016-08-01 09:24:01 UTC
>++++ utf8.c
>+@@ -115,8 +115,25 @@ utf8_width(wchar_t wc)
>+ 	int	width;
>+ 
>+ 	width = wcwidth(wc);
>+-	if (width < 0 || width > 0xff)
>++	if (width < 0 || width > 0xff) {
>++		log_debug("Unicode %04x, wcwidth() %d", wc, width);
>++
>++#ifndef __OpenBSD__
>++		/*
>++		 * Many platforms (particularly and inevitably OS X) have no
>++		 * width for relatively common characters (wcwidth() returns
>++		 * -1); assume width 1 in this case. This will be wrong for
>++		 * genuinely nonprintable characters, but they should be
>++		 * rare. We may pass through stuff that ideally we would block,
>++		 * but this is no worse than sending the same to the terminal
>++		 * without tmux.
>++		 */
>++		if (width < 0)
>++			return (1);
>++#endif
>++
>+ 		return (-1);
>++	}
>+ 	return (width);
>+ }
>+ 
>
>Property changes on: files/patch-utf8.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 211499: 173156