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

[libguestfs.git] / fish / fish.c

diff --git a/fish/fish.c b/fish/fish.c
index c8e9506..894e351 100644 (file)
--- a/fish/fish.c
+++ b/fish/fish.c
@@ -100,13 +100,14 @@ usage (void)
           "  -n|--no-sync         Don't autosync\n"
           "  -r|--ro              Mount read-only\n"
           "  -v|--verbose         Verbose messages\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
 main (int argc, char *argv[])
 {
           "For more information,  see the manpage guestfish(1).\n");
 }
 
 int
 main (int argc, char *argv[])
 {

-  static const char *options = "a:h::m:nrv?";
+  static const char *options = "a:h::m:nrv?V";

   static struct option long_options[] = {
     { "add", 1, 0, 'a' },
     { "cmd-help", 2, 0, 'h' },
   static struct option long_options[] = {
     { "add", 1, 0, 'a' },
     { "cmd-help", 2, 0, 'h' },


@@ -115,6 +116,7 @@ main (int argc, char *argv[])
     { "no-sync", 0, 0, 'n' },
     { "ro", 0, 0, 'r' },
     { "verbose", 0, 0, 'v' },
     { "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;
     { 0, 0, 0, 0 }
   };
   struct mp *mps = NULL;


@@ -200,6 +202,10 @@ main (int argc, char *argv[])
       guestfs_set_verbose (g, verbose);
       break;
 
       guestfs_set_verbose (g, verbose);
       break;
 

+    case 'V':
+      printf ("guestfish %s\n", PACKAGE_VERSION);
+      exit (0);
+

     case '?':
       usage ();
       exit (0);
     case '?':
       usage ();
       exit (0);


@@ -348,6 +354,11 @@ script (int prompt)
     while (*buf && isspace (*buf))
       buf++;
 
     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");
 
     /* Get the command (cannot be quoted). */
     len = strcspn (buf, " \t");