search for: fuse_opt_add_arg

...ff --git a/lib/fuse.c b/lib/fuse.c index 0180f8f..98bbc8d 100644 --- a/lib/fuse.c +++ b/lib/fuse.c @@ -989,8 +989,7 @@ guestfs_impl_mount_local (guestfs_h *g, const char *localmountpoint, return -1; /* Create the FUSE 'args'. */ - /* XXX we don't have a program name */ - if (fuse_opt_add_arg (&args, "guestfs_mount_local") == -1) { + if (fuse_opt_add_arg (&args, g->program) == -1) { arg_error: perrorf (g, _("fuse_opt_add_arg: %s"), localmountpoint); fuse_opt_free_args (&args); -- 2.9.3

...ff --git a/src/fuse.c b/src/fuse.c index 0180f8f..98bbc8d 100644 --- a/src/fuse.c +++ b/src/fuse.c @@ -989,8 +989,7 @@ guestfs_impl_mount_local (guestfs_h *g, const char *localmountpoint, return -1; /* Create the FUSE 'args'. */ - /* XXX we don't have a program name */ - if (fuse_opt_add_arg (&args, "guestfs_mount_local") == -1) { + if (fuse_opt_add_arg (&args, g->program) == -1) { arg_error: perrorf (g, _("fuse_opt_add_arg: %s"), localmountpoint); fuse_opt_free_args (&args); -- 2.7.4

...0180f8f..98bbc8d 100644 > --- a/lib/fuse.c > +++ b/lib/fuse.c > @@ -989,8 +989,7 @@ guestfs_impl_mount_local (guestfs_h *g, const char *localmountpoint, > return -1; > > /* Create the FUSE 'args'. */ > - /* XXX we don't have a program name */ > - if (fuse_opt_add_arg (&args, "guestfs_mount_local") == -1) { > + if (fuse_opt_add_arg (&args, g->program) == -1) { > arg_error: > perrorf (g, _("fuse_opt_add_arg: %s"), localmountpoint); > fuse_opt_free_args (&args); ACK. I think there is a bug in our docum...

...v[optind]); > + exit (EXIT_FAILURE); > + } > + if (nbd_connect_socket (nbd, fd) == -1) { > + fprintf (stderr, "%s\n", nbd_get_error ()); > + exit (EXIT_FAILURE); > + } > + break; > + > + > + /* Create the FUSE args. */ > + if (fuse_opt_add_arg (&fuse_args, argv[0]) == -1) { > + fuse_opt_error: > + perror ("fuse_opt_add_arg"); > + exit (EXIT_FAILURE); > + } > + > + if (fuse_options) { > + if (fuse_opt_add_arg (&fuse_args, "-o") == -1 || > + fuse_opt_add_arg (&fuse_...

...rintf (stderr, "%s\n", nbd_get_error ()); + exit (EXIT_FAILURE); + } + size = (uint64_t) ssize; + + /* This is just used to give an unchanging time when they stat in + * the mountpoint. + */ + clock_gettime (CLOCK_REALTIME, &start_t); + + /* Create the FUSE args. */ + if (fuse_opt_add_arg (&fuse_args, argv[0]) == -1) { + fuse_opt_error: + perror ("fuse_opt_add_arg"); + exit (EXIT_FAILURE); + } + + if (fuse_options) { + if (fuse_opt_add_arg (&fuse_args, "-o") == -1 || + fuse_opt_add_arg (&fuse_args, fuse_options) == -1) + goto f...

This version doesn't crash or cause hung processes or stuck mountpoints, so that's an improvement. Rich.

This patch is just for review. It enables FUSE support in the API via two new calls, 'guestfs_mount_local' and 'guestfs_umount_local'. FUSE turns out to be very easy to deadlock (necessitating that the machine be rebooted). Running the test from the third patch is usually an effective way to demonstrate this. However I have not yet managed to produce a simple reproducer that

This changes the proposed API slightly. Previously 'mount-local' generating a 'mounted' event when the filesystem was ready, and from the 'mounted' event you had to effectively do a fork. Now, 'mount-local' just initializes the mountpoint and you have to call 'mount-local-run' to enter the FUSE main loop. Between these calls you can do a fork or whatever

libguestfs has used double and triple underscores in identifiers. These aren't valid for global names in C++. (http://stackoverflow.com/a/228797) These large but completely mechanical patches change the illegal identifiers to legal ones. Rich.