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

Merge branch 'libntfs-3g_port' into libntfs-3g_port-v2_0_0

edge.strict_endians
Erik Larsson 2010-12-02 10:52:08 +01:00
parent 7b62a83286 efb3204b76
commit 6bf6464aeb
1 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
ntfsprogs/utils.h
View File

@ -109,17 +109,41 @@ int mft_next_record(struct mft_search_ctx *ctx);
static __inline__ int ntfs_mbstoucs_libntfscompat(const char *ins, static __inline__ int ntfs_mbstoucs_libntfscompat(const char *ins,
ntfschar **outs, int outs_len) ntfschar **outs, int outs_len)
{ {
ntfschar *tmpstr; if(!outs) {
int tmpstr_len; errno = EINVAL;
return -1;
}
else if(*outs != NULL) {
/* Note: libntfs's mbstoucs implementation allows the caller to
* specify a preallocated buffer while libntfs-3g's always
* allocates the output buffer.
*/
ntfschar *tmpstr = NULL;
int tmpstr_len;
if(*outs != NULL) {
tmpstr_len = ntfs_mbstoucs(ins, &tmpstr); tmpstr_len = ntfs_mbstoucs(ins, &tmpstr);
if(tmpstr_len >= 0) { if(tmpstr_len >= 0) {
/* The extra character is the null terminator. */ if(tmpstr_len > outs_len) {
memcpy(*outs, ins, /* Doing a realloc instead of reusing tmpstr
sizeof(ntfschar)*(MIN(outs_len, tmpstr_len)+1)); * because it emulates libntfs's mbstoucs more
* closely. */
ntfschar *re_outs =
realloc(*outs, tmpstr_len + 1);
if(!re_outs)
tmpstr_len = -1;
else
*outs = re_outs;
}
if(tmpstr_len >= 0) {
/* The extra character is the \0 terminator. */
memcpy(*outs, ins,
sizeof(ntfschar)*(tmpstr_len + 1));
}
free(tmpstr); free(tmpstr);
} }
return tmpstr_len; return tmpstr_len;
} }
else else