fix

diff --git a/ChangeLog b/ChangeLog
index dfa300453aa3f507bb3ae4d35bb80ad72468472d..a2d2894eedb5f4c60388fff9e5ca79b872050369 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-10  Miklos Szeredi <miklos@szeredi.hu>
+
+       * Moved mountpoint argument checking from fuse_parse_cmdline() to
+       fuse_mount() in preparation to FreeBSD merge.
+
 2005-11-08  Miklos Szeredi <miklos@szeredi.hu>
 
        * Remove unneeded close() from fuse_teardown().  Spotted by Csaba

diff --git a/lib/helper.c b/lib/helper.c
index ae43c87ee1e59e3b069e787741f764741e96e74e..89cd7a83af05874f9c510641d1f82d1bd3ea606b 100644 (file)
--- a/lib/helper.c
+++ b/lib/helper.c
@@ -274,12 +274,6 @@ static int fuse_parse_cmdline(int argc, const char *argv[], char **kernel_opts,
             goto err;
         }
     }
-
-    if (*mountpoint == NULL) {
-        fprintf(stderr, "missing mountpoint\n");
-        fprintf(stderr, "see `%s -h' for usage\n", argv[0]);
-        goto err;
-    }
     return 0;
 
  err:
@@ -371,6 +365,8 @@ struct fuse *fuse_setup_compat2(int argc, char *argv[],
 
 void fuse_teardown(struct fuse *fuse, int fd, char *mountpoint)
 {
+    (void) fd;
+
     if (fuse_instance != fuse)
         fprintf(stderr, "fuse: fuse_teardown() with unknown fuse object\n");
     else

diff --git a/lib/mount.c b/lib/mount.c
index f7a5299949639ab8cfaa349fe07ac7b9a58f8225..62e2b4a7476e59ed31638cd25b8d4ff2b1fddea1 100644 (file)
--- a/lib/mount.c
+++ b/lib/mount.c
@@ -86,6 +86,11 @@ int fuse_mount(const char *mountpoint, const char *opts)
     int res;
     int rv;
 
+    if (!mountpoint) {
+        fprintf(stderr, "fuse: missing mountpoint\n");
+        return -1;
+    }
+
     res = socketpair(PF_UNIX, SOCK_STREAM, 0, fds);
     if(res == -1) {
         perror("fuse: socketpair() failed");