mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2024-11-28 05:41:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify unescape() in no locale mode

Browse source
This commit is contained in:
Arun Prakash Jana 2020-05-03 02:52:48 +05:30
parent f5c6f4f90b
commit ff568ea748
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/nnn.c
View file

@ -3049,16 +3049,13 @@ static void resetdircolor(int flags)
* Adjust string length to maxcols if > 0; * Adjust string length to maxcols if > 0;
* Max supported str length: NAME_MAX; * Max supported str length: NAME_MAX;
*/ */
#ifndef NOLOCALE
static wchar_t *unescape(const char *str, uint maxcols) static wchar_t *unescape(const char *str, uint maxcols)
{ {
wchar_t * const wbuf = (wchar_t *)g_buf; wchar_t * const wbuf = (wchar_t *)g_buf;
wchar_t *buf = wbuf; wchar_t *buf = wbuf;
size_t lencount = 0; size_t lencount = 0;
#ifdef NOLOCALE
memset(wbuf, 0, (NAME_MAX + 1) * sizeof(wchar_t));
#endif
/* Convert multi-byte to wide char */ /* Convert multi-byte to wide char */
size_t len = mbstowcs(wbuf, str, NAME_MAX); size_t len = mbstowcs(wbuf, str, NAME_MAX);
@ -3091,6 +3088,19 @@ static wchar_t *unescape(const char *str, uint maxcols)
return wbuf; return wbuf;
} }
#else
static char *unescape(const char *str, uint maxcols)
{
ssize_t len = (ssize_t)xstrsncpy(g_buf, str, maxcols);
--len;
while (--len >= 0)
if (g_buf[len] <= '\x1f' || g_buf[len] == '\x7f')
g_buf[len] = '\?';
return g_buf;
}
#endif
static char *coolsize(off_t size) static char *coolsize(off_t size)
{ {
@ -3241,7 +3251,11 @@ static void printent(const struct entry *ent, uint namecols, bool sel)
if (attrs) if (attrs)
attron(attrs); attron(attrs);
#ifndef NOLOCALE
addwstr(unescape(ent->name, namecols)); addwstr(unescape(ent->name, namecols));
#else
addstr(unescape(ent->name, MIN(namecols, ent->nlen) + 1));
#endif
if (attrs) if (attrs)
attroff(attrs); attroff(attrs);
@ -3326,7 +3340,11 @@ static void printent_long(const struct entry *ent, uint namecols, bool sel)
attroff(A_DIM); attroff(A_DIM);
attrs ^= A_DIM; attrs ^= A_DIM;
} }
#ifndef NOLOCALE
addwstr(unescape(ent->name, namecols)); addwstr(unescape(ent->name, namecols));
#else
addstr(unescape(ent->name, MIN(namecols, ent->nlen) + 1));
#endif
if (attrs) if (attrs)
attroff(attrs); attroff(attrs);
if (ind2) if (ind2)