search for: drv_d

...(int argc, char *argv[]) } else { /* simulate -d option */ drv = calloc (1, sizeof (struct drv)); if (!drv) { - perror ("malloc"); + perror ("calloc"); exit (EXIT_FAILURE); } drv->type = drv_d; diff --git a/cat/ls.c b/cat/ls.c index 9161fb6..3bced54 100644 --- a/cat/ls.c +++ b/cat/ls.c @@ -293,7 +293,7 @@ main (int argc, char *argv[]) access (argv[optind], F_OK) == 0) { /* simulate -a option */ drv = calloc (1, sizeof (struct drv)); if (!drv) { - per...

...if (sdrv) { + fprintf(stderr, _("Only one seed device")); + exit (EXIT_FAILURE); + } + sdrv = calloc (1, sizeof (struct drv)); + if (!sdrv) { + perror ("malloc"); + exit (EXIT_FAILURE); + } + sdrv->type = drv_d; + sdrv->nr_drives = -1; + sdrv->d.guest = optarg; + sdrv->next = NULL; + } else if (STREQ (long_options[option_index].name, "domain")) { + if (ddrv) { + fprintf (stderr, _("Only one diff device")); + exit (EXIT_FAILURE...

...type = drv_uri; - drv->nr_drives = -1; drv->uri.path = uri.path; drv->uri.protocol = uri.protocol; drv->uri.server = uri.server; @@ -103,7 +101,6 @@ option_d (const char *arg, struct drv **drvsp) error (EXIT_FAILURE, errno, "calloc"); drv->type = drv_d; - drv->nr_drives = -1; drv->d.guest = optarg; drv->next = *drvsp; @@ -111,22 +108,15 @@ option_d (const char *arg, struct drv **drvsp) } char -add_drives_handle (guestfs_h *g, struct drv *drv, char next_drive) +add_drives_handle (guestfs_h *g, struct drv *drv, size_t drive_in...

...ive_opts_argv (g, drv->uri.path, &ad_optargs); if (r == -1) @@ -290,6 +295,7 @@ free_drives (struct drv *drv) free (drv->uri.protocol); guestfs___free_string_list (drv->uri.server); free (drv->uri.username); + free (drv->uri.password); break; case drv_d: /* d.filename is optarg, don't free it */ diff --git a/fish/options.h b/fish/options.h index dbf9163..639b1fe 100644 --- a/fish/options.h +++ b/fish/options.h @@ -68,6 +68,7 @@ struct drv { char *protocol; /* protocol (eg. "nbd") */ char **server; /* s...

...{ /* simulate -d option */ drv = calloc (1, sizeof (struct drv)); - if (!drv) { - perror ("calloc"); - exit (EXIT_FAILURE); - } + if (!drv) + error (EXIT_FAILURE, errno, "calloc"); drv->type = drv_d; drv->d.guest = argv[optind]; drv->next = drvs; diff --git a/cat/filesystems.c b/cat/filesystems.c index 3013115..6f083d3 100644 --- a/cat/filesystems.c +++ b/cat/filesystems.c @@ -25,6 +25,7 @@ #include <unistd.h> #include <getopt.h> #include <errno.h>...

..._drive_opts_argv (g, drv->uri.path, &ad_optargs); if (r == -1) @@ -307,6 +312,7 @@ free_drives (struct drv *drv) guestfs___free_string_list (drv->uri.server); free (drv->uri.username); free (drv->uri.password); + free (drv->uri.query); break; case drv_d: /* d.filename is optarg, don't free it */ diff --git a/fish/options.h b/fish/options.h index cf68122..d4b0fa5 100644 --- a/fish/options.h +++ b/fish/options.h @@ -73,6 +73,7 @@ struct drv { char **server; /* server(s) - can be NULL */ char *username; /* username...

This patch series moves some files and directories around but is only code motion (or supposed to be). A new directory, common/, is created for all of the common code which is currently shared in random ways between parts of the project. And src/ becomes lib/ (the largest change, but mostly mechanical). In full this series makes the following changes: src/libprotocol -> common/protocol

Previous patch series was posted here: https://www.redhat.com/archives/libguestfs/2017-January/msg00059.html v2 simply extends this patch series to cover the extra directories common/edit, common/progress, common/windows and common/parallel. The only remaining item is to consider whether we should rename mllib to something else, mlcommon was my suggestion. Rich.

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.