#include <signal.h>
#include <assert.h>
#include <ctype.h>
+#include <sys/types.h>
+#include <sys/wait.h>
#ifdef HAVE_LIBREADLINE
#include <readline/readline.h>
"Copyright (C) 2009 Red Hat Inc.\n"
"Usage:\n"
" guestfish [--options] cmd [: cmd : cmd ...]\n"
+ " guestfish -i libvirt-domain\n"
+ " guestfish -i disk-image(s)\n"
"or for interactive use:\n"
" guestfish\n"
"or from a shell script:\n"
" -a|--add image Add image\n"
" -D|--no-dest-paths Don't tab-complete paths from guest fs\n"
" -f|--file file Read commands from file\n"
+ " -i|--inspector Run virt-inspector to get disk mountpoints\n"
" -m|--mount dev[:mnt] Mount dev on mnt (if omitted, /)\n"
" -n|--no-sync Don't autosync\n"
" -r|--ro Mount read-only\n"
int
main (int argc, char *argv[])
{
- static const char *options = "a:f:h::m:nrv?V";
+ static const char *options = "a:f:h::im:nrv?V";
static struct option long_options[] = {
{ "add", 1, 0, 'a' },
{ "cmd-help", 2, 0, 'h' },
{ "file", 1, 0, 'f' },
{ "help", 0, 0, '?' },
+ { "inspector", 0, 0, 'i' },
{ "mount", 1, 0, 'm' },
{ "no-dest-paths", 0, 0, 'D' },
{ "no-sync", 0, 0, 'n' },
struct mp *mps = NULL;
struct mp *mp;
char *p, *file = NULL;
- int c;
+ int c, inspector = 0;
+ struct sigaction sa;
initialize_readline ();
+ memset (&sa, 0, sizeof sa);
+ sa.sa_handler = SIG_IGN;
+ sa.sa_flags = SA_RESTART;
+ sigaction (SIGPIPE, &sa, NULL);
+
/* guestfs_create is meant to be a lightweight operation, so
* it's OK to do it early here.
*/
list_commands ();
exit (0);
+ case 'i':
+ inspector = 1;
+ break;
+
case 'm':
mp = malloc (sizeof (struct mp));
if (!mp) {
}
}
+ /* Inspector mode invalidates most of the other arguments. */
+ if (inspector) {
+ char cmd[1024];
+ int r;
+
+ if (drvs || mps) {
+ fprintf (stderr, _("guestfish: cannot use -i option with -a or -m\n"));
+ exit (1);
+ }
+ if (optind >= argc) {
+ fprintf (stderr, _("guestfish -i requires a libvirt domain or path(s) to disk image(s)\n"));
+ exit (1);
+ }
+
+ strcpy (cmd, "a=`virt-inspector");
+ while (optind < argc) {
+ if (strlen (cmd) + strlen (argv[optind]) + strlen (argv[0]) + 60
+ >= sizeof cmd) {
+ fprintf (stderr, _("guestfish: virt-inspector command too long for fixed-size buffer\n"));
+ exit (1);
+ }
+ strcat (cmd, " '");
+ strcat (cmd, argv[optind]);
+ strcat (cmd, "'");
+ optind++;
+ }
+
+ if (read_only)
+ strcat (cmd, " --ro-fish");
+ else
+ strcat (cmd, " --fish");
+
+ sprintf (&cmd[strlen(cmd)], "` && %s $a", argv[0]);
+
+ if (guestfs_get_verbose (g))
+ strcat (cmd, " -v");
+ if (!guestfs_get_autosync (g))
+ strcat (cmd, " -n");
+
+ /*printf ("%s\n", cmd);*/
+
+ r = system (cmd);
+ if (r == -1) {
+ perror ("system");
+ exit (1);
+ }
+ exit (WEXITSTATUS (r));
+ }
+
/* If we've got drives to add, add them now. */
add_drives (drvs);
"\n"));
while (!quit) {
+ char *pipe = NULL;
+
exit_on_error = global_exit_on_error;
buf = rl_gets (prompt);
/* Get the parameters. */
while (*p && i < sizeof argv / sizeof argv[0]) {
- /* Parameters which start with quotes or square brackets
- * are treated specially. Bare parameters are delimited
- * by whitespace.
+ /* Parameters which start with quotes or pipes are treated
+ * specially. Bare parameters are delimited by whitespace.
*/
if (*p == '"') {
p++;
}
p[len] = '\0';
pend = p[len+1] ? &p[len+2] : &p[len+1];
+ } else if (*p == '|') {
+ *p = '\0';
+ pipe = p+1;
+ continue;
/*
} else if (*p == '[') {
int c = 1;
argv[i] = NULL;
got_command:
- if (issue_command (cmd, argv) == -1) {
+ if (issue_command (cmd, argv, pipe) == -1) {
if (exit_on_error) exit (1);
}
optind++;
if (optind == argc) {
- if (issue_command (cmd, params) == -1) exit (1);
+ if (issue_command (cmd, params, NULL) == -1) exit (1);
} else {
argv[optind] = NULL;
- if (issue_command (cmd, params) == -1) exit (1);
+ if (issue_command (cmd, params, NULL) == -1) exit (1);
cmdline (argv, optind+1, argc);
}
}
int
-issue_command (const char *cmd, char *argv[])
+issue_command (const char *cmd, char *argv[], const char *pipecmd)
{
int argc;
+ int stdout_saved_fd = -1;
+ int pid = 0;
+ int r;
+
+ /* For | ... commands. Annoyingly we can't use popen(3) here. */
+ if (pipecmd) {
+ int fd[2];
+
+ fflush (stdout);
+ pipe (fd);
+ pid = fork ();
+ if (pid == -1) {
+ perror ("fork");
+ return -1;
+ }
+
+ if (pid == 0) { /* Child process. */
+ close (fd[1]);
+ dup2 (fd[0], 0);
+
+ r = system (pipecmd);
+ if (r == -1) {
+ perror (pipecmd);
+ _exit (1);
+ }
+ _exit (WEXITSTATUS (r));
+ }
+
+ stdout_saved_fd = dup (1);
+ close (fd[0]);
+ dup2 (fd[1], 1);
+ close (fd[1]);
+ }
for (argc = 0; argv[argc] != NULL; ++argc)
;
list_commands ();
else
display_command (argv[0]);
- return 0;
+ r = 0;
}
else if (strcasecmp (cmd, "quit") == 0 ||
strcasecmp (cmd, "exit") == 0 ||
strcasecmp (cmd, "q") == 0) {
quit = 1;
- return 0;
+ r = 0;
}
else if (strcasecmp (cmd, "alloc") == 0 ||
strcasecmp (cmd, "allocate") == 0)
- return do_alloc (cmd, argc, argv);
+ r = do_alloc (cmd, argc, argv);
else if (strcasecmp (cmd, "echo") == 0)
- return do_echo (cmd, argc, argv);
+ r = do_echo (cmd, argc, argv);
else if (strcasecmp (cmd, "edit") == 0 ||
strcasecmp (cmd, "vi") == 0 ||
strcasecmp (cmd, "emacs") == 0)
- return do_edit (cmd, argc, argv);
+ r = do_edit (cmd, argc, argv);
else if (strcasecmp (cmd, "lcd") == 0)
- return do_lcd (cmd, argc, argv);
+ r = do_lcd (cmd, argc, argv);
else if (strcasecmp (cmd, "glob") == 0)
- return do_glob (cmd, argc, argv);
+ r = do_glob (cmd, argc, argv);
else
- return run_action (cmd, argc, argv);
+ r = run_action (cmd, argc, argv);
+
+ if (pipecmd) {
+ fflush (stdout);
+ close (1);
+ dup2 (stdout_saved_fd, 1);
+ close (stdout_saved_fd);
+ waitpid (pid, NULL, 0);
+ }
+
+ return r;
}
void
git.annexia.org / libguestfs.git / blobdiff