git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix 'unknown filesystem' warnings in old inspection code (RHBZ#678231 RHBZ#666578).
[libguestfs.git]
/
daemon
/
wc.c
diff --git
a/daemon/wc.c
b/daemon/wc.c
index
b64940b
..
397d90c
100644
(file)
--- a/
daemon/wc.c
+++ b/
daemon/wc.c
@@
-22,27
+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 "guestfs_protocol.h"
#include "daemon.h"
#include "actions.h"
static int
wc (const char *flag, const char *path)
{
#include "daemon.h"
#include "actions.h"
static int
wc (const char *flag, const char *path)
{
- char *buf;
char *out, *err;
char *out, *err;
- int r;
+ int
fd, flags,
r;
- /* Make the path relative to /sysroot. */
- buf = sysroot_path (path);
- if (!buf) {
- reply_with_perror ("malloc");
+ CHROOT_IN;
+ fd = open (path, O_RDONLY);
+ CHROOT_OUT;
+
+ 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);
@@
-60,7
+62,7
@@
wc (const char *flag, const 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;
}