From c80065fe6900be5e794941e29b32440e9969b1c3 Mon Sep 17 00:00:00 2001 From: Christos Zoulas Date: Mon, 4 Jul 2022 19:44:35 +0000 Subject: [PATCH] PR/362: ro-ee: fix wide char printing --- src/file.c | 88 +++++++++++++++++++++++++++++++++++++++++------------ src/file.h | 4 +-- src/funcs.c | 4 +-- 3 files changed, 73 insertions(+), 23 deletions(-) diff --git src/file.c src/file.c index bb058ce1..5e89137d 100644 --- src/file.c +++ src/file.c |@@ -32,7 +32,7 @@ | #include "file.h" | | #ifndef lint |-FILE_RCSID("@(#)$File: file.c,v 1.196 2022/07/04 17:00:51 christos Exp $") |+FILE_RCSID("@(#)$File: file.c,v 1.197 2022/07/04 19:44:35 christos Exp $") | #endif /* lint */ | | #include "magic.h" @@ -60,6 +60,12 @@ FILE_RCSID("@(#)$File: file.c,v 1.196 2022/07/04 17:00:51 christos Exp $") #ifdef HAVE_WCTYPE_H #include #endif +#if defined(HAVE_WCHAR_H) && defined(HAVE_MBRTOWC) && defined(HAVE_WCWIDTH) && \ + defined(HAVE_WCTYPE_H) +#define FILE_WIDE_SUPPORT +#else +#include +#endif #if defined(HAVE_GETOPT_H) && defined(HAVE_STRUCT_OPTION) # include @@ -550,6 +556,55 @@ out: file_err(EXIT_FAILURE, "Cannot allocate memory for file list"); return e; } +private void +file_octal(unsigned char c) +{ + putc('\\', stdout); + putc(((c >> 6) & 7) + '0', stdout); + putc(((c >> 3) & 7) + '0', stdout); + putc(((c >> 0) & 7) + '0', stdout); +} + +private void +fname_print(const char *inname) +{ + size_t n = strlen(inname); +#ifdef FILE_WIDE_SUPPORT + mbstate_t state; + wchar_t nextchar; + size_t bytesconsumed; + + + (void)mbrlen(NULL, 0, &state); + while (n > 0) { + bytesconsumed = mbrtowc(&nextchar, inname, n, &state); + if (bytesconsumed == CAST(size_t, -1) || + bytesconsumed == CAST(size_t, -2)) { + nextchar = *inname; + bytesconsumed = 1; + } + inname += bytesconsumed; + n -= bytesconsumed; + if (iswprint(nextchar)) { + putwc(nextchar, stdout); + continue; + } + /* XXX: What if it is > 255? */ + file_octal(CAST(unsigned char, nextchar)); + } +#else + size_t i; + for (i = 0; i < n; i++) { + unsigned char c = CAST(unsigned char, inname[i]); + if (isprint(c)) { + putc(c); + continue; + } + file_octal(c); + } +#endif +} + /* * Called for each input file on the command line (or in a list of files) */ @@ -559,15 +614,13 @@ process(struct magic_set *ms, const char *inname, int wid) const char *type, c = nulsep > 1 ? '\0' : '\n'; int std_in = strcmp(inname, "-") == 0; int haderror = 0; - size_t plen = 4 * wid + 1; - char *pbuf, *pname; - - if ((pbuf = CAST(char *, malloc(plen))) == NULL) - file_err(EXIT_FAILURE, "Can't allocate %zu bytes", plen); if (wid > 0 && !bflag) { - pname = file_printable(ms, pbuf, plen, inname, wid); - (void)printf("%s", std_in ? "/dev/stdin" : pname); + const char *pname = std_in ? "/dev/stdin" : inname; + if ((ms->flags & MAGIC_RAW) == 0) + fname_print(pname); + else + (void)printf("%s", pname); if (nulsep) (void)putc('\0', stdout); if (nulsep < 2) { @@ -586,7 +639,6 @@ process(struct magic_set *ms, const char *inname, int wid) } if (nobuffer) haderror |= fflush(stdout) != 0; - free(pbuf); return haderror || type == NULL; } @@ -594,35 +646,33 @@ protected size_t file_mbswidth(struct magic_set *ms, const char *s) { size_t width = 0; -#if defined(HAVE_WCHAR_H) && defined(HAVE_MBRTOWC) && defined(HAVE_WCWIDTH) && \ - defined(HAVE_WCTYPE_H) - size_t bytesconsumed, old_n, n; +#ifdef FILE_WIDE_SUPPORT + size_t bytesconsumed, n; mbstate_t state; wchar_t nextchar; - (void)memset(&state, 0, sizeof(mbstate_t)); - old_n = n = strlen(s); + + (void)mbrlen(NULL, 0, &state); + n = strlen(s); while (n > 0) { bytesconsumed = mbrtowc(&nextchar, s, n, &state); if (bytesconsumed == CAST(size_t, -1) || bytesconsumed == CAST(size_t, -2)) { - /* Something went wrong, return something reasonable */ - return old_n; + nextchar = *s; + bytesconsumed = 1; } width += ((ms->flags & MAGIC_RAW) != 0 || iswprint(nextchar)) ? wcwidth(nextchar) : 4; s += bytesconsumed, n -= bytesconsumed; } - return width; #else while (*s) { width += (ms->flags & MAGIC_RAW) != 0 || isprint(CAST(unsigned char, *s)) ? 1 : 4; } - - return strlen(s); #endif + return width; } private void diff --git src/file.h src/file.h index 343f62ea..69aad1dc 100644 --- src/file.h +++ src/file.h @@ -27,7 +27,7 @@ */ /* * file.h - definitions for file(1) program - * @(#)$File: file.h,v 1.234 2022/05/28 20:24:09 christos Exp $ + * @(#)$File: file.h,v 1.235 2022/07/04 19:44:35 christos Exp $ */ #ifndef __file_h__ @@ -575,7 +575,7 @@ protected size_t file_pstring_length_size(struct magic_set *, const struct magic *); protected size_t file_pstring_get_length(struct magic_set *, const struct magic *, const char *); -public char * file_printable(struct magic_set *, char *, size_t, +protected char * file_printable(struct magic_set *, char *, size_t, const char *, size_t); #ifdef __EMX__ protected int file_os2_apptype(struct magic_set *, const char *, const void *, diff --git src/funcs.c src/funcs.c index 71041441..7186435c 100644 --- src/funcs.c +++ src/funcs.c @@ -27,7 +27,7 @@ #include "file.h" #ifndef lint -FILE_RCSID("@(#)$File: funcs.c,v 1.129 2022/05/28 20:24:09 christos Exp $") +FILE_RCSID("@(#)$File: funcs.c,v 1.130 2022/07/04 19:44:35 christos Exp $") #endif /* lint */ #include "magic.h" @@ -763,7 +763,7 @@ file_pop_buffer(struct magic_set *ms, file_pushbuf_t *pb) /* * convert string to ascii printable format. */ -public char * +protected char * file_printable(struct magic_set *ms, char *buf, size_t bufsiz, const char *str, size_t slen) { -- 2.35.3