search for: guestfs_impl_mount_loc

...indings or in C library. I'd like to hear your thoughts how we should proceed in this situation. --- lib/fuse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fuse.c b/lib/fuse.c index 9731db962..7df765b81 100644 --- a/lib/fuse.c +++ b/lib/fuse.c @@ -1047,7 +1047,7 @@ guestfs_impl_mount_local (guestfs_h *g, const char *localmountpoint, /* Set g->localmountpoint in the handle. */ gl_lock_lock (mount_local_lock); - g->localmountpoint = localmountpoint; + g->localmountpoint = safe_strdup(g, localmountpoint); gl_lock_unlock (mount_local_lock); return 0; -- 2.17...

...initializing FUSE, use the program name as set (either automatically or manually) in the guestfs handle. --- lib/fuse.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --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_err...

...initializing FUSE, use the program name as set (either automatically or manually) in the guestfs handle. --- src/fuse.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --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_err...

...ither > automatically or manually) in the guestfs handle. > --- > lib/fuse.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --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-&g...

...ds which leads to a crash (an attempt to access to already freed memory). --- lib/fuse.c | 5 +++-- lib/handle.c | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/fuse.c b/lib/fuse.c index 9731db962..82bddec00 100644 --- a/lib/fuse.c +++ b/lib/fuse.c @@ -1047,7 +1047,7 @@ guestfs_impl_mount_local (guestfs_h *g, const char *localmountpoint, /* Set g->localmountpoint in the handle. */ gl_lock_lock (mount_local_lock); - g->localmountpoint = localmountpoint; + g->localmountpoint = safe_strdup (g, localmountpoint); gl_lock_unlock (mount_local_lock); return 0; @@ -109...

The existing mechanism was clunky, slow and used ~ 10 MB of local disk. Rich.

...attr (const char *path, const char *name, char *value, } memcpy (value, xattrs->val[i].attrval, sz); -out: + out: if (free_attrs) guestfs_free_xattr_list ((struct guestfs_xattr_list *) xattrs); @@ -954,7 +954,7 @@ static struct fuse_operations mount_local_operations = { int guestfs_impl_mount_local (guestfs_h *g, const char *localmountpoint, - const struct guestfs_mount_local_argv *optargs) + const struct guestfs_mount_local_argv *optargs) { const char *t; struct fuse_args args = FUSE_ARGS_INIT (0, NULL); @@ -1102,7 +1102,7 @@ guestfs_int_free_fuse (guestfs_h...

Result of earlier copy and paste. --- align/scan.c | 35 ++++++++++--------- cat/cat.c | 39 +++++++++++---------- cat/filesystems.c | 69 +++++++++++++++++++------------------- cat/log.c | 35 ++++++++++--------- cat/ls.c | 61 +++++++++++++++++---------------- df/main.c | 43 ++++++++++++------------ diff/diff.c | 67

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.