X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fheadtail.c;h=9175cf057b7e1687a7c7d2d3bba6609fd3e9e1fa;hp=b522c55f15d58ddc033b4b1f7f67eef6625d01c2;hb=73c587ff0f2f8f76af39b16dafb0949be7bf0883;hpb=3854bbdecd1c089959fb812a739b84a96c05fbbf

diff --git a/daemon/headtail.c b/daemon/headtail.c
index b522c55..9175cf0 100644
--- a/daemon/headtail.c
+++ b/daemon/headtail.c
@@ -1,5 +1,5 @@
 /* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc. 
+ * Copyright (C) 2009 Red Hat Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,24 +28,19 @@
 #include "actions.h"
 
 static char **
-headtail (const char *prog, const char *flag, const char *n, char *path)
+headtail (const char *prog, const char *flag, const char *n, const char *path)
 {
   char *buf;
   char *out, *err;
-  int r, len;
+  int r;
   char **lines;
 
-  NEED_ROOT (NULL);
-  ABS_PATH (path, NULL);
-
   /* Make the path relative to /sysroot. */
-  len = strlen (path) + 9;
-  buf = malloc (len);
+  buf = sysroot_path (path);
   if (!buf) {
     reply_with_perror ("malloc");
     return NULL;
   }
-  snprintf (buf, len, "/sysroot%s", path);
 
   r = command (&out, &err, prog, flag, n, buf, NULL);
   free (buf);
@@ -72,19 +67,19 @@ headtail (const char *prog, const char *flag, const char *n, char *path)
 }
 
 char **
-do_head (char *path)
+do_head (const char *path)
 {
   return headtail ("head", "-n", "10", path);
 }
 
 char **
-do_tail (char *path)
+do_tail (const char *path)
 {
   return headtail ("tail", "-n", "10", path);
 }
 
 char **
-do_head_n (int n, char *path)
+do_head_n (int n, const char *path)
 {
   char nbuf[16];
 
@@ -94,7 +89,7 @@ do_head_n (int n, char *path)
 }
 
 char **
-do_tail_n (int n, char *path)
+do_tail_n (int n, const char *path)
 {
   char nbuf[16];