Added a comment syntax to guestfish (# ...).

[libguestfs.git] / fish / fish.c

diff --git a/fish/fish.c b/fish/fish.c
index 41776ca..894e351 100644 (file)
--- 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;
@@ -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 (prompt && line_read && *line_read)
-    add_history_line (line_read);
+    if (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;
 }
 
@@ -330,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");
 
@@ -366,7 +395,7 @@ script (int prompt)
          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, "'");
@@ -381,7 +410,7 @@ script (int prompt)
          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;