diff options
| author | Richard Jones <rjones@redhat.com> | 2010-05-07 00:13:31 +0100 |
|---|---|---|
| committer | Richard Jones <rjones@redhat.com> | 2010-05-07 15:27:28 +0100 |
| commit | a84f1360499309e2d2ecb661adc6917539b5eef4 (patch) | |
| tree | 1a891960d8e4f2fb2659b10da43b75feeaef6fde | |
| parent | 26991ebb8181b57f4c8454f2862c938d7c5d012d (diff) | |
| download | libguestfs-a84f1360499309e2d2ecb661adc6917539b5eef4.tar.gz libguestfs-a84f1360499309e2d2ecb661adc6917539b5eef4.tar.xz libguestfs-a84f1360499309e2d2ecb661adc6917539b5eef4.zip | |
daemon: Fix wc* commands to work on absolute symbolic links (RHBZ#579608).
| -rw-r--r-- | daemon/wc.c | 18 | ||||
| -rwxr-xr-x | src/generator.ml | 5 |
2 files changed, 14 insertions, 9 deletions
diff --git a/daemon/wc.c b/daemon/wc.c index fe27bf19..43e28e0f 100644 --- a/daemon/wc.c +++ b/daemon/wc.c @@ -22,6 +22,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <fcntl.h> #include "../src/guestfs_protocol.h" #include "daemon.h" @@ -30,19 +31,20 @@ static int wc (const char *flag, const char *path) { - char *buf; 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; } - 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); diff --git a/src/generator.ml b/src/generator.ml index a5a7ddcd..1e6d3c0d 100755 --- a/src/generator.ml +++ b/src/generator.ml @@ -2838,7 +2838,10 @@ See also: L<mkdtemp(3)>"); ("wc_l", (RInt "lines", [Pathname "path"]), 118, [], [InitISOFS, Always, TestOutputInt ( - [["wc_l"; "/10klines"]], 10000)], + [["wc_l"; "/10klines"]], 10000); + (* Test for RHBZ#579608, absolute symbolic links. *) + InitISOFS, Always, TestOutputInt ( + [["wc_l"; "/abssymlink"]], 10000)], "count lines in a file", "\ This command counts the lines in a file, using the |