opengnsys
/
ntfs-3g
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Work around mbstowcs() bug in DJGPP and update workaround for bug in 

mbsrtowcs() on Cygwin.  (Lode, Christophe, Anton)

(Logical change 1.384)
edge.strict_endians
cantab.net!aia21 2004-04-27 12:48:14 +00:00
parent 9de9d6bdf1
commit 03a99a7ece
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libntfs/unistr.c
View File

@ -451,16 +451,20 @@ int ntfs_mbstoucs(const char *ins, uchar_t **outs, int outs_len)
}
/* Determine the length of the multi-byte string. */
s = ins;
#ifdef HAVE_MBSINIT
#if defined(HAVE_MBSINIT)
memset(&mbstate, 0, sizeof(mbstate));
ins_len = mbsrtowcs(NULL, (const char **)&s, 0, &mbstate);
#else
ins_len = mbstowcs(NULL, s, 0);
#endif
#ifdef __CYGWIN32__
/* Eeek!!! Cygwin has broken mbstowcs() implementation!!! */
if (!ins_len)
if (!ins_len && *ins) {
/* Older Cygwin had broken mbsrtowcs() implementation. */
ins_len = strlen(ins);
}
#endif
#elif !defined(DJGPP)
ins_len = mbstowcs(NULL, s, 0);
#else
/* Eeek!!! DJGPP has broken mbstowcs() implementation!!! */
ins_len = strlen(ins);
#endif
if (ins_len == -1)
return ins_len;
@ -550,4 +554,3 @@ err_out:
}
return -1;
}