X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=fish%2Ffish.c;h=fa34510d04916c499578177ad7738994c7e38977;hb=080545d0f87cca424420d05a743ab1f42becb72f;hp=a956bf9e427979064a2b3d6363cef86b07d3e687;hpb=a4d88af2c13692e38fb7cfce77b082cee6e0462f;p=libguestfs.git

diff --git a/fish/fish.c b/fish/fish.c
index a956bf9..fa34510 100644
--- a/fish/fish.c
+++ b/fish/fish.c
@@ -28,6 +28,7 @@
 #include <getopt.h>
 #include <signal.h>
 #include <assert.h>
+#include <ctype.h>
 
 #ifdef HAVE_LIBREADLINE
 #include <readline/readline.h>
@@ -56,7 +57,6 @@ 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;
@@ -67,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;
 }
@@ -334,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"
@@ -345,6 +346,8 @@ script (int prompt)
 	    "\n");
 
   while (!quit) {
+    exit_on_error = global_exit_on_error;
+
     buf = rl_gets (prompt);
     if (!buf) {
       quit = 1;
@@ -352,6 +355,7 @@ script (int prompt)
     }
 
     /* Skip any initial whitespace before the command. */
+  again:
     while (*buf && isspace (*buf))
       buf++;
 
@@ -365,7 +369,7 @@ script (int prompt)
       int r;
 
       r = system (buf+1);
-      if (!prompt) {
+      if (exit_on_error) {
 	if (r == -1 ||
 	    (WIFSIGNALED (r) &&
 	     (WTERMSIG (r) == SIGINT || WTERMSIG (r) == SIGQUIT)) ||
@@ -375,6 +379,15 @@ script (int prompt)
       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");
 
@@ -402,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';
@@ -417,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';
@@ -439,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';
@@ -471,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;
     }
 
@@ -479,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:;