mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-04 00:56:10 +00:00 
			
		
		
		
	Remove fallback for wcwidth failure, GitHub issue 3003.
This commit is contained in:
		
							
								
								
									
										15
									
								
								utf8.c
									
									
									
									
									
								
							
							
						
						
									
										15
									
								
								utf8.c
									
									
									
									
									
								
							@@ -237,21 +237,6 @@ utf8_width(struct utf8_data *ud, int *width)
 | 
			
		||||
	if (*width >= 0 && *width <= 0xff)
 | 
			
		||||
		return (UTF8_DONE);
 | 
			
		||||
	log_debug("UTF-8 %.*s, wcwidth() %d", (int)ud->size, ud->data, *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) {
 | 
			
		||||
		*width = 1;
 | 
			
		||||
		return (UTF8_DONE);
 | 
			
		||||
	}
 | 
			
		||||
#endif
 | 
			
		||||
	return (UTF8_ERROR);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user