X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=fish%2Ffish.c;h=bf82b8af936e39c153f6ba16fc8607a2a9ab2252;hp=79f77fe9fee84ec7ed756d48847035f44fdab756;hb=394c8bec21d47b74567a4148fdbf87318c301441;hpb=d70248333edf8a5b5f509609cf2c8f7fd77d5e05

diff --git a/fish/fish.c b/fish/fish.c
index 79f77fe..bf82b8a 100644
--- a/fish/fish.c
+++ b/fish/fish.c
@@ -45,12 +45,17 @@ struct mp {
   char *mountpoint;
 };
 
+struct drv {
+  struct drv *next;
+  char *filename;
+};
+
+static void add_drives (struct drv *drv);
 static void mount_mps (struct mp *mp);
 static void interactive (void);
 static void shell_script (void);
 static void script (int prompt);
 static void cmdline (char *argv[], int optind, int argc);
-static int issue_command (const char *cmd, char *argv[]);
 static void initialize_readline (void);
 static void cleanup_readline (void);
 static void add_history_line (const char *);
@@ -96,6 +101,7 @@ usage (void)
 	     "  -h|--cmd-help        List available commands\n"
 	     "  -h|--cmd-help cmd    Display detailed help on 'cmd'\n"
 	     "  -a|--add image       Add image\n"
+	     "  -D|--no-dest-paths   Don't tab-complete paths from guest fs\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"
@@ -113,12 +119,15 @@ main (int argc, char *argv[])
     { "cmd-help", 2, 0, 'h' },
     { "help", 0, 0, '?' },
     { "mount", 1, 0, 'm' },
+    { "no-dest-paths", 0, 0, 'D' },
     { "no-sync", 0, 0, 'n' },
     { "ro", 0, 0, 'r' },
     { "verbose", 0, 0, 'v' },
     { "version", 0, 0, 'V' },
     { 0, 0, 0, 0 }
   };
+  struct drv *drvs = NULL;
+  struct drv *drv;
   struct mp *mps = NULL;
   struct mp *mp;
   char *p;
@@ -137,9 +146,10 @@ main (int argc, char *argv[])
 
   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 +157,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);
@@ -159,8 +169,18 @@ main (int argc, char *argv[])
 	perror (optarg);
 	exit (1);
       }
-      if (guestfs_add_drive (g, optarg) == -1)
-	exit (1);
+      drv = malloc (sizeof (struct drv));
+      if (!drv) {
+        perror ("malloc");
+        exit (1);
+      }
+      drv->filename = optarg;
+      drv->next = drvs;
+      drvs = drv;
+      break;
+
+    case 'D':
+      complete_dest_paths = 0;
       break;
 
     case 'h':
@@ -217,6 +237,9 @@ main (int argc, char *argv[])
     }
   }
 
+  /* If we've got drives to add, add them now. */
+  add_drives (drvs);
+
   /* If we've got mountpoints, we must launch the guest and mount them. */
   if (mps != NULL) {
     if (launch (g) == -1) exit (1);
@@ -276,6 +299,22 @@ mount_mps (struct mp *mp)
 }
 
 static void
+add_drives (struct drv *drv)
+{
+  int r;
+
+  if (drv) {
+    add_drives (drv->next);
+    if (!read_only)
+      r = guestfs_add_drive (g, drv->filename);
+    else
+      r = guestfs_add_drive_ro (g, drv->filename);
+    if (r == -1)
+      exit (1);
+  }
+}
+
+static void
 interactive (void)
 {
   script (1);
@@ -529,7 +568,7 @@ cmdline (char *argv[], int optind, int argc)
   }
 }
 
-static int
+int
 issue_command (const char *cmd, char *argv[])
 {
   int argc;
@@ -559,6 +598,10 @@ issue_command (const char *cmd, char *argv[])
 	   strcasecmp (cmd, "vi") == 0 ||
 	   strcasecmp (cmd, "emacs") == 0)
     return do_edit (cmd, argc, argv);
+  else if (strcasecmp (cmd, "lcd") == 0)
+    return do_lcd (cmd, argc, argv);
+  else if (strcasecmp (cmd, "glob") == 0)
+    return do_glob (cmd, argc, argv);
   else
     return run_action (cmd, argc, argv);
 }
@@ -578,6 +621,10 @@ list_builtin_commands (void)
 	  "echo", _("display a line of text"));
   printf ("%-20s %s\n",
 	  "edit", _("edit a file in the image"));
+  printf ("%-20s %s\n",
+	  "lcd", _("local change directory"));
+  printf ("%-20s %s\n",
+	  "glob", _("expand wildcards in command"));
 
   /* actions are printed after this (see list_commands) */
 }
@@ -625,6 +672,20 @@ display_builtin_command (const char *cmd)
 	      "\n"
 	      "    NOTE: This will not work reliably for large files\n"
 	      "    (> 2 MB) or binary files containing \\0 bytes.\n"));
+  else if (strcasecmp (cmd, "lcd") == 0)
+    printf (_("lcd - local change directory\n"
+	      "    lcd <directory>\n"
+	      "\n"
+	      "    Change guestfish's current directory. This command is\n"
+	      "    useful if you want to download files to a particular\n"
+	      "    place.\n"));
+  else if (strcasecmp (cmd, "glob") == 0)
+    printf (_("glob - expand wildcards in command\n"
+	      "    glob <command> [<args> ...]\n"
+	      "\n"
+	      "    Glob runs <command> with wildcards expanded in any\n"
+	      "    command args.  Note that the command is run repeatedly\n"
+	      "    once for each expanded argument.\n"));
   else if (strcasecmp (cmd, "help") == 0)
     printf (_("help - display a list of commands or help on a command\n"
 	      "     help cmd\n"
@@ -649,6 +710,16 @@ free_strings (char **argv)
   free (argv);
 }
 
+int
+count_strings (char * const * const argv)
+{
+  int c;
+
+  for (c = 0; argv[c]; ++c)
+    ;
+  return c;
+}
+
 void
 print_strings (char * const * const argv)
 {