mirrors/libfuse
0
0
Fork 0
mirror of https://github.com/libfuse/libfuse.git synced 2024-11-23 12:14:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Miklos Szeredi 2003-10-22 11:11:57 +00:00
parent 0e5350899c
commit f08ace0740
4 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2003-10-22 Miklos Szeredi <mszeredi@inf.bme.hu>
* Mtab handling fix in fusermount by "Valient Gough" (SF patch
#766443)
2003-10-13 Miklos Szeredi <mszeredi@inf.bme.hu>
* Error code fixes in kernel module

2
Filesystems
View File

@ -2,7 +2,7 @@ Name: OW
Author: Paul H. Alfille <palfille at partners org>
Homepage: http://home.earthlink.net/~palfille/ow.html
Homepage: http://owfs.sourceforge.net
Description:

10
include/fuse.h
View File

@ -38,8 +38,14 @@ struct fuse_statfs {
/** Handle for a getdir() operation */
typedef struct fuse_dirhandle *fuse_dirh_t;
/** Function to add an entry in a getdir() operation */
typedef int (*fuse_dirfil_t) (fuse_dirh_t, const char *, int type);
/** Function to add an entry in a getdir() operation
*
* @param h the handle passed to the getdir() operation
* @param name the file name of the directory entry
* @param type the file type (0 if unknown) see <dirent.h>
* @return 0 on success, -errno on error
*/
typedef int (*fuse_dirfil_t) (fuse_dirh_t h, const char *name, int type);
/**
* The file system operations:

19
util/fusermount.c
View File

@ -150,16 +150,8 @@ static int remove_mount(const char *mnt)
remove = 1;
}
}
if(remove) {
res = umount2(mnt, 2); /* Lazy umount */
if(res == -1) {
fprintf(stderr, "%s: failed to unmount %s: %s\n", progname,
mnt, strerror(errno));
found = -1;
break;
}
if(remove)
found = 1;
}
else {
res = addmntent(newfp, entp);
if(res != 0) {
@ -172,6 +164,15 @@ static int remove_mount(const char *mnt)
endmntent(fp);
endmntent(newfp);
if(found) {
res = umount2(mnt, 2); /* Lazy umount */
if(res == -1) {
fprintf(stderr, "%s: failed to unmount %s: %s\n", progname, mnt,
strerror(errno));
found = -1;
}
}
if(found == 1) {
res = rename(mtab_new, mtab);