diff options
| -rw-r--r-- | fish/guestfish.pod | 3 | ||||
| -rw-r--r-- | fish/more.c | 12 |
2 files changed, 2 insertions, 13 deletions
diff --git a/fish/guestfish.pod b/fish/guestfish.pod index 19332909..aeb4c8da 100644 --- a/fish/guestfish.pod +++ b/fish/guestfish.pod @@ -841,9 +841,6 @@ This is used to view a file. The default viewer is C<$PAGER>. However if you use the alternate command C<less> you will get the C<less> command specifically. -NOTE: This will not work reliably for large files -(> 2 MB) or binary files containing \0 bytes. - =head2 quit | exit This exits guestfish. You can also use C<^D> key. diff --git a/fish/more.c b/fish/more.c index a32d5b41..55faefa8 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); |