X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=fish%2Ffish.c;h=18d3880d405ef9bbbd10baceee12eee775da7ee1;hp=fcafb5caa0f24e9a18234f3345a996f192e6622f;hb=a1e8cdf2a254c5eddaf525cd7c34e4c937690204;hpb=4581eb2523eeb4d094d53af0555cb7e0f760ae2d

diff --git a/fish/fish.c b/fish/fish.c
index fcafb5c..18d3880 100644
--- a/fish/fish.c
+++ b/fish/fish.c
@@ -26,7 +26,9 @@
 #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>
@@ -55,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;
@@ -66,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;
 }
@@ -80,28 +80,28 @@ static void
 usage (void)
 {
   fprintf (stderr,
-	   "guestfish: guest filesystem shell\n"
-	   "guestfish lets you edit virtual machine filesystems\n"
-	   "Copyright (C) 2009 Red Hat Inc.\n"
-	   "Usage:\n"
-	   "  guestfish [--options] cmd [: cmd : cmd ...]\n"
-	   "or for interactive use:\n"
-	   "  guestfish\n"
-	   "or from a shell script:\n"
-	   "  guestfish <<EOF\n"
-	   "  cmd\n"
-	   "  ...\n"
-	   "  EOF\n"
-	   "Options:\n"
-	   "  -h|--cmd-help        List available commands\n"
-	   "  -h|--cmd-help cmd    Display detailed help on 'cmd'\n"
-	   "  -a|--add image       Add image\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"
-	   "  -v|--verbose         Verbose messages\n"
-	   "  -V|--version         Display version and exit\n"
-	   "For more information,  see the manpage guestfish(1).\n");
+	   _("guestfish: guest filesystem shell\n"
+	     "guestfish lets you edit virtual machine filesystems\n"
+	     "Copyright (C) 2009 Red Hat Inc.\n"
+	     "Usage:\n"
+	     "  guestfish [--options] cmd [: cmd : cmd ...]\n"
+	     "or for interactive use:\n"
+	     "  guestfish\n"
+	     "or from a shell script:\n"
+	     "  guestfish <<EOF\n"
+	     "  cmd\n"
+	     "  ...\n"
+	     "  EOF\n"
+	     "Options:\n"
+	     "  -h|--cmd-help        List available commands\n"
+	     "  -h|--cmd-help cmd    Display detailed help on 'cmd'\n"
+	     "  -a|--add image       Add image\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"
+	     "  -v|--verbose         Verbose messages\n"
+	     "  -V|--version         Display version and exit\n"
+	     "For more information,  see the manpage guestfish(1).\n"));
 }
 
 int
@@ -131,15 +131,16 @@ main (int argc, char *argv[])
    */
   g = guestfs_create ();
   if (g == NULL) {
-    fprintf (stderr, "guestfs_create: failed to create handle\n");
+    fprintf (stderr, _("guestfs_create: failed to create handle\n"));
     exit (1);
   }
 
   guestfs_set_autosync (g, 1);
 
-  /* 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.
+  /* If developing, add ./appliance 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.
@@ -147,7 +148,7 @@ main (int argc, char *argv[])
   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_path (g, "appliance:" GUESTFS_DEFAULT_PATH);
 
   for (;;) {
     c = getopt_long (argc, argv, options, long_options, NULL);
@@ -211,7 +212,8 @@ main (int argc, char *argv[])
       exit (0);
 
     default:
-      fprintf (stderr, "guestfish: unexpected command line option 0x%x\n", c);
+      fprintf (stderr, _("guestfish: unexpected command line option 0x%x\n"),
+	       c);
       exit (1);
     }
   }
@@ -333,17 +335,21 @@ 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"
-	    "Welcome to guestfish, the libguestfs filesystem interactive shell for\n"
-	    "editing virtual machine filesystems.\n"
-	    "\n"
-	    "Type: 'help' for help with commands\n"
-	    "      'quit' to quit the shell\n"
-	    "\n");
+    printf (_("\n"
+	      "Welcome to guestfish, the libguestfs filesystem interactive shell for\n"
+	      "editing virtual machine filesystems.\n"
+	      "\n"
+	      "Type: 'help' for help with commands\n"
+	      "      'quit' to quit the shell\n"
+	      "\n"));
 
   while (!quit) {
+    exit_on_error = global_exit_on_error;
+
     buf = rl_gets (prompt);
     if (!buf) {
       quit = 1;
@@ -351,6 +357,7 @@ script (int prompt)
     }
 
     /* Skip any initial whitespace before the command. */
+  again:
     while (*buf && isspace (*buf))
       buf++;
 
@@ -359,6 +366,30 @@ script (int prompt)
     /* 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");
 
@@ -385,13 +416,13 @@ script (int prompt)
 	p++;
 	len = strcspn (p, "\"");
 	if (p[len] == '\0') {
-	  fprintf (stderr, "guestfish: unterminated double quote\n");
-	  if (!prompt) exit (1);
+	  fprintf (stderr, _("guestfish: unterminated double quote\n"));
+	  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);
+	  fprintf (stderr, _("guestfish: command arguments not separated by whitespace\n"));
+	  if (exit_on_error) exit (1);
 	  goto next_command;
 	}
 	p[len] = '\0';
@@ -400,13 +431,13 @@ script (int prompt)
 	p++;
 	len = strcspn (p, "'");
 	if (p[len] == '\0') {
-	  fprintf (stderr, "guestfish: unterminated single quote\n");
-	  if (!prompt) exit (1);
+	  fprintf (stderr, _("guestfish: unterminated single quote\n"));
+	  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);
+	  fprintf (stderr, _("guestfish: command arguments not separated by whitespace\n"));
+	  if (exit_on_error) exit (1);
 	  goto next_command;
 	}
 	p[len] = '\0';
@@ -422,13 +453,13 @@ script (int prompt)
 	  pend++;
 	}
 	if (c != 0) {
-	  fprintf (stderr, "guestfish: unterminated \"[...]\" sequence\n");
-	  if (!prompt) exit (1);
+	  fprintf (stderr, _("guestfish: unterminated \"[...]\" sequence\n"));
+	  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);
+	  fprintf (stderr, _("guestfish: command arguments not separated by whitespace\n"));
+	  if (exit_on_error) exit (1);
 	  goto next_command;
 	}
 	*(pend-1) = '\0';
@@ -441,7 +472,7 @@ script (int prompt)
 	} else
 	  pend = &p[len];
       } else {
-	fprintf (stderr, "guestfish: internal error parsing string at '%s'\n",
+	fprintf (stderr, _("guestfish: internal error parsing string at '%s'\n"),
 		 p);
 	abort ();
       }
@@ -454,8 +485,8 @@ script (int prompt)
     }
 
     if (i == sizeof argv / sizeof argv[0]) {
-      fprintf (stderr, "guestfish: too many arguments\n");
-      if (!prompt) exit (1);
+      fprintf (stderr, _("guestfish: too many arguments\n"));
+      if (exit_on_error) exit (1);
       goto next_command;
     }
 
@@ -463,7 +494,7 @@ script (int prompt)
 
   got_command:
     if (issue_command (cmd, argv) == -1) {
-      if (!prompt) exit (1);
+      if (exit_on_error) exit (1);
     }
 
   next_command:;
@@ -481,7 +512,7 @@ cmdline (char *argv[], int optind, int argc)
 
   cmd = argv[optind++];
   if (strcmp (cmd, ":") == 0) {
-    fprintf (stderr, "guestfish: empty command on command line\n");
+    fprintf (stderr, _("guestfish: empty command on command line\n"));
     exit (1);
   }
   params = &argv[optind];
@@ -538,16 +569,16 @@ list_builtin_commands (void)
 {
   /* help and quit should appear at the top */
   printf ("%-20s %s\n",
-	  "help", "display a list of commands or help on a command");
+	  "help", _("display a list of commands or help on a command"));
   printf ("%-20s %s\n",
-	  "quit", "quit guestfish");
+	  "quit", _("quit guestfish"));
 
   printf ("%-20s %s\n",
-	  "alloc", "allocate an image");
+	  "alloc", _("allocate an image"));
   printf ("%-20s %s\n",
-	  "echo", "display a line of text");
+	  "echo", _("display a line of text"));
   printf ("%-20s %s\n",
-	  "edit", "edit a file in the image");
+	  "edit", _("edit a file in the image"));
 
   /* actions are printed after this (see list_commands) */
 }
@@ -559,53 +590,53 @@ display_builtin_command (const char *cmd)
 
   if (strcasecmp (cmd, "alloc") == 0 ||
       strcasecmp (cmd, "allocate") == 0)
-    printf ("alloc - allocate an image\n"
-	    "     alloc <filename> <size>\n"
-	    "\n"
-	    "    This creates an empty (zeroed) file of the given size,\n"
-	    "    and then adds so it can be further examined.\n"
-	    "\n"
-	    "    For more advanced image creation, see qemu-img utility.\n"
-	    "\n"
-	    "    Size can be specified (where <nn> means a number):\n"
-	    "    <nn>             number of kilobytes\n"
-	    "      eg: 1440       standard 3.5\" floppy\n"
-	    "    <nn>K or <nn>KB  number of kilobytes\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");
+    printf (_("alloc - allocate an image\n"
+	      "     alloc <filename> <size>\n"
+	      "\n"
+	      "    This creates an empty (zeroed) file of the given size,\n"
+	      "    and then adds so it can be further examined.\n"
+	      "\n"
+	      "    For more advanced image creation, see qemu-img utility.\n"
+	      "\n"
+	      "    Size can be specified (where <nn> means a number):\n"
+	      "    <nn>             number of kilobytes\n"
+	      "      eg: 1440       standard 3.5\" floppy\n"
+	      "    <nn>K or <nn>KB  number of kilobytes\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");
+    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");
+    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");
+    printf (_("help - display a list of commands or help on a command\n"
+	      "     help cmd\n"
+	      "     help\n"));
   else if (strcasecmp (cmd, "quit") == 0 ||
 	   strcasecmp (cmd, "exit") == 0 ||
 	   strcasecmp (cmd, "q") == 0)
-    printf ("quit - quit guestfish\n"
-	    "     quit\n");
+    printf (_("quit - quit guestfish\n"
+	      "     quit\n"));
   else
-    fprintf (stderr, "%s: command not known, use -h to list all commands\n",
+    fprintf (stderr, _("%s: command not known, use -h to list all commands\n"),
 	     cmd);
 }