X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Ffile.c;h=7c46722c991d5d3558cfe7b0d61e94f99a939a5c;hp=98c356dff7dd9a135bd6e6a8488b5f44c2928a4a;hb=26f69f706e8c661c6ae7946da1b9a4b7bf9150b9;hpb=7d41d75c1d4e6dbe61f6cd353bc104663340483f

diff --git a/daemon/file.c b/daemon/file.c
index 98c356d..7c46722 100644
--- a/daemon/file.c
+++ b/daemon/file.c
@@ -323,13 +323,73 @@ do_write_file (char *path, char *content, int size)
   return 0;
 }
 
+char *
+do_read_file (char *path, size_t *size_r)
+{
+  int fd;
+  struct stat statbuf;
+  char *r;
+
+  NEED_ROOT (NULL);
+  ABS_PATH (path, NULL);
+
+  CHROOT_IN;
+  fd = open (path, O_RDONLY);
+  CHROOT_OUT;
+
+  if (fd == -1) {
+    reply_with_perror ("open: %s", path);
+    return NULL;
+  }
+
+  if (fstat (fd, &statbuf) == -1) {
+    reply_with_perror ("fstat: %s", path);
+    close (fd);
+    return NULL;
+  }
+
+  *size_r = statbuf.st_size;
+  /* The actual limit on messages is smaller than this.  This
+   * check just limits the amount of memory we'll try and allocate
+   * here.  If the message is larger than the real limit, that will
+   * be caught later when we try to serialize the message.
+   */
+  if (*size_r >= GUESTFS_MESSAGE_MAX) {
+    reply_with_error ("read_file: %s: file is too large for the protocol, use guestfs_download instead", path);
+    close (fd);
+    return NULL;
+  }
+  r = malloc (*size_r);
+  if (r == NULL) {
+    reply_with_perror ("malloc");
+    close (fd);
+    return NULL;
+  }
+
+  if (xread (fd, r, *size_r) == -1) {
+    reply_with_perror ("read: %s", path);
+    close (fd);
+    free (r);
+    return NULL;
+  }
+
+  if (close (fd) == -1) {
+    reply_with_perror ("close: %s", path);
+    free (r);
+    return NULL;
+  }
+
+  return r;
+}
+
 /* This runs the 'file' command. */
 char *
 do_file (char *path)
 {
   char *out, *err;
-  int r, len, freeit = 0;
+  int r, freeit = 0;
   char *buf;
+  int len;
 
   NEED_ROOT_OR_IS_DEVICE (path, NULL);
   ABS_PATH (path, NULL);
@@ -337,13 +397,11 @@ do_file (char *path)
   if (strncmp (path, "/dev/", 5) == 0)
     buf = (char *) path;
   else {
-    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);
     freeit = 1;
   }
 
@@ -389,7 +447,7 @@ do_zfile (char *method, char *path)
   NEED_ROOT (NULL);
   ABS_PATH (path, NULL);
 
-  len = 2 * strlen (path) + 64;
+  len = 2 * strlen (path) + sysroot_len + 64;
   cmd = malloc (len);
   if (!cmd) {
     reply_with_perror ("malloc");
@@ -406,7 +464,8 @@ do_zfile (char *method, char *path)
     return NULL;
   }
 
-  strcat (cmd, " /sysroot");
+  strcat (cmd, " ");
+  strcat (cmd, sysroot);
   shell_quote (cmd + strlen (cmd), len - strlen (cmd), path);
   strcat (cmd, " | file -bsL -");