/* guestfish - the filesystem interactive shell
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 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
#include <signal.h>
#include <assert.h>
#include <ctype.h>
+#include <sys/types.h>
+#include <sys/wait.h>
#ifdef HAVE_LIBREADLINE
#include <readline/readline.h>
int
main (int argc, char *argv[])
{
- static const char *options = "a:f:h::im:nrv?V";
+ static const char *options = "a:Df:h::im:nrv?V";
static struct option long_options[] = {
{ "add", 1, 0, 'a' },
{ "cmd-help", 2, 0, 'h' },
struct mp *mp;
char *p, *file = NULL;
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.
*/
"\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 if (strcasecmp (cmd, "more") == 0 ||
+ strcasecmp (cmd, "less") == 0)
+ r = do_more (cmd, argc, argv);
+ else if (strcasecmp (cmd, "reopen") == 0)
+ r = do_reopen (cmd, argc, argv);
+ else if (strcasecmp (cmd, "time") == 0)
+ r = do_time (cmd, argc, argv);
else
- return run_action (cmd, argc, argv);
+ r = run_action (cmd, argc, argv);
+
+ /* Always flush stdout after every command, so that messages, results
+ * etc appear immediately.
+ */
+ fflush (stdout);
+
+ if (pipecmd) {
+ close (1);
+ dup2 (stdout_saved_fd, 1);
+ close (stdout_saved_fd);
+ waitpid (pid, NULL, 0);
+ }
+
+ return r;
}
void
"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",
+ "time", _("measure time taken to run command"));
/* actions are printed after this (see list_commands) */
}
printf (_("help - display a list of commands or help on a command\n"
" help cmd\n"
" help\n"));
+ else if (strcasecmp (cmd, "more") == 0 ||
+ strcasecmp (cmd, "less") == 0)
+ printf (_("more - view a file in the pager\n"
+ " more <filename>\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"));
else if (strcasecmp (cmd, "quit") == 0 ||
strcasecmp (cmd, "exit") == 0 ||
strcasecmp (cmd, "q") == 0)
printf (_("quit - quit guestfish\n"
" quit\n"));
+ else if (strcasecmp (cmd, "reopen") == 0)
+ 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"));
+ else if (strcasecmp (cmd, "time") == 0)
+ printf (_("time - measure time taken to run command\n"
+ " time <command> [<args> ...]\n"
+ "\n"
+ " This runs <command> as usual, and prints the elapsed\n"
+ " time afterwards.\n"));
else
fprintf (stderr, _("%s: command not known, use -h to list all commands\n"),
cmd);
nr_history_lines++;
#endif
}
+
+int
+xwrite (int fd, const void *buf, size_t len)
+{
+ int r;
+
+ while (len > 0) {
+ r = write (fd, buf, len);
+ if (r == -1) {
+ perror ("write");
+ return -1;
+ }
+ buf += r;
+ len -= r;
+ }
+
+ return 0;
+}
git.annexia.org / libguestfs.git / blobdiff