mirror of
https://github.com/openbsd/src.git
synced 2025-01-02 22:35:36 -08:00
f96b7276b0
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@.
58 lines
1.7 KiB
C
58 lines
1.7 KiB
C
/* $OpenBSD: utf8.c,v 1.2 2016/01/18 19:06:37 schwarze Exp $ */
|
|
|
|
/*
|
|
* Copyright (c) 2015, 2016 Ingo Schwarze <schwarze@openbsd.org>
|
|
*
|
|
* Permission to use, copy, modify, and distribute this software for any
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
* copyright notice and this permission notice appear in all copies.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
|
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
|
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
|
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
*/
|
|
|
|
#ifndef SMALL
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <wchar.h>
|
|
|
|
extern int f_nonprint;
|
|
|
|
int
|
|
mbsprint(const char *mbs, int print)
|
|
{
|
|
wchar_t wc;
|
|
int len; /* length in bytes of UTF-8 encoded string */
|
|
int width; /* display width of a single Unicode char */
|
|
int total_width; /* display width of the whole string */
|
|
|
|
for (total_width = 0; *mbs != '\0'; mbs += len) {
|
|
if ((len = mbtowc(&wc, mbs, MB_CUR_MAX)) == -1) {
|
|
(void)mbtowc(NULL, NULL, MB_CUR_MAX);
|
|
if (print)
|
|
putchar(f_nonprint ? '?' : *mbs);
|
|
total_width++;
|
|
len = 1;
|
|
} else if ((width = wcwidth(wc)) == -1) {
|
|
if (print) {
|
|
if (f_nonprint)
|
|
putchar('?');
|
|
else
|
|
fwrite(mbs, 1, len, stdout);
|
|
}
|
|
total_width++;
|
|
} else {
|
|
if (print)
|
|
fwrite(mbs, 1, len, stdout);
|
|
total_width += width;
|
|
}
|
|
}
|
|
return total_width;
|
|
}
|
|
#endif
|