From 880256b8bfde746cd54993f3abcb4dc648895af7 Mon Sep 17 00:00:00 2001 From: Hiltjo Posthuma Date: Mon, 28 Mar 2022 18:36:20 +0200 Subject: compatibility: replace iscntrl with own ISCNTRL macro It is unspecified if the C locale iscntrl is compatible with ASCII or not. Noticed when testing on OpenBSD 3.8 which uses extended ASCII and also uses the C1 range for control-characters. This breaks support with UTF-8. Reference: https://en.wikipedia.org/wiki/C0_and_C1_control_codes#C1_control_codes_for_general_use C1 table. Force an own definition of an ASCII-compatible control-character range since sfeed expects input to be UTF-8 (or converted from iconv) and so output to be UTF-8 aswell. --- sfeed.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sfeed.c') diff --git a/sfeed.c b/sfeed.c index 9b3fd8f..fc1249a 100644 --- a/sfeed.c +++ b/sfeed.c @@ -326,7 +326,7 @@ string_print_encoded(String *s) case '\t': putchar('\\'); putchar('t'); break; default: /* ignore control chars */ - if (!iscntrl((unsigned char)*p)) + if (!ISCNTRL((unsigned char)*p)) putchar(*p); break; } @@ -343,7 +343,7 @@ printtrimmed(const char *s) for (; *p && p != e; p++) { if (isspace((unsigned char)*p)) putchar(' '); /* any whitespace to space */ - else if (!iscntrl((unsigned char)*p)) + else if (!ISCNTRL((unsigned char)*p)) /* ignore other control chars */ putchar(*p); } -- cgit v1.2.3