git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ruby: Use RSTRING_PTR, RSTRING_LEN for compat with Ruby 1.9 (RHBZ#760000).
[libguestfs.git]
/
fish
/
edit.c
diff --git
a/fish/edit.c
b/fish/edit.c
index
10950f9
..
7bd6244
100644
(file)
--- a/
fish/edit.c
+++ b/
fish/edit.c
@@
-1,5
+1,5
@@
/* guestfish - the filesystem interactive shell
/* 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
*
* 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
@@
-13,7
+13,7
@@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc.,
675 Mass Ave, Cambridge, MA 02139,
USA.
+ * Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA.
*/
#include <config.h>
*/
#include <config.h>
@@
-32,11
+32,12
@@
/* guestfish edit command, suggested by Ján Ondrej, implemented by RWMJ */
int
/* guestfish edit command, suggested by Ján Ondrej, implemented by RWMJ */
int
-
do_edit (const char *cmd, in
t 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 buf[256];
const char *editor;
+ char *remotefilename;
struct stat oldstat, newstat;
int r, fd;
struct stat oldstat, newstat;
int r, fd;
@@
-56,24
+57,32
@@
do_edit (const char *cmd, int argc, char *argv[])
editor = "vi"; /* could be cruel here and choose ed(1) */
}
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");
/* 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);
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);
close (fd);
unlink (filename);
+ free (remotefilename);
return -1;
}
if (close (fd) == -1) {
perror (filename);
unlink (filename);
return -1;
}
if (close (fd) == -1) {
perror (filename);
unlink (filename);
+ free (remotefilename);
return -1;
}
return -1;
}
@@
-81,6
+90,7
@@
do_edit (const char *cmd, int argc, char *argv[])
if (stat (filename, &oldstat) == -1) {
perror (filename);
unlink (filename);
if (stat (filename, &oldstat) == -1) {
perror (filename);
unlink (filename);
+ free (remotefilename);
return -1;
}
return -1;
}
@@
-92,6
+102,7
@@
do_edit (const char *cmd, int argc, char *argv[])
if (r != 0) {
perror (buf);
unlink (filename);
if (r != 0) {
perror (buf);
unlink (filename);
+ free (remotefilename);
return -1;
}
return -1;
}
@@
-99,6
+110,7
@@
do_edit (const char *cmd, int argc, char *argv[])
if (stat (filename, &newstat) == -1) {
perror (filename);
unlink (filename);
if (stat (filename, &newstat) == -1) {
perror (filename);
unlink (filename);
+ free (remotefilename);
return -1;
}
return -1;
}
@@
-106,15
+118,18
@@
do_edit (const char *cmd, int argc, char *argv[])
if (oldstat.st_ctime == newstat.st_ctime &&
oldstat.st_size == newstat.st_size) {
unlink (filename);
if (oldstat.st_ctime == newstat.st_ctime &&
oldstat.st_size == newstat.st_size) {
unlink (filename);
+ free (remotefilename);
return 0;
}
/* Write new content. */
return 0;
}
/* Write new content. */
- if (guestfs_upload (g, filename,
argv[0]
) == -1) {
+ if (guestfs_upload (g, filename,
remotefilename
) == -1) {
unlink (filename);
unlink (filename);
+ free (remotefilename);
return -1;
}
unlink (filename);
return -1;
}
unlink (filename);
+ free (remotefilename);
return 0;
}
return 0;
}