git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
syntax: Remove unused assert.h header.
[libguestfs.git]
/
fish
/
more.c
diff --git
a/fish/more.c
b/fish/more.c
index
a32d5b4
..
55faefa
100644
(file)
--- a/
fish/more.c
+++ b/
fish/more.c
@@
-33,7
+33,6
@@
do_more (const char *cmd, int argc, char *argv[])
char filename[] = "/tmp/guestfishXXXXXX";
char buf[256];
const char *pager;
char filename[] = "/tmp/guestfishXXXXXX";
char buf[256];
const char *pager;
- char *content;
int r, fd;
if (argc != 1) {
int r, fd;
if (argc != 1) {
@@
-57,21
+56,14
@@
do_more (const char *cmd, int argc, char *argv[])
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, argv[0], buf
) == -1) {
close (fd);
unlink (filename);
close (fd);
unlink (filename);
- free (content);
return -1;
}
return -1;
}
- free (content);
-
if (close (fd) == -1) {
perror (filename);
unlink (filename);
if (close (fd) == -1) {
perror (filename);
unlink (filename);