#include <unistd.h>
#include <fcntl.h>
#include <getopt.h>
+#include <signal.h>
#include <assert.h>
+#include <ctype.h>
#ifdef HAVE_LIBREADLINE
#include <readline/readline.h>
/* Currently open libguestfs handle. */
guestfs_h *g;
-int g_launched = 0;
+int read_only = 0;
int quit = 0;
int verbose = 0;
{
assert (_g == g);
- if (!g_launched) {
+ if (guestfs_is_config (g)) {
if (guestfs_launch (g) == -1)
return -1;
if (guestfs_wait_ready (g) == -1)
return -1;
- g_launched = 1;
}
return 0;
}
" -a|--add image Add image\n"
" -m|--mount dev[:mnt] Mount dev on mnt (if omitted, /)\n"
" -n|--no-sync Don't autosync\n"
- /*" --ro|-r All mounts are read-only\n"*/
+ " -r|--ro Mount read-only\n"
" -v|--verbose Verbose messages\n"
+ " -V|--version Display version and exit\n"
"For more information, see the manpage guestfish(1).\n");
}
int
main (int argc, char *argv[])
{
- static const char *options = "a:h::m:v?";
+ static const char *options = "a:h::m:nrv?V";
static struct option long_options[] = {
{ "add", 1, 0, 'a' },
{ "cmd-help", 2, 0, 'h' },
{ "help", 0, 0, '?' },
{ "mount", 1, 0, 'm' },
{ "no-sync", 0, 0, 'n' },
+ { "ro", 0, 0, 'r' },
{ "verbose", 0, 0, 'v' },
+ { "version", 0, 0, 'V' },
{ 0, 0, 0, 0 }
};
struct mp *mps = NULL;
/* If developing, add . to the path. Note that libtools interferes
* with this because uninstalled guestfish is a shell script that runs
* the real program with an absolute path. Detect that too.
+ *
+ * BUT if LIBGUESTFS_PATH environment variable is already set by
+ * the user, then don't override it.
*/
- if (argv[0] &&
+ if (getenv ("LIBGUESTFS_PATH") == NULL &&
+ argv[0] &&
(argv[0][0] != '/' || strstr (argv[0], "/.libs/lt-") != NULL))
guestfs_set_path (g, ".:" GUESTFS_DEFAULT_PATH);
guestfs_set_autosync (g, 0);
break;
+ case 'r':
+ read_only = 1;
+ break;
+
case 'v':
verbose++;
guestfs_set_verbose (g, verbose);
break;
+ case 'V':
+ printf ("guestfish %s\n", PACKAGE_VERSION);
+ exit (0);
+
case '?':
usage ();
exit (0);
static void
mount_mps (struct mp *mp)
{
+ int r;
+
if (mp) {
mount_mps (mp->next);
- if (guestfs_mount (g, mp->device, mp->mountpoint) == -1)
+ if (!read_only)
+ r = guestfs_mount (g, mp->device, mp->mountpoint);
+ else
+ r = guestfs_mount_ro (g, mp->device, mp->mountpoint);
+ if (r == -1)
exit (1);
}
}
{
#ifdef HAVE_LIBREADLINE
- if (line_read) {
- free (line_read);
- line_read = NULL;
- }
+ if (prompt) {
+ if (line_read) {
+ free (line_read);
+ line_read = NULL;
+ }
+
+ line_read = readline (prompt ? FISH : "");
- line_read = readline (prompt ? FISH : "");
+ if (line_read && *line_read)
+ add_history_line (line_read);
- if (prompt && line_read && *line_read)
- add_history_line (line_read);
+ return line_read;
+ }
-#else /* !HAVE_LIBREADLINE */
+#endif /* HAVE_LIBREADLINE */
static char buf[8192];
int len;
if (len > 0 && buf[len-1] == '\n') buf[len-1] = '\0';
}
-#endif /* !HAVE_LIBREADLINE */
-
return line_read;
}
char *p, *pend;
char *argv[64];
int i, len;
+ int global_exit_on_error = !prompt;
+ int exit_on_error;
if (prompt)
printf ("\n"
"\n");
while (!quit) {
+ exit_on_error = global_exit_on_error;
+
buf = rl_gets (prompt);
if (!buf) {
quit = 1;
}
/* Skip any initial whitespace before the command. */
+ again:
while (*buf && isspace (*buf))
buf++;
+ if (!*buf) continue;
+
+ /* If the next character is '#' then this is a comment. */
+ if (*buf == '#') continue;
+
+ /* If the next character is '!' then pass the whole lot to system(3). */
+ if (*buf == '!') {
+ int r;
+
+ r = system (buf+1);
+ if (exit_on_error) {
+ if (r == -1 ||
+ (WIFSIGNALED (r) &&
+ (WTERMSIG (r) == SIGINT || WTERMSIG (r) == SIGQUIT)) ||
+ WEXITSTATUS (r) != 0)
+ exit (1);
+ }
+ continue;
+ }
+
+ /* If the next character is '-' allow the command to fail without
+ * exiting on error (just for this one command though).
+ */
+ if (*buf == '-') {
+ exit_on_error = 0;
+ buf++;
+ goto again;
+ }
+
/* Get the command (cannot be quoted). */
len = strcspn (buf, " \t");
len = strcspn (p, "\"");
if (p[len] == '\0') {
fprintf (stderr, "guestfish: unterminated double quote\n");
- if (!prompt) exit (1);
+ if (exit_on_error) exit (1);
goto next_command;
}
if (p[len+1] && (p[len+1] != ' ' && p[len+1] != '\t')) {
fprintf (stderr, "guestfish: command arguments not separated by whitespace\n");
- if (!prompt) exit (1);
+ if (exit_on_error) exit (1);
goto next_command;
}
p[len] = '\0';
- pend = &p[len+2];
+ pend = p[len+1] ? &p[len+2] : &p[len+1];
} else if (*p == '\'') {
p++;
len = strcspn (p, "'");
if (p[len] == '\0') {
fprintf (stderr, "guestfish: unterminated single quote\n");
- if (!prompt) exit (1);
+ if (exit_on_error) exit (1);
goto next_command;
}
if (p[len+1] && (p[len+1] != ' ' && p[len+1] != '\t')) {
fprintf (stderr, "guestfish: command arguments not separated by whitespace\n");
- if (!prompt) exit (1);
+ if (exit_on_error) exit (1);
goto next_command;
}
p[len] = '\0';
- pend = &p[len+2];
+ pend = p[len+1] ? &p[len+2] : &p[len+1];
/*
} else if (*p == '[') {
int c = 1;
}
if (c != 0) {
fprintf (stderr, "guestfish: unterminated \"[...]\" sequence\n");
- if (!prompt) exit (1);
+ if (exit_on_error) exit (1);
goto next_command;
}
if (*pend && (*pend != ' ' && *pend != '\t')) {
fprintf (stderr, "guestfish: command arguments not separated by whitespace\n");
- if (!prompt) exit (1);
+ if (exit_on_error) exit (1);
goto next_command;
}
*(pend-1) = '\0';
if (i == sizeof argv / sizeof argv[0]) {
fprintf (stderr, "guestfish: too many arguments\n");
- if (!prompt) exit (1);
+ if (exit_on_error) exit (1);
goto next_command;
}
got_command:
if (issue_command (cmd, argv) == -1) {
- if (!prompt) exit (1);
+ if (exit_on_error) exit (1);
}
next_command:;
}
else if (strcasecmp (cmd, "alloc") == 0 ||
strcasecmp (cmd, "allocate") == 0)
- return do_alloc (argc, argv);
+ return do_alloc (cmd, argc, argv);
+ else if (strcasecmp (cmd, "echo") == 0)
+ return 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);
else
return run_action (cmd, argc, argv);
}
printf ("%-20s %s\n",
"alloc", "allocate an image");
+ printf ("%-20s %s\n",
+ "echo", "display a line of text");
+ printf ("%-20s %s\n",
+ "edit", "edit a file in the image");
/* actions are printed after this (see list_commands) */
}
{
/* help for actions is auto-generated, see display_command */
- if (strcasecmp (cmd, "alloc") == 0)
+ if (strcasecmp (cmd, "alloc") == 0 ||
+ strcasecmp (cmd, "allocate") == 0)
printf ("alloc - allocate an image\n"
" alloc <filename> <size>\n"
"\n"
" <nn>M or <nn>MB number of megabytes\n"
" <nn>G or <nn>GB number of gigabytes\n"
" <nn>sects number of 512 byte sectors\n");
+ else if (strcasecmp (cmd, "echo") == 0)
+ printf ("echo - display a line of text\n"
+ " echo [<params> ...]\n"
+ "\n"
+ " This echos the parameters to the terminal.\n");
+ else if (strcasecmp (cmd, "edit") == 0 ||
+ strcasecmp (cmd, "vi") == 0 ||
+ strcasecmp (cmd, "emacs") == 0)
+ printf ("edit - edit a file in the image\n"
+ " edit <filename>\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-file\".\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");
else if (strcasecmp (cmd, "help") == 0)
printf ("help - display a list of commands or help on a command\n"
" help cmd\n"
" help\n");
- else if (strcasecmp (cmd, "quit") == 0)
+ else if (strcasecmp (cmd, "quit") == 0 ||
+ strcasecmp (cmd, "exit") == 0 ||
+ strcasecmp (cmd, "q") == 0)
printf ("quit - quit guestfish\n"
" quit\n");
else
git.annexia.org / libguestfs.git / blobdiff