Changes by: cha0smaster
Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3838/ntfsprogs
Modified Files:
ntfsmount.c
Log Message:
minor improvements to index.h and ntfsmount.c
Index: ntfsmount.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- ntfsmount.c 20 Jul 2005 19:06:50 -0000 1.15
+++ ntfsmount.c 29 Jul 2005 21:37:10 -0000 1.16
@@ -304,8 +304,11 @@ static int ntfs_fuse_filler(ntfs_fuse_fi
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
}
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
|
