X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=fish%2Ffish.c;h=1255a2d0710b983ad0092e7cd18720034847c097;hb=e2870fb94cbd22affecdd16e8f75f75e78d1c18b;hp=e506f7ef675e9345b3d5d7440de9a4281dcc3244;hpb=ad5abc8d367c9c410051062cae066b1b141b4c76;p=libguestfs.git

diff --git a/fish/fish.c b/fish/fish.c
index e506f7e..1255a2d 100644
--- a/fish/fish.c
+++ b/fish/fish.c
@@ -26,7 +26,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <getopt.h>
-#include <inttypes.h>
 #include <assert.h>
 
 #ifdef HAVE_LIBREADLINE
@@ -50,7 +49,6 @@ 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 int parse_size (const char *str, off_t *size_rtn);
 static void initialize_readline (void);
 static void cleanup_readline (void);
 static void add_history_line (const char *);
@@ -368,7 +366,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, "'");
@@ -383,7 +381,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;
@@ -494,50 +492,12 @@ issue_command (const char *cmd, char *argv[])
     return 0;
   }
   else if (strcasecmp (cmd, "alloc") == 0 ||
-	   strcasecmp (cmd, "allocate") == 0) {
-    if (argc != 2) {
-      fprintf (stderr, "use 'alloc file size' to create an image\n");
-      return -1;
-    }
-    else {
-      off_t size;
-      int fd;
-
-      if (parse_size (argv[1], &size) == -1)
-	return -1;
-
-      if (g_launched) {
-	fprintf (stderr, "can't allocate or add disks after launching\n");
-	return -1;
-      }
-
-      fd = open (argv[0], O_WRONLY|O_CREAT|O_NOCTTY|O_NONBLOCK|O_TRUNC, 0666);
-      if (fd == -1) {
-	perror (argv[0]);
-	return -1;
-      }
-
-      if (posix_fallocate (fd, 0, size) == -1) {
-	perror ("fallocate");
-	close (fd);
-	unlink (argv[0]);
-	return -1;
-      }
-
-      if (close (fd) == -1) {
-	perror (argv[0]);
-	unlink (argv[0]);
-	return -1;
-      }
-
-      if (guestfs_add_drive (g, argv[0]) == -1) {
-	unlink (argv[0]);
-	return -1;
-      }
-
-      return 0;
-    }
-  }
+	   strcasecmp (cmd, "allocate") == 0)
+    return do_alloc (cmd, argc, argv);
+  else if (strcasecmp (cmd, "edit") == 0 ||
+	   strcasecmp (cmd, "vi") == 0 ||
+	   strcasecmp (cmd, "emacs") == 0)
+    return do_edit (cmd, argc, argv);
   else
     return run_action (cmd, argc, argv);
 }
@@ -553,6 +513,8 @@ list_builtin_commands (void)
 
   printf ("%-20s %s\n",
 	  "alloc", "allocate an image");
+  printf ("%-20s %s\n",
+	  "edit", "edit a file in the image");
 
   /* actions are printed after this (see list_commands) */
 }
@@ -562,7 +524,8 @@ display_builtin_command (const char *cmd)
 {
   /* help for actions is auto-generated, see display_command */
 
-  if (strcasecmp (cmd, "alloc") == 0)
+  if (strcasecmp (cmd, "alloc") == 0 ||
+      strcasecmp (cmd, "allocate") == 0)
     printf ("alloc - allocate an image\n"
 	    "     alloc <filename> <size>\n"
 	    "\n"
@@ -578,11 +541,29 @@ 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, "edit") == 0 ||
+	   strcasecmp (cmd, "vi") == 0 ||
+	   strcasecmp (cmd, "emacs") == 0)
+    printf ("edit - edit a file in the image\n"
+	    "     edit <filename>\n"
+	    "\n"
+	    "    This is used to edit a file.\n"
+	    "\n"
+	    "    It is the equivalent of (and is implemented by)\n"
+	    "    running \"cat\", editing locally, and then \"write-file\".\n"
+	    "\n"
+	    "    Normally it uses $EDITOR, but if you use the aliases\n"
+	    "    \"vi\" or \"emacs\" you will get those editors.\n"
+	    "\n"
+	    "    NOTE: This will not work reliably for large files\n"
+	    "    (> 2 MB) or binary files containing \\0 bytes.\n");
   else if (strcasecmp (cmd, "help") == 0)
     printf ("help - display a list of commands or help on a command\n"
 	    "     help cmd\n"
 	    "     help\n");
-  else if (strcasecmp (cmd, "quit") == 0)
+  else if (strcasecmp (cmd, "quit") == 0 ||
+	   strcasecmp (cmd, "exit") == 0 ||
+	   strcasecmp (cmd, "q") == 0)
     printf ("quit - quit guestfish\n"
 	    "     quit\n");
   else
@@ -590,42 +571,6 @@ display_builtin_command (const char *cmd)
 	     cmd);
 }
 
-/* Parse size parameter of alloc command. */
-static int
-parse_size (const char *str, off_t *size_rtn)
-{
-  uint64_t size;
-  char type;
-
-  /* Note that the parsing here is looser than what is specified in the
-   * help, but we may tighten it up in future so beware.
-   */
-  if (sscanf (str, "%"SCNu64"%c", &size, &type) == 2) {
-    switch (type) {
-    case 'k': case 'K': size *= 1024; break;
-    case 'm': case 'M': size *= 1024 * 1024; break;
-    case 'g': case 'G': size *= 1024 * 1024 * 1024; break;
-    case 's': size *= 512; break;
-    default:
-      fprintf (stderr, "could not parse size specification '%s'\n", str);
-      return -1;
-    }
-  }
-  else if (sscanf (str, "%"SCNu64, &size) == 1)
-    size *= 1024;
-  else {
-    fprintf (stderr, "could not parse size specification '%s'\n", str);
-    return -1;
-  }
-
-  /* XXX 32 bit file offsets, if anyone uses them?  GCC should give
-   * a warning here anyhow.
-   */
-  *size_rtn = size;
-
-  return 0;
-}
-
 void
 free_strings (char **argv)
 {