X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=fish%2Fmore.c;h=55faefa845f813d8cae58f51bbd8bd24712ce1bb;hp=a32d5b41b8b8063b7f7470d77f65bf85f24b9b40;hb=878c8c77d8b46b1c4dd5189f67f0262d44eed70c;hpb=9353c6253d5fac1648b13ad9958468a2d9f6ad6f diff --git a/fish/more.c b/fish/more.c index a32d5b4..55faefa 100644 --- 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 *content; int r, fd; if (argc != 1) { @@ -57,21 +56,14 @@ do_more (const char *cmd, int argc, char *argv[]) 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); - free (content); return -1; } - free (content); - if (close (fd) == -1) { perror (filename); unlink (filename);