git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New API: mdadm-create for creating MD devices.
[libguestfs.git]
/
fish
/
more.c
diff --git
a/fish/more.c
b/fish/more.c
index
8bc9d95
..
9008bd1
100644
(file)
--- a/
fish/more.c
+++ b/
fish/more.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>
@@
-28,12
+28,12
@@
#include "fish.h"
int
#include "fish.h"
int
-
do_more (const char *cmd, in
t argc, char *argv[])
+
run_more (const char *cmd, size_
t argc, char *argv[])
{
{
-
char filename[] = "/tmp/guestfishXXXXXX"
;
+
TMP_TEMPLATE_ON_STACK (filename)
;
char buf[256];
char buf[256];
+ char *remote;
const char *pager;
const char *pager;
- char *content;
int r, fd;
if (argc != 1) {
int r, fd;
if (argc != 1) {
@@
-42,7
+42,7
@@
do_more (const char *cmd, int argc, char *argv[])
}
/* Choose a pager. */
}
/* Choose a pager. */
- if (
strcasecmp (cmd, "less") == 0
)
+ if (
STRCASEEQ (cmd, "less")
)
pager = "less";
else {
pager = getenv ("PAGER");
pager = "less";
else {
pager = getenv ("PAGER");
@@
-50,31
+50,34
@@
do_more (const char *cmd, int argc, char *argv[])
pager = "more";
}
pager = "more";
}
+ remote = argv[0];
+
+ /* Allow win:... prefix on remote. */
+ remote = win_prefix (remote);
+ if (remote == 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 (remote);
return -1;
}
return -1;
}
- if ((content = guestfs_cat (g, argv[0])) == NULL) {
- close (fd);
- unlink (filename);
- return -1;
- }
+ snprintf (buf, sizeof buf, "/dev/fd/%d", fd);
- if (
xwrite (fd, content, strlen (content)
) == -1) {
+ if (
guestfs_download (g, remote, buf
) == -1) {
close (fd);
unlink (filename);
close (fd);
unlink (filename);
- free (
content
);
+ free (
remote
);
return -1;
}
return -1;
}
- free (content);
-
if (close (fd) == -1) {
perror (filename);
unlink (filename);
if (close (fd) == -1) {
perror (filename);
unlink (filename);
+ free (remote);
return -1;
}
return -1;
}
@@
-86,8
+89,10
@@
do_more (const char *cmd, int argc, char *argv[])
unlink (filename);
if (r != 0) {
perror (buf);
unlink (filename);
if (r != 0) {
perror (buf);
+ free (remote);
return -1;
}
return -1;
}
+ free (remote);
return 0;
}
return 0;
}