X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=fish%2Ffish.c;h=cba0343b9cf43328b5d034af07584c58e494c036;hp=da2d6d21ebc6a9dc06b40167fca56ec86693a4e5;hb=46551d9c51193a4bca2e1b249b8c5f111e1dc7b5;hpb=fa8cb5dac284bf463677380e5ef55370f447d870;ds=sidebyside

diff --git a/fish/fish.c b/fish/fish.c
index da2d6d2..cba0343 100644
--- a/fish/fish.c
+++ b/fish/fish.c
@@ -56,7 +56,6 @@ 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 *);
@@ -102,6 +101,8 @@ 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"
+	     "  -f|--file file       Read commands from file\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 +114,14 @@ usage (void)
 int
 main (int argc, char *argv[])
 {
-  static const char *options = "a:h::m:nrv?V";
+  static const char *options = "a:f:h::m:nrv?V";
   static struct option long_options[] = {
     { "add", 1, 0, 'a' },
     { "cmd-help", 2, 0, 'h' },
+    { "file", 1, 0, 'f' },
     { "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' },
@@ -129,7 +132,7 @@ main (int argc, char *argv[])
   struct drv *drv;
   struct mp *mps = NULL;
   struct mp *mp;
-  char *p;
+  char *p, *file = NULL;
   int c;
 
   initialize_readline ();
@@ -178,6 +181,18 @@ main (int argc, char *argv[])
       drvs = drv;
       break;
 
+    case 'D':
+      complete_dest_paths = 0;
+      break;
+
+    case 'f':
+      if (file) {
+	fprintf (stderr, _("guestfish: only one -f parameter can be given\n"));
+	exit (1);
+      }
+      file = optarg;
+      break;
+
     case 'h':
       if (optarg)
 	display_command (optarg);
@@ -241,6 +256,15 @@ main (int argc, char *argv[])
     mount_mps (mps);
   }
 
+  /* -f (file) parameter? */
+  if (file) {
+    close (0);
+    if (open (file, O_RDONLY) == -1) {
+      perror (file);
+      exit (1);
+    }
+  }
+
   /* Interactive, shell script, or command(s) on the command line? */
   if (optind >= argc) {
     if (isatty (0))
@@ -563,7 +587,7 @@ cmdline (char *argv[], int optind, int argc)
   }
 }
 
-static int
+int
 issue_command (const char *cmd, char *argv[])
 {
   int argc;
@@ -595,6 +619,8 @@ issue_command (const char *cmd, char *argv[])
     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);
 }
@@ -616,6 +642,8 @@ list_builtin_commands (void)
 	  "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) */
 }
@@ -670,6 +698,13 @@ display_builtin_command (const char *cmd)
 	      "    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"
@@ -694,6 +729,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)
 {