git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cat: Fix documentation of -x option in usage.
[libguestfs.git]
/
fish
/
more.c
diff --git
a/fish/more.c
b/fish/more.c
index
8bc9d95
..
2065abb
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 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
@@
-28,12
+28,11
@@
#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];
const char *pager;
char buf[256];
const char *pager;
- char *content;
int r, fd;
if (argc != 1) {
int r, fd;
if (argc != 1) {
@@
-42,7
+41,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");
@@
-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);