minor improvements to index.h and ntfsmount.c

edge.strict_endians
cha0smaster 2005-07-29 21:37:09 +00:00
parent 6c5775628f
commit 7aebba2e12
2 changed files with 16 additions and 4 deletions

View File

@ -31,7 +31,7 @@
/**
* @ni: inode containing the @entry described by this context
* @name: name of the which context describes
* @name: name of the index described by this context
* @name_len: length of the index name
* @entry: index entry (points into @ir or @ia)
* @data: index entry data (points into @entry)
@ -115,5 +115,5 @@ static inline void ntfs_index_entry_mark_dirty(ntfs_index_context *ictx)
else
ictx->ia_dirty = TRUE;
}
#endif /* _NTFS_INDEX_H */
#endif /* _NTFS_INDEX_H */

View File

@ -304,8 +304,11 @@ static int ntfs_fuse_filler(ntfs_fuse_fill_context_t *fill_ctx,
if (name_type == FILE_NAME_DOS)
return 0;
if (ntfs_ucstombs(name, name_len, &filename, 0) < 0)
return -errno;
if (ntfs_ucstombs(name, name_len, &filename, 0) < 0) {
Eprintf("Skipping unrepresentable file (inode %lld): %s\n",
MREF(mref), strerror(errno));
return 0;
}
if (MREF(mref) >= FILE_first_user || ctx->show_sys_files)
fill_ctx->filler(fill_ctx->buf, filename, NULL, 0);
free(filename);
@ -955,6 +958,15 @@ static char *parse_options(char *options, char **device)
}
ctx->ro =TRUE;
strcat(ret, "ro,");
#ifdef DEBUG
} else if (!strcmp(opt, "fake_ro")) {
if (val) {
Eprintf("fake_ro option should not have "
"value.\n");
goto err_exit;
}
ctx->ro =TRUE;
#endif
} else if (!strcmp(opt, "fsname")) { /* Filesystem name. */
/*
* We need this to be able to check whether filesystem