mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2025-01-04 23:35:36 -08:00
Code

Fix a regression (and POSIX violation) introduced with UTF-8 support:

Browse Source 
When neither running on a terminal nor with -q, names must be passed
through as they are, nothing must be replaced with question marks.
Effectively, -q was always in effect.  SMALL was not affected.

Triggered by a different patch from Martijn van Duren <openbsd plus tech
at list dot imperialat dot at>, who confirmed that this version is better.
Identified as a regression by tedu@.
OK sthen@.
This commit is contained in:
schwarze 2016-01-18 19:06:37 +00:00
parent 09cf2d6e77
commit f96b7276b0
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bin/ls/utf8.c
View File

@ -1,7 +1,7 @@
/* $OpenBSD: utf8.c,v 1.1 2015/12/01 18:36:13 schwarze Exp $ */ /* $OpenBSD: utf8.c,v 1.2 2016/01/18 19:06:37 schwarze Exp $ */
/* /*
* Copyright (c) 2015 Ingo Schwarze <schwarze@openbsd.org> * Copyright (c) 2015, 2016 Ingo Schwarze <schwarze@openbsd.org>
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@ -21,6 +21,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <wchar.h> #include <wchar.h>
extern int f_nonprint;
int int
mbsprint(const char *mbs, int print) mbsprint(const char *mbs, int print)
{ {
@ -33,12 +35,16 @@ mbsprint(const char *mbs, int print)
if ((len = mbtowc(&wc, mbs, MB_CUR_MAX)) == -1) { if ((len = mbtowc(&wc, mbs, MB_CUR_MAX)) == -1) {
(void)mbtowc(NULL, NULL, MB_CUR_MAX); (void)mbtowc(NULL, NULL, MB_CUR_MAX);
if (print) if (print)
putchar('?'); putchar(f_nonprint ? '?' : *mbs);
total_width++; total_width++;
len = 1; len = 1;
} else if ((width = wcwidth(wc)) == -1) { } else if ((width = wcwidth(wc)) == -1) {
if (print) if (print) {
putchar('?'); if (f_nonprint)
putchar('?');
else
fwrite(mbs, 1, len, stdout);
}
total_width++; total_width++;
} else { } else {
if (print) if (print)