/* libguestfs - guestfish and guestmount shared option parsing
- * Copyright (C) 2010 Red Hat Inc.
+ * Copyright (C) 2010-2011 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
if (drv) {
next_drive = add_drives (drv->next, next_drive);
+ if (asprintf (&drv->device, "/dev/sd%c", next_drive) == -1) {
+ perror ("asprintf");
+ exit (EXIT_FAILURE);
+ }
+
switch (drv->type) {
case drv_a:
ad_optargs.bitmask = 0;
if (r == -1)
exit (EXIT_FAILURE);
+ drv->nr_drives = 1;
next_drive++;
break;
if (r == -1)
exit (EXIT_FAILURE);
+ drv->nr_drives = r;
next_drive += r;
break;
if (r == -1)
exit (EXIT_FAILURE);
- if (asprintf (&drv->N.device, "/dev/sd%c", next_drive) == -1) {
- perror ("asprintf");
- exit (EXIT_FAILURE);
- }
-
+ drv->nr_drives = 1;
next_drive++;
break;
if (mp) {
mount_mps (mp->next);
+ const char *options;
+ if (mp->options)
+ options = mp->options;
+ else if (read_only)
+ options = "ro";
+ else
+ options = "";
+
/* Don't use guestfs_mount here because that will default to mount
* options -o sync,noatime. For more information, see guestfs(3)
* section "LIBGUESTFS GOTCHAS".
*/
- const char *options = read_only ? "ro" : "";
r = guestfs_mount_options (g, options, mp->device, mp->mountpoint);
if (r == -1) {
/* Display possible mountpoints before exiting. */
if (!drv) return;
free_drives (drv->next);
+ free (drv->device);
+
switch (drv->type) {
case drv_a: /* a.filename and a.format are optargs, don't free them */ break;
case drv_d: /* d.filename is optarg, don't free it */ break;
case drv_N:
free (drv->N.filename);
- free (drv->N.device);
drv->N.data_free (drv->N.data);
break;
default: ; /* keep GCC happy */