From: Arun Prakash Jana Date: Fri, 25 Aug 2017 12:57:06 +0000 (+0530) Subject: mbstowcs() returns the codepoints X-Git-Tag: v1.4~30 X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=ccdb95f3ab4d7fbadcfc09a93fe7f58e77a9d79f;p=nnn.git mbstowcs() returns the codepoints --- diff --git a/nnn.c b/nnn.c index 5397be1a..02b2bd65 100644 --- a/nnn.c +++ b/nnn.c @@ -1013,10 +1013,9 @@ xreadline(char *fname) size_t buflen = NAME_MAX - 1; DPRINTF_S(fname) - mbstowcs(buf, fname, NAME_MAX); - len = pos = wcslen(buf); + len = pos = mbstowcs(buf, fname, NAME_MAX); /* For future: handle NULL, say for a new name */ - if (len <= 0) { + if (len == (size_t)-1) { buf[0] = '\0'; len = pos = 0; }