git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
capitests: Test guestfs_add_drive_opts with optional args from C.
[libguestfs.git]
/
daemon
/
grep.c
diff --git
a/daemon/grep.c
b/daemon/grep.c
index
d1f5a3f
..
09683ef
100644
(file)
--- a/
daemon/grep.c
+++ b/
daemon/grep.c
@@
-22,31
+22,33
@@
#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 char **
grep (const char *prog, const char *flag, const char *regex, const char *path)
{
#include "daemon.h"
#include "actions.h"
static char **
grep (const char *prog, const char *flag, const char *regex, const char *path)
{
- char *buf;
char *out, *err;
char *out, *err;
- int r;
+ int
fd, flags,
r;
char **lines;
char **lines;
- /* 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 ("%s", path);
return NULL;
}
/* Note that grep returns an error if no match. We want to
* suppress this error and return an empty list.
*/
return NULL;
}
/* Note that grep returns an error if no match. We want to
* suppress this error and return an empty list.
*/
-
r = commandr (&out, &err, prog, flag, regex, buf, NULL)
;
-
free (buf
);
+
flags = COMMAND_FLAG_CHROOT_COPY_FILE_TO_STDIN | fd
;
+
r = commandrf (&out, &err, flags, prog, flag, regex, NULL
);
if (r == -1 || r > 1) {
reply_with_error ("%s %s %s: %s", prog, flag, regex, err);
free (out);
if (r == -1 || r > 1) {
reply_with_error ("%s %s %s: %s", prog, flag, regex, err);
free (out);