enum { HELP_OPTION = CHAR_MAX + 1 };
- static const char *options = "a:c:d:Df:h::im:nN:rv?Vx";
+ static const char *options = "a:c:d:Df:h::im:nN:rv?Vwx";
static const struct option long_options[] = {
{ "add", 1, 0, 'a' },
{ "cmd-help", 2, 0, 'h' },
{ "no-progress-bars", 0, 0, 0 },
{ "remote", 2, 0, 0 },
{ "ro", 0, 0, 'r' },
+ { "rw", 0, 0, 'w' },
{ "selinux", 0, 0, 0 },
{ "verbose", 0, 0, 'v' },
{ "version", 0, 0, 'V' },
* getopt_long uses argv[0], so give it the sanitized name. Save a copy
* of the original, in case it's needed below.
*/
- char *real_argv0 = argv[0];
+ //char *real_argv0 = argv[0];
argv[0] = bad_cast (program_name);
for (;;) {
exit (EXIT_FAILURE);
}
drv->type = drv_N;
+ drv->device = NULL;
+ drv->nr_drives = -1;
if (asprintf (&drv->N.filename, "test%d.img",
next_prepared_drive++) == -1) {
perror ("asprintf");
}
drv->N.data = create_prepared_file (optarg, drv->N.filename);
drv->N.data_free = free_prep_data;
- drv->N.device = NULL; /* filled in by add_drives */
drv->next = drvs;
drvs = drv;
break;
OPTION_V;
break;
+ case 'w':
+ OPTION_w;
+ break;
+
case 'x':
OPTION_x;
break;
have_terminfo = 1;
}
-void
-pod2text (const char *name, const char *shortdesc, const char *str)
-{
- FILE *fp;
-
- fp = popen ("pod2text", "w");
- if (fp == NULL) {
- /* pod2text failed, maybe not found, so let's just print the
- * source instead, since that's better than doing nothing.
- */
- printf ("%s - %s\n\n%s\n", name, shortdesc, str);
- return;
- }
- fprintf (fp, "=head1 NAME\n\n%s - %s\n\n", name, shortdesc);
- fputs (str, fp);
- pclose (fp);
-}
-
static void
prepare_drives (struct drv *drv)
{
if (drv) {
prepare_drives (drv->next);
if (drv->type == drv_N)
- prepare_drive (drv->N.filename, drv->N.data, drv->N.device);
+ prepare_drive (drv->N.filename, drv->N.data, drv->device);
}
}
int argc;
int stdout_saved_fd = -1;
int pid = 0;
- int i, r;
+ int r;
reset_progress_bar ();