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

fix: mount failed if /etc/mtab didn't exist or was on a read-only 

file system (Miklos Szeredi, Szabolcs Szakacsits)
master
szaka 2008-06-27 12:37:02 +00:00
parent 2848f06bad
commit f94a09b151
1 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libfuse-lite/mount_util.c
View File

@ -23,17 +23,35 @@
static int mtab_needs_update(const char *mnt)
{
struct stat stbuf;
int res;
struct stat stbuf;
/* If mtab is within new mount, don't touch it */
if (strncmp(mnt, _PATH_MOUNTED, strlen(mnt)) == 0 &&
_PATH_MOUNTED[strlen(mnt)] == '/')
return 0;
/* If mtab is within new mount, don't touch it */
if (strncmp(mnt, _PATH_MOUNTED, strlen(mnt)) == 0 &&
_PATH_MOUNTED[strlen(mnt)] == '/')
return 0;
if (lstat(_PATH_MOUNTED, &stbuf) != -1 && S_ISLNK(stbuf.st_mode))
return 0;
/*
* Skip mtab update if /etc/mtab:
*
* - doesn't exist,
* - is a symlink,
* - is on a read-only filesystem.
*/
res = lstat(_PATH_MOUNTED, &stbuf);
if (res == -1) {
if (errno == ENOENT)
return 0;
} else {
if (S_ISLNK(stbuf.st_mode))
return 0;
return 1;
res = access(_PATH_MOUNTED, W_OK);
if (res == -1 && errno == EROFS)
return 0;
}
return 1;
}
int fuse_mnt_add_mount(const char *progname, const char *fsname,