mirrors
/
nnn
mirror of https://github.com/jarun/nnn.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix regression

This commit is contained in:
Arun Prakash Jana 2019-03-09 18:18:32 +05:30
parent 2a85da09d5
commit e0eea57845
No known key found for this signature in database
GPG Key ID: A75979F35C080412
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/nnn.c
View File

@ -1944,19 +1944,25 @@ static inline void resetdircolor(int flags)
static char *unescape(const char *str, uint maxcols)
{
static wchar_t wbuf[NAME_MAX + 1] __attribute__ ((aligned));
static wchar_t *buf = wbuf;
static size_t len, lencount;
wchar_t *buf = wbuf;
size_t len, lencount = 0;
/* Convert multi-byte to wide char */
len = mbstowcs(wbuf, str, NAME_MAX);
//g_buf[0] = '\0';
while (*buf && lencount <= maxcols) {
if (*buf <= '\x1f' || *buf == '\x7f')
*buf = '\?';
if (maxcols) {
len = lencount = wcswidth(wbuf, len);
/* Reduce number of wide chars to max columns */
if (len > maxcols)
lencount = maxcols + 1;
++buf;
++lencount;
}
len = lencount = wcswidth(wbuf, len);
/* Reduce number of wide chars to max columns */
if (len > maxcols) {
lencount = maxcols + 1;
/* Reduce wide chars one by one till it fits */
while (len > maxcols)
@ -1965,13 +1971,6 @@ static char *unescape(const char *str, uint maxcols)
wbuf[lencount] = L'\0';
}
while (*buf) {
if (*buf <= '\x1f' || *buf == '\x7f')
*buf = '\?';
++buf;
}
/* Convert wide char to multi-byte */
wcstombs(g_buf, wbuf, NAME_MAX);
return g_buf;