X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fheadtail.c;h=83f3f5c0212aa91f616e0e911a7b8e72a11c6655;hb=2d5841133a199619d56d026ad9ea4e97791f4a8f;hp=9175cf057b7e1687a7c7d2d3bba6609fd3e9e1fa;hpb=84fc760439e82e6b3616abd0d1f9bd7d7eb01ec0;p=libguestfs.git

diff --git a/daemon/headtail.c b/daemon/headtail.c
index 9175cf0..83f3f5c 100644
--- a/daemon/headtail.c
+++ b/daemon/headtail.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include <config.h>
@@ -22,28 +22,30 @@
 #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 **
 headtail (const char *prog, const char *flag, const char *n, const char *path)
 {
-  char *buf;
   char *out, *err;
-  int r;
+  int fd, flags, r;
   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;
   }
 
-  r = command (&out, &err, prog, flag, n, buf, NULL);
-  free (buf);
+  flags = COMMAND_FLAG_CHROOT_COPY_FILE_TO_STDIN | fd;
+  r = commandf (&out, &err, flags, prog, flag, n, NULL);
   if (r == -1) {
     reply_with_error ("%s %s %s: %s", prog, flag, n, err);
     free (out);