X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=fish%2Ffish.c;h=fa34510d04916c499578177ad7738994c7e38977;hb=080545d0f87cca424420d05a743ab1f42becb72f;hp=1255a2d0710b983ad0092e7cd18720034847c097;hpb=b18961055531f0107ed4f62c0d2f28e4ac1270e0;p=libguestfs.git diff --git a/fish/fish.c b/fish/fish.c index 1255a2d..fa34510 100644 --- a/fish/fish.c +++ b/fish/fish.c @@ -26,7 +26,9 @@ #include #include #include +#include #include +#include #ifdef HAVE_LIBREADLINE #include @@ -55,8 +57,8 @@ static void add_history_line (const char *); /* Currently open libguestfs handle. */ guestfs_h *g; -int g_launched = 0; +int read_only = 0; int quit = 0; int verbose = 0; @@ -65,12 +67,11 @@ launch (guestfs_h *_g) { 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; } @@ -97,22 +98,25 @@ usage (void) " -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; @@ -136,8 +140,12 @@ main (int argc, char *argv[]) /* 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); @@ -185,11 +193,19 @@ main (int argc, char *argv[]) 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); @@ -245,9 +261,15 @@ pod2text (const char *heading, const char *str) 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); } } @@ -273,17 +295,21 @@ rl_gets (int prompt) { #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; @@ -296,8 +322,6 @@ rl_gets (int prompt) if (len > 0 && buf[len-1] == '\n') buf[len-1] = '\0'; } -#endif /* !HAVE_LIBREADLINE */ - return line_read; } @@ -309,6 +333,8 @@ script (int prompt) char *p, *pend; char *argv[64]; int i, len; + int global_exit_on_error = !prompt; + int exit_on_error; if (prompt) printf ("\n" @@ -320,6 +346,8 @@ script (int prompt) "\n"); while (!quit) { + exit_on_error = global_exit_on_error; + buf = rl_gets (prompt); if (!buf) { quit = 1; @@ -327,9 +355,39 @@ script (int prompt) } /* 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"); @@ -357,12 +415,12 @@ script (int prompt) 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'; @@ -372,12 +430,12 @@ script (int prompt) 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'; @@ -394,12 +452,12 @@ script (int prompt) } 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'; @@ -426,7 +484,7 @@ script (int prompt) 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; } @@ -434,7 +492,7 @@ script (int prompt) got_command: if (issue_command (cmd, argv) == -1) { - if (!prompt) exit (1); + if (exit_on_error) exit (1); } next_command:; @@ -494,6 +552,8 @@ issue_command (const char *cmd, char *argv[]) else if (strcasecmp (cmd, "alloc") == 0 || strcasecmp (cmd, "allocate") == 0) 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) @@ -514,6 +574,8 @@ list_builtin_commands (void) 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) */ @@ -541,6 +603,11 @@ display_builtin_command (const char *cmd) " M or MB number of megabytes\n" " G or GB number of gigabytes\n" " sects number of 512 byte sectors\n"); + else if (strcasecmp (cmd, "echo") == 0) + printf ("echo - display a line of text\n" + " echo [ ...]\n" + "\n" + " This echos the parameters to the terminal.\n"); else if (strcasecmp (cmd, "edit") == 0 || strcasecmp (cmd, "vi") == 0 || strcasecmp (cmd, "emacs") == 0)