fix

diff --git a/ChangeLog b/ChangeLog
index 169b91c5c9dd27af81a177148d6db93a12e26b2e..c2a8a983ffeb7745c5d7e56a5bd93fa40ddeb2aa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 5e35c2652e9fb98c84791937da07dc8b128629e0..ec9eb163f00bd4aad51389cea45c5c4ee2a35c7e 100644 (file)
--- 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 c0828f761c7a72dcbcc3ea8cde158f389394dc47..df254a902ef07b36066da4d109577d5f0edbd462 100644 (file)
--- 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 3236ce854d665927dad7a6fdd871a3303a0103b4..f7a5299949639ab8cfaa349fe07ac7b9a58f8225 100644 (file)
--- 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 6ccc58e16d8db6f1ebdc6c8de2323db4b0c4589c..87dfaa8cd7e744e62f3f71a22ca22298844b59c6 100644 (file)
--- 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"