i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Use ntfschar instead of wchar_t where applicable. libntfs assumed that the

Browse Source 
size of wchar was 16 bits, which was not true anymore after recent changes.
- Considering the changes were inside libntfs, which is 3rd party code, I am
  not sure this is the correct way to apply this fix (if you have a better
  idea, let me know.
- This fixes bug #4075.



git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31589 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Bruno G. Albuquerque
2009-07-15 15:39:09 +00:00
parent 0ca5323479
commit 137ded7516
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/ntfs/libntfs/unistr.c
+6 -6
View File
@@ -740,7 +740,7 @@ ntfs_wc_to_utf8(wchar_t c,unsigned char* buf)
* Returns the number of bytes consumed, or 0 on error. * Returns the number of bytes consumed, or 0 on error.
*/ */
static int static int
ntfs_wc_from_utf8(const unsigned char* str,wchar_t *c) ntfs_wc_from_utf8(const unsigned char* str, ntfschar* c)
{ {
int l=0,i; int l=0,i;
@@ -779,7 +779,7 @@ ntfs_wc_from_utf8(const unsigned char* str,wchar_t *c)
* The caller has to free the result string. * The caller has to free the result string.
* There is no support for UTF-16, yet * There is no support for UTF-16, yet
*/ */
static inline int ntfs_dupuni2utf8(wchar_t* in, int in_len,char **out,int *out_len) static inline int ntfs_dupuni2utf8(const ntfschar* in, int in_len,char **out,int *out_len)
{ {
int i,tmp; int i,tmp;
int len8; int len8;
@@ -807,13 +807,13 @@ static inline int ntfs_dupuni2utf8(wchar_t* in, int in_len,char **out,int *out_l
/* Converts an UTF-8 sequence to a wide string. Same conventions as the /* Converts an UTF-8 sequence to a wide string. Same conventions as the
* previous function * previous function
*/ */
static inline int ntfs_duputf82uni(unsigned char* in, int in_len,wchar_t** out,int *out_len) static inline int ntfs_duputf82uni(unsigned char* in, int in_len,ntfschar** out,int *out_len)
{ {
int i,tmp; int i,tmp;
int len16; int len16;
wchar_t* result; ntfschar* result;
wchar_t wtmp; ntfschar wtmp;
for(i=len16=0;i<in_len;i+=tmp,len16++) { for(i=len16=0;i<in_len;i+=tmp,len16++) {
tmp=ntfs_wc_from_utf8(in+i,&wtmp); tmp=ntfs_wc_from_utf8(in+i,&wtmp);
if(!tmp) if(!tmp)
@@ -861,7 +861,7 @@ static inline int ntfs_duputf82uni(unsigned char* in, int in_len,wchar_t** out,i
int ntfs_ucstombs(const ntfschar *ins, const int ins_len, char **outs, int outs_len) int ntfs_ucstombs(const ntfschar *ins, const int ins_len, char **outs, int outs_len)
{ {
int out_len = outs_len; int out_len = outs_len;
if(ntfs_dupuni2utf8((wchar_t*)ins,ins_len,outs,&out_len)==0) if(ntfs_dupuni2utf8(ins,ins_len,outs,&out_len)==0)
return out_len; return out_len;
else else
return EINVAL; return EINVAL;