search for: protocol_ret

...riginal URI (for error messages etc.) */ } uri; diff --git a/fish/uri.c b/fish/uri.c index 95f8cf8..f45c907 100644 --- a/fish/uri.c +++ b/fish/uri.c @@ -34,7 +34,7 @@ #include "uri.h" static int is_uri (const char *arg); -static int parse (const char *arg, char **path_ret, char **protocol_ret, char ***server_ret, char **username_ret); +static int parse (const char *arg, char **path_ret, char **protocol_ret, char ***server_ret, char **username_ret, char **password_ret); static char *query_get (xmlURIPtr uri, const char *search_name); static int make_server (xmlURIPtr uri, const char *s...

...of tests pass. If there's anything else I can do by way of > verification, please let me know. > diff --git a/fish/uri.c b/fish/uri.c > index 593e62a..1566cdf 100644 > --- a/fish/uri.c > +++ b/fish/uri.c > @@ -178,12 +178,20 @@ parse (const char *arg, char **path_ret, char **protocol_ret, > } > } > > + if (asprintf(&path, "%s?%s", uri->path, uri->query_raw) == -1) { > + perror ("asprintf: path + query_raw"); > + free (*protocol_ret); > + guestfs_int_free_string_list (*server_ret); > + free (*username_ret);...

I have written a patch (please see attached) which fixes both of these bugs: https://bugzilla.redhat.com/show_bug.cgi?id=1092583 https://bugzilla.redhat.com/show_bug.cgi?id=1232477 By default, when saving a URI using xmlSaveUri it escapes everything in the URI. QEMU doesn't want anything escaped, so now I unescape everything after the URI is generated. Unfortunately there's no flag to

Miscellaneous fixes to: - Handling of Ceph drives now works end-to-end (RHBZ#1026688). - In particular, you can now use rbd:/// URIs in guestfish (and they work). - Parse Ceph & NBD network drives from libvirt XML correctly, so that existing domains with Ceph/NBD drives can be added (eg. using guestfish -d option). - Add more testing of the above.

...riginal URI (for error messages etc.) */ } uri; diff --git a/fish/uri.c b/fish/uri.c index f45c907..8459a7c 100644 --- a/fish/uri.c +++ b/fish/uri.c @@ -34,7 +34,7 @@ #include "uri.h" static int is_uri (const char *arg); -static int parse (const char *arg, char **path_ret, char **protocol_ret, char ***server_ret, char **username_ret, char **password_ret); +static int parse (const char *arg, char **path_ret, char **protocol_ret, char ***server_ret, char **username_ret, char **password_ret, char **query_ret); static char *query_get (xmlURIPtr uri, const char *search_name); static int ma...

Hi All, Here's the latest patch. I think this should address the problem. The query string is now only appended to the end of a URI in the HTTP and HTTPS cases. The add-uri test now passes, and 'make check' still passes. -- Gabriel

...-add-uri.out || fail # rbd $VG guestfish -x -a rbd://example.com:6789/pool/disk </dev/null >test-add-uri.out 2>&1 diff --git a/fish/uri.c b/fish/uri.c index ae30bce..4ae34af 100644 --- a/fish/uri.c +++ b/fish/uri.c @@ -194,6 +194,7 @@ parse (const char *arg, char **path_ret, char **protocol_ret, if (path && path[0] == '/' && (STREQ (uri->scheme, "gluster") || STREQ (uri->scheme, "iscsi") || + STREQ (uri->scheme, "nbd") || STREQ (uri->scheme, "rbd") || STREQ (uri->scheme,...

...> $VG guestfish -x -a rbd://example.com:6789/pool/disk </dev/null >test-add-uri.out 2>&1 > diff --git a/fish/uri.c b/fish/uri.c > index ae30bce..4ae34af 100644 > --- a/fish/uri.c > +++ b/fish/uri.c > @@ -194,6 +194,7 @@ parse (const char *arg, char **path_ret, char **protocol_ret, > if (path && path[0] == '/' && > (STREQ (uri->scheme, "gluster") || > STREQ (uri->scheme, "iscsi") || > + STREQ (uri->scheme, "nbd") || > STREQ (uri->scheme, "rbd") || >...

...moving leading the '/' in the path sometimes depending on protocol. Nothing to do with the query string. > > + if (asprintf(&path, "%s?%s", uri->path, uri->query_raw) == -1) { > > + perror ("asprintf: path + query_raw"); > > + free (*protocol_ret); > > + guestfs_int_free_string_list (*server_ret); > > + free (*username_ret); > > + free (*password_ret); > > + return -1; > > + } > > 'path' created here is leaked. Also, this needs to take into account > that either uri->path or uri...

...ns/uri.c +++ b/common/options/uri.c @@ -38,6 +38,7 @@ #include "guestfs.h" #include "guestfs-utils.h" +#include "libxml2-utils.h" #include "uri.h" static int is_uri (const char *arg); @@ -114,9 +115,9 @@ parse (const char *arg, char **path_ret, char **protocol_ret, CLEANUP_FREE char *socket = NULL; char *path; - uri = xmlParseURI (arg); + uri = guestfs_int_parse_nonstandard_uri (arg); if (!uri) { - fprintf (stderr, _("%s: --add: could not parse URI ‘%s’\n"), + fprintf (stderr, _("%s: --add: could not parse URI ‘%s’: %m\n&quo...

...ns/uri.c +++ b/common/options/uri.c @@ -38,6 +38,7 @@ #include "guestfs.h" #include "guestfs-utils.h" +#include "libxml2-utils.h" #include "uri.h" static int is_uri (const char *arg); @@ -114,9 +115,9 @@ parse (const char *arg, char **path_ret, char **protocol_ret, CLEANUP_FREE char *socket = NULL; char *path; - uri = xmlParseURI (arg); + uri = guestfs_int_parse_nonstandard_uri (arg); if (!uri) { - fprintf (stderr, _("%s: --add: could not parse URI ‘%s’\n"), + fprintf (stderr, _("%s: --add: could not parse URI ‘%s’: %m\n&quo...

An alternate solution to: https://www.redhat.com/archives/libguestfs/2017-December/msg00035.html "[PATCH] v2v: -i vmx: Allow ssh URLs to use spaces." is to classify all URLs processed by libguestfs as either ordinary URLs or the special non-standard URLs that we use for things like ‘virt-v2v -i vmx’ and ‘guestfish --add’. For the non-standard URLs, provide a wrapper around

Previously posted: https://www.redhat.com/archives/libguestfs/2017-December/msg00046.html Rich.

Hi, this series update libguestfs to a recent gnulib version, so that we can use its new getprogname module, and solve altogether one of the porting issues (the need for 'program_name' by the error module of gnulib), and have a single way to get the name of the current program. A number of changes in tools mostly, although mechanical. Thanks, Pino Toscano (3): Update gnulib to latest

In the kernel and qemu communities it is routine for patches that will be backported to stable branches to be posted for review. I'm proposing we do the same for libguestfs stable branches. All of the attached have been tested with 'make check-release'. Rich.

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.

...atus_string)); + status_string, + sizeof status_string)); return -1; } diff --git a/fish/uri.c b/fish/uri.c index 593e62a..33e820c 100644 --- a/fish/uri.c +++ b/fish/uri.c @@ -101,7 +101,7 @@ is_uri (const char *arg) static int parse (const char *arg, char **path_ret, char **protocol_ret, - char ***server_ret, char **username_ret, char **password_ret) + char ***server_ret, char **username_ret, char **password_ret) { CLEANUP_XMLFREEURI xmlURIPtr uri = NULL; CLEANUP_FREE char *socket = NULL; diff --git a/format/format.c b/format/format.c index ba8fe8c..23c44da...

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

...ted.\n"), getprogname (), user_supplied_options, getprogname ()); diff --git a/common/options/uri.c b/common/options/uri.c index ae30bce9b..e7ba7a51a 100644 --- a/common/options/uri.c +++ b/common/options/uri.c @@ -116,7 +116,7 @@ parse (const char *arg, char **path_ret, char **protocol_ret, uri = xmlParseURI (arg); if (!uri) { - fprintf (stderr, _("%s: --add: could not parse URI '%s'\n"), + fprintf (stderr, _("%s: --add: could not parse URI ‘%s’\n"), getprogname (), arg); return -1; } diff --git a/customize/customize_run...