git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
generator: Add TestOutputDevice.
[libguestfs.git]
/
daemon
/
wc.c
diff --git
a/daemon/wc.c
b/daemon/wc.c
index
9720443
..
43e28e0
100644
(file)
--- a/
daemon/wc.c
+++ b/
daemon/wc.c
@@
-22,30
+22,29
@@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include <fcntl.h>
#include "../src/guestfs_protocol.h"
#include "daemon.h"
#include "actions.h"
static int
#include "../src/guestfs_protocol.h"
#include "daemon.h"
#include "actions.h"
static int
-wc (c
har *flag,
char *path)
+wc (c
onst char *flag, const
char *path)
{
{
- char *buf;
char *out, *err;
char *out, *err;
- int r;
+ int
fd, flags,
r;
- NEED_ROOT (return -1);
- ABS_PATH (path, return -1);
+ CHROOT_IN;
+ fd = open (path, O_RDONLY);
+ CHROOT_OUT;
- /* Make the path relative to /sysroot. */
- buf = sysroot_path (path);
- if (!buf) {
- reply_with_perror ("malloc");
+ if (fd == -1) {
+ reply_with_perror ("wc %s: %s", flag, path);
return -1;
}
return -1;
}
-
r = command (&out, &err, "wc", flag, buf, NULL)
;
-
free (buf
);
+
flags = COMMAND_FLAG_CHROOT_COPY_FILE_TO_STDIN | fd
;
+
r = commandf (&out, &err, flags, "wc", flag, NULL
);
if (r == -1) {
reply_with_error ("wc %s: %s", flag, err);
free (out);
if (r == -1) {
reply_with_error ("wc %s: %s", flag, err);
free (out);
@@
-63,7
+62,7
@@
wc (char *flag, char *path)
/* Parse the number. */
if (sscanf (out, "%d", &r) != 1) {
/* Parse the number. */
if (sscanf (out, "%d", &r) != 1) {
- reply_with_error ("
wc:
cannot parse number: %s", out);
+ reply_with_error ("cannot parse number: %s", out);
free (out);
return -1;
}
free (out);
return -1;
}
@@
-73,19
+72,19
@@
wc (char *flag, char *path)
}
int
}
int
-do_wc_l (char *path)
+do_wc_l (c
onst c
har *path)
{
return wc ("-l", path);
}
int
{
return wc ("-l", path);
}
int
-do_wc_w (char *path)
+do_wc_w (c
onst c
har *path)
{
return wc ("-w", path);
}
int
{
return wc ("-w", path);
}
int
-do_wc_c (char *path)
+do_wc_c (c
onst c
har *path)
{
return wc ("-c", path);
}
{
return wc ("-c", path);
}