X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=fish%2Fedit.c;h=80ae44bd15baeda3abc5dcd97fa42a1991e97283;hp=4c06e86e86aa00eaabe19426c2f0f94b09288a4e;hb=4accf3197235300029d04d0ab637b66eaaf9f8df;hpb=0003ea2c3dbaa7e22f4f616539136821d80694b8

diff --git a/fish/edit.c b/fish/edit.c
index 4c06e86..80ae44b 100644
--- a/fish/edit.c
+++ b/fish/edit.c
@@ -1,5 +1,5 @@
 /* guestfish - the filesystem interactive shell
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009-2011 Red Hat Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,11 +32,12 @@
 /* guestfish edit command, suggested by Ján Ondrej, implemented by RWMJ */
 
 int
-run_edit (const char *cmd, int argc, char *argv[])
+run_edit (const char *cmd, size_t argc, char *argv[])
 {
-  char filename[] = "/tmp/guestfishXXXXXX";
+  TMP_TEMPLATE_ON_STACK (filename);
   char buf[256];
   const char *editor;
+  char *remotefilename;
   struct stat oldstat, newstat;
   int r, fd;
 
@@ -56,24 +57,32 @@ run_edit (const char *cmd, int argc, char *argv[])
       editor = "vi"; /* could be cruel here and choose ed(1) */
   }
 
+  /* Handle 'win:...' prefix. */
+  remotefilename = win_prefix (argv[0]);
+  if (remotefilename == NULL)
+    return -1;
+
   /* Download the file and write it to a temporary. */
   fd = mkstemp (filename);
   if (fd == -1) {
     perror ("mkstemp");
+    free (remotefilename);
     return -1;
   }
 
   snprintf (buf, sizeof buf, "/dev/fd/%d", fd);
 
-  if (guestfs_download (g, argv[0], buf) == -1) {
+  if (guestfs_download (g, remotefilename, buf) == -1) {
     close (fd);
     unlink (filename);
+    free (remotefilename);
     return -1;
   }
 
   if (close (fd) == -1) {
     perror (filename);
     unlink (filename);
+    free (remotefilename);
     return -1;
   }
 
@@ -81,6 +90,7 @@ run_edit (const char *cmd, int argc, char *argv[])
   if (stat (filename, &oldstat) == -1) {
     perror (filename);
     unlink (filename);
+    free (remotefilename);
     return -1;
   }
 
@@ -92,6 +102,7 @@ run_edit (const char *cmd, int argc, char *argv[])
   if (r != 0) {
     perror (buf);
     unlink (filename);
+    free (remotefilename);
     return -1;
   }
 
@@ -99,6 +110,7 @@ run_edit (const char *cmd, int argc, char *argv[])
   if (stat (filename, &newstat) == -1) {
     perror (filename);
     unlink (filename);
+    free (remotefilename);
     return -1;
   }
 
@@ -106,15 +118,18 @@ run_edit (const char *cmd, int argc, char *argv[])
   if (oldstat.st_ctime == newstat.st_ctime &&
       oldstat.st_size == newstat.st_size) {
     unlink (filename);
+    free (remotefilename);
     return 0;
   }
 
   /* Write new content. */
-  if (guestfs_upload (g, filename, argv[0]) == -1) {
+  if (guestfs_upload (g, filename, remotefilename) == -1) {
     unlink (filename);
+    free (remotefilename);
     return -1;
   }
 
   unlink (filename);
+  free (remotefilename);
   return 0;
 }