search for: password_ret

...ude "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 *socket, char ***ret); @@ -45,10 +45,11 @@ parse_uri (const char *arg, struct uri *uri_ret) char *protocol = NULL; char **server = NULL; char *username = NULL; + char *...

...t 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 make_server (xmlURIPtr uri, const char *socket, char ***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

...} > > + 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->query_raw may be null. > /* We may have to adjust the path depending on the protocol. For > * example ceph/rbd URIs look like rbd:///pool...

...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->query_raw may be null. > Good point. Fixed. See attached patch. > > *path_ret = strdup (path ? path : "&qu...

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

...eturn -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 100644 --- a/format/format.c +++ b/format/format.c @@ -87,8 +87,9 @@ usage...

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.