diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.in | 7 | ||||
| -rw-r--r-- | lib/fuse_loop_mt.c | 2 | ||||
| -rw-r--r-- | lib/mount.c | 2 | ||||
| -rw-r--r-- | util/fusermount.c | 7 |
5 files changed, 16 insertions, 6 deletions
@@ -1,3 +1,7 @@ +2005-09-28 Miklos Szeredi <miklos@szeredi.hu> + + * UClibc fixes from Christian Magnusson + 2005-09-27 Miklos Szeredi <miklos@szeredi.hu> * Added NAME="%k" to util/udev.rules. Fix by Mattias Wadman. diff --git a/configure.in b/configure.in index 5e35c26..ec9eb16 100644 --- a/configure.in +++ b/configure.in @@ -26,6 +26,8 @@ AC_ARG_ENABLE(util, [ --enable-util Compile with util ]) AC_ARG_ENABLE(example, [ --enable-example Compile with examples ]) +AC_ARG_ENABLE(mtab, + [ --disable-mtab Disable and ignore usage of /etc/mtab ]) subdirs2="include" @@ -42,7 +44,10 @@ fi if test "$enable_example" != "no"; then subdirs2="$subdirs2 example"; fi -AC_CHECK_FUNCS([setxattr]) +if test "$enable_mtab" = "no"; then + AC_DEFINE(IGNORE_MTAB, 1, [Don't update /etc/mtab]) +fi +AC_CHECK_FUNCS([fork setxattr]) AC_CHECK_MEMBERS([struct stat.st_atim]) if test -z "$MOUNT_FUSE_PATH"; then diff --git a/lib/fuse_loop_mt.c b/lib/fuse_loop_mt.c index c0828f7..df254a9 100644 --- a/lib/fuse_loop_mt.c +++ b/lib/fuse_loop_mt.c @@ -33,7 +33,7 @@ struct fuse_worker { #ifndef USE_UCLIBC #define mutex_init(mut) pthread_mutex_init(mut, NULL) #else -static void mutex_init(pthread_mutex_t mut) +static void mutex_init(pthread_mutex_t *mut) { pthread_mutexattr_t attr; pthread_mutexattr_init(&attr); diff --git a/lib/mount.c b/lib/mount.c index 3236ce8..f7a5299 100644 --- a/lib/mount.c +++ b/lib/mount.c @@ -92,7 +92,7 @@ int fuse_mount(const char *mountpoint, const char *opts) return -1; } -#ifndef USE_UCLIBC +#ifdef HAVE_FORK pid = fork(); #else pid = vfork(); diff --git a/util/fusermount.c b/util/fusermount.c index 6ccc58e..87dfaa8 100644 --- a/util/fusermount.c +++ b/util/fusermount.c @@ -92,7 +92,7 @@ static int do_unmount(const char *mnt, int quiet, int lazy) return res; } -#ifndef USE_UCLIBC +#ifndef IGNORE_MTAB /* use a lock file so that multiple fusermount processes don't try and modify the mtab file at once! */ static int lock_mtab(void) @@ -291,7 +291,7 @@ static int unmount_fuse(const char *mnt, int quiet, int lazy) } return 0; } -#else /* USE_UCLIBC */ +#else /* IGNORE_MTAB */ static int lock_mtab() { return 0; @@ -321,7 +321,7 @@ static int unmount_fuse(const char *mnt, int quiet, int lazy) { return do_unmount(mnt, quiet, lazy); } -#endif +#endif /* IGNORE_MTAB */ static void strip_line(char *line) { @@ -987,6 +987,7 @@ static void usage(void) "%s: [options] mountpoint\n" "Options:\n" " -h print help\n" + " -v print version\n" " -o opt[,opt...] mount options\n" " -u unmount\n" " -q quiet\n" |