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

diff --git a/fish/fish.c b/fish/fish.c
index 812197c..fcafb5c 100644
--- a/fish/fish.c
+++ b/fish/fish.c
@@ -57,6 +57,7 @@ static void add_history_line (const char *);
 guestfs_h *g;
 int g_launched = 0;
 
+int read_only = 0;
 int quit = 0;
 int verbose = 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;
@@ -189,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);
@@ -249,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);
   }
 }
@@ -277,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;
@@ -300,8 +322,6 @@ rl_gets (int prompt)
     if (len > 0 && buf[len-1] == '\n') buf[len-1] = '\0';
   }
 
-#endif /* !HAVE_LIBREADLINE */
-
   return line_read;
 }
 
@@ -334,6 +354,11 @@ script (int prompt)
     while (*buf && isspace (*buf))
       buf++;
 
+    if (!*buf) continue;
+
+    /* If the next character is '#' then this is a comment. */
+    if (*buf == '#') continue;
+
     /* Get the command (cannot be quoted). */
     len = strcspn (buf, " \t");
 
@@ -498,6 +523,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)
@@ -518,6 +545,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) */
@@ -545,6 +574,11 @@ display_builtin_command (const char *cmd)
 	    "    <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)