},
};
+#define nr_preps (sizeof preps / sizeof preps[0])
+
void
list_prepared_drives (void)
{
printf (_("List of available prepared disk images:\n\n"));
- for (i = 0; i < sizeof preps / sizeof preps[0]; ++i) {
+ for (i = 0; i < nr_preps; ++i) {
printf (_("\
guestfish -N %-16s %s\n\
\n\
prep_data *
create_prepared_file (const char *type_string, const char *filename)
{
- if (access (filename, F_OK) == 0) {
- fprintf (stderr, _("guestfish: file '%s' exists and the '-N' option will not overwrite it\n"),
- filename);
- exit (EXIT_FAILURE);
- }
-
prep_data *data = parse_type_string (type_string);
if (data->prep->prelaunch)
data->prep->prelaunch (filename, data);
/* Match on the type part (without parameters). */
size_t len = strcspn (type_string, ":");
- for (i = 0; i < sizeof preps / sizeof preps[0]; ++i)
+ for (i = 0; i < nr_preps; ++i)
if (STRCASEEQLEN (type_string, preps[i].name, len))
break;
- if (preps[i].name == NULL) {
+ if (i == nr_preps) {
fprintf (stderr, _("\
guestfish: -N parameter '%s': no such prepared disk image known.\n\
Use 'guestfish -N list' to list possible values for the -N parameter.\n"),
static void
postlaunch_part (const char *filename, prep_data *data, const char *device)
{
- if (guestfs_part_disk (g, device, data->params[2]) == -1)
+ if (guestfs_part_disk (g, device, data->params[1]) == -1)
prep_error (data, filename, _("failed to partition disk: %s"),
guestfs_last_error (g));
}