X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=fish%2Ffish.c;h=de11b2fef0ec2f9c6d3403566b1a48ea0ba4cb27;hp=2fe5c2b9a2278e28ee58618f697bc3199f3ee81c;hb=8ea62c8d7f3f7f7e4057b93105cf979271aa13f4;hpb=dd093a7660338ac5ad1959394f09397df2c793de diff --git a/fish/fish.c b/fish/fish.c index 2fe5c2b..de11b2f 100644 --- a/fish/fish.c +++ b/fish/fish.c @@ -73,6 +73,8 @@ static void set_up_terminal (void); static char add_drives (struct drv *drv, char next_drive); static void prepare_drives (struct drv *drv); static void mount_mps (struct mp *mp); +static void free_drives (struct drv *drv); +static void free_mps (struct mp *mp); static int launch (void); static void interactive (void); static void shell_script (void); @@ -97,6 +99,7 @@ int remote_control = 0; int exit_on_error = 1; int command_num = 0; int keys_from_stdin = 0; +int echo_keys = 0; const char *libvirt_uri = NULL; int inspector = 0; int utf8_mode = 0; @@ -132,6 +135,7 @@ usage (int status) " -c|--connect uri Specify libvirt URI for -d option\n" " -d|--domain guest Add disks from libvirt guest\n" " -D|--no-dest-paths Don't tab-complete paths from guest fs\n" + " --echo-keys Don't turn off echo for passphrases\n" " -f|--file file Read commands from file\n" " -i|--inspector Automatically mount filesystems\n" " --keys-from-stdin Read passphrases from stdin\n" @@ -177,6 +181,7 @@ main (int argc, char *argv[]) { "cmd-help", 2, 0, 'h' }, { "connect", 1, 0, 'c' }, { "domain", 1, 0, 'd' }, + { "echo-keys", 0, 0, 0 }, { "file", 1, 0, 'f' }, { "help", 0, 0, HELP_OPTION }, { "inspector", 0, 0, 'i' }, @@ -277,6 +282,8 @@ main (int argc, char *argv[]) override_progress_bars = 1; } else if (STREQ (long_options[option_index].name, "no-progress-bars")) { override_progress_bars = 0; + } else if (STREQ (long_options[option_index].name, "echo-keys")) { + echo_keys = 1; } else { fprintf (stderr, _("%s: unknown long option: %s (%d)\n"), program_name, long_options[option_index].name, option_index); @@ -480,6 +487,10 @@ main (int argc, char *argv[]) mount_mps (mps); } + /* Free up data structures, no longer needed after this point. */ + free_drives (drvs); + free_mps (mps); + /* Remote control? */ if (remote_control_listen && remote_control) { fprintf (stderr, @@ -683,6 +694,38 @@ prepare_drives (struct drv *drv) } } +static void +free_drives (struct drv *drv) +{ + if (!drv) return; + free_drives (drv->next); + + switch (drv->type) { + case drv_a: free (drv->a.filename); break; + case drv_d: free (drv->d.guest); break; + case drv_N: + free (drv->N.filename); + free (drv->N.device); + free_prep_data (drv->N.data); + break; + default: ; /* keep GCC happy */ + } + free (drv); +} + +static void +free_mps (struct mp *mp) +{ + if (!mp) return; + free_mps (mp->next); + + /* The drive and mountpoint fields are not allocated + * from the heap, so we should not free them here. + */ + + free (mp); +} + static int launch (void) { @@ -1070,39 +1113,6 @@ issue_command (const char *cmd, char *argv[], const char *pipecmd) quit = 1; r = 0; } - else if (STRCASEEQ (cmd, "alloc") || - STRCASEEQ (cmd, "allocate")) - r = do_alloc (cmd, argc, argv); - else if (STRCASEEQ (cmd, "copy-in") || - STRCASEEQ (cmd, "copy_in")) - r = do_copy_in (cmd, argc, argv); - else if (STRCASEEQ (cmd, "copy-out") || - STRCASEEQ (cmd, "copy_out")) - r = do_copy_out (cmd, argc, argv); - else if (STRCASEEQ (cmd, "echo")) - r = do_echo (cmd, argc, argv); - else if (STRCASEEQ (cmd, "edit") || - STRCASEEQ (cmd, "vi") || - STRCASEEQ (cmd, "emacs")) - r = do_edit (cmd, argc, argv); - else if (STRCASEEQ (cmd, "lcd")) - r = do_lcd (cmd, argc, argv); - else if (STRCASEEQ (cmd, "glob")) - r = do_glob (cmd, argc, argv); - else if (STRCASEEQ (cmd, "man") || - STRCASEEQ (cmd, "manual")) - r = do_man (cmd, argc, argv); - else if (STRCASEEQ (cmd, "more") || - STRCASEEQ (cmd, "less")) - r = do_more (cmd, argc, argv); - else if (STRCASEEQ (cmd, "reopen")) - r = do_reopen (cmd, argc, argv); - else if (STRCASEEQ (cmd, "sparse")) - r = do_sparse (cmd, argc, argv); - else if (STRCASEEQ (cmd, "supported")) - r = do_supported (cmd, argc, argv); - else if (STRCASEEQ (cmd, "time")) - r = do_time (cmd, argc, argv); else r = run_action (cmd, argc, argv); @@ -1133,39 +1143,12 @@ issue_command (const char *cmd, char *argv[], const char *pipecmd) void list_builtin_commands (void) { - /* help, man and quit should appear at the top */ + /* help and quit should appear at the top */ printf ("%-20s %s\n", "help", _("display a list of commands or help on a command")); printf ("%-20s %s\n", - "man", _("read the manual")); - printf ("%-20s %s\n", "quit", _("quit guestfish")); - printf ("%-20s %s\n", - "alloc", _("allocate an image")); - printf ("%-20s %s\n", - "copy-in", _("copy files into an image")); - printf ("%-20s %s\n", - "copy-out", _("copy files out of an image")); - printf ("%-20s %s\n", - "echo", _("display a line of text")); - printf ("%-20s %s\n", - "edit", _("edit a file in the image")); - printf ("%-20s %s\n", - "lcd", _("local change directory")); - printf ("%-20s %s\n", - "glob", _("expand wildcards in command")); - printf ("%-20s %s\n", - "more", _("view a file in the pager")); - printf ("%-20s %s\n", - "reopen", _("close and reopen libguestfs handle")); - printf ("%-20s %s\n", - "sparse", _("allocate a sparse image file")); - printf ("%-20s %s\n", - "supported", _("list supported groups of commands")); - printf ("%-20s %s\n", - "time", _("measure time taken to run command")); - /* actions are printed after this (see list_commands) */ } @@ -1174,114 +1157,12 @@ display_builtin_command (const char *cmd) { /* help for actions is auto-generated, see display_command */ - if (STRCASEEQ (cmd, "alloc") || - STRCASEEQ (cmd, "allocate")) { - printf (_("alloc - allocate an image\n" - " alloc \n" - "\n" - " This creates an empty (zeroed) file of the given size,\n" - " and then adds so it can be further examined.\n" - "\n" - " For more advanced image creation, see qemu-img utility.\n" - "\n" - " Size can be specified using standard suffixes, eg. '1M'.\n" - )); - return 0; - } - else if (STRCASEEQ (cmd, "copy-in") || - STRCASEEQ (cmd, "copy_in")) { - printf (_("copy-in - copy files into an image\n" - " copy-in [ ...] \n" - "\n" - " Copy local files or directories recursively into the\n" - " image, placing them on a remote directory.\n" - )); - return 0; - } - else if (STRCASEEQ (cmd, "copy-out") || - STRCASEEQ (cmd, "copy_out")) { - printf (_("copy-out - copy files out of an image\n" - " copy-out [ ...] \n" - "\n" - " Copy remote files or directories recursively out of the\n" - " image, placing them in a local directory.\n" - )); - return 0; - } - else if (STRCASEEQ (cmd, "echo")) { - printf (_("echo - display a line of text\n" - " echo [ ...]\n" - "\n" - " This echos the parameters to the terminal.\n")); - return 0; - } - else if (STRCASEEQ (cmd, "edit") || - STRCASEEQ (cmd, "vi") || - STRCASEEQ (cmd, "emacs")) { - printf (_("edit - edit a file in the image\n" - " edit \n" - "\n" - " This is used to edit a file.\n" - "\n" - " It is the equivalent of (and is implemented by)\n" - " running \"cat\", editing locally, and then \"write\".\n" - "\n" - " Normally it uses $EDITOR, but if you use the aliases\n" - " \"vi\" or \"emacs\" you will get those editors.\n" - "\n" - " NOTE: This will not work reliably for large files\n" - " (> 2 MB) or binary files containing \\0 bytes.\n")); - return 0; - } - else if (STRCASEEQ (cmd, "lcd")) { - printf (_("lcd - local change directory\n" - " lcd \n" - "\n" - " Change guestfish's current directory. This command is\n" - " useful if you want to download files to a particular\n" - " place.\n")); - return 0; - } - else if (STRCASEEQ (cmd, "glob")) { - printf (_("glob - expand wildcards in command\n" - " glob [ ...]\n" - "\n" - " Glob runs with wildcards expanded in any\n" - " command args. Note that the command is run repeatedly\n" - " once for each expanded argument.\n")); - return 0; - } - else if (STRCASEEQ (cmd, "man") || - STRCASEEQ (cmd, "manual")) { - printf (_("man - read the manual\n" - " man\n" - "\n" - " Opens the manual page for guestfish.\n")); - return 0; - } - else if (STRCASEEQ (cmd, "help")) { + if (STRCASEEQ (cmd, "help")) { printf (_("help - display a list of commands or help on a command\n" " help cmd\n" " help\n")); return 0; } - else if (STRCASEEQ (cmd, "more") || - STRCASEEQ (cmd, "less")) { - printf (_("more - view a file in the pager\n" - " more \n" - "\n" - " This is used to view a file in the pager.\n" - "\n" - " It is the equivalent of (and is implemented by)\n" - " running \"cat\" and using the pager.\n" - "\n" - " Normally it uses $PAGER, but if you use the alias\n" - " \"less\" then it always uses \"less\".\n" - "\n" - " NOTE: This will not work reliably for large files\n" - " (> 2 MB) or binary files containing \\0 bytes.\n")); - return 0; - } else if (STRCASEEQ (cmd, "quit") || STRCASEEQ (cmd, "exit") || STRCASEEQ (cmd, "q")) { @@ -1289,56 +1170,6 @@ display_builtin_command (const char *cmd) " quit\n")); return 0; } - else if (STRCASEEQ (cmd, "reopen")) { - printf (_("reopen - close and reopen the libguestfs handle\n" - " reopen\n" - "\n" - "Close and reopen the libguestfs handle. It is not necessary to use\n" - "this normally, because the handle is closed properly when guestfish\n" - "exits. However this is occasionally useful for testing.\n")); - return 0; - } - else if (STRCASEEQ (cmd, "sparse")) { - printf (_("sparse - allocate a sparse image file\n" - " sparse \n" - "\n" - " This creates an empty sparse file of the given size,\n" - " and then adds so it can be further examined.\n" - "\n" - " In all respects it works the same as the 'alloc'\n" - " command, except that the image file is allocated\n" - " sparsely, which means that disk blocks are not assigned\n" - " to the file until they are needed. Sparse disk files\n" - " only use space when written to, but they are slower\n" - " and there is a danger you could run out of real disk\n" - " space during a write operation.\n" - "\n" - " For more advanced image creation, see qemu-img utility.\n" - "\n" - " Size can be specified using standard suffixes, eg. '1M'.\n" - )); - return 0; - } - else if (STRCASEEQ (cmd, "supported")) { - printf (_("supported - list supported groups of commands\n" - " supported\n" - "\n" - " This command returns a list of the optional groups\n" - " known to the daemon, and indicates which ones are\n" - " supported by this build of the libguestfs appliance.\n" - "\n" - " See also guestfs(3) section AVAILABILITY.\n" - )); - return 0; - } - else if (STRCASEEQ (cmd, "time")) { - printf (_("time - measure time taken to run command\n" - " time [ ...]\n" - "\n" - " This runs as usual, and prints the elapsed\n" - " time afterwards.\n")); - return 0; - } else { fprintf (stderr, _("%s: command not known, use -h to list all commands\n"), cmd); @@ -1850,15 +1681,17 @@ read_key (const char *param) if (tty) { fprintf (outfp, _("Enter key or passphrase (\"%s\"): "), param); - if (tcgetattr (fileno (infp), &orig) == -1) { - perror ("tcgetattr"); - goto error; - } - memcpy (&temp, &orig, sizeof temp); - temp.c_lflag &= ~ECHO; + if (!echo_keys) { + if (tcgetattr (fileno (infp), &orig) == -1) { + perror ("tcgetattr"); + goto error; + } + memcpy (&temp, &orig, sizeof temp); + temp.c_lflag &= ~ECHO; - tcsetattr (fileno (infp), TCSAFLUSH, &temp); - tcset = 1; + tcsetattr (fileno (infp), TCSAFLUSH, &temp); + tcset = 1; + } } size_t n = 0;