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

diff --git a/daemon/file.c b/daemon/file.c
index 98c356d..2ba2aab 100644
--- a/daemon/file.c
+++ b/daemon/file.c
@@ -36,7 +36,7 @@ do_touch (char *path)
   int r;
 
   NEED_ROOT (-1);
-  ABS_PATH (path, -1);
+  ABS_PATH (path, return -1);
 
   CHROOT_IN;
   fd = open (path, O_WRONLY | O_CREAT | O_NOCTTY, 0666);
@@ -74,7 +74,7 @@ do_cat (char *path)
   char *buf, *buf2;
 
   NEED_ROOT (NULL);
-  ABS_PATH (path,NULL);
+  ABS_PATH (path, return NULL);
 
   CHROOT_IN;
   fd = open (path, O_RDONLY);
@@ -97,18 +97,18 @@ do_cat (char *path)
     if (size >= alloc) {
       alloc += 8192;
       if (alloc > max) {
-	reply_with_error ("cat: %s: file is too large for message buffer",
-			  path);
-	free (buf);
-	close (fd);
-	return NULL;
+        reply_with_error ("cat: %s: file is too large for message buffer",
+                          path);
+        free (buf);
+        close (fd);
+        return NULL;
       }
       buf2 = realloc (buf, alloc);
       if (buf2 == NULL) {
-	reply_with_perror ("realloc");
-	free (buf);
-	close (fd);
-	return NULL;
+        reply_with_perror ("realloc");
+        free (buf);
+        close (fd);
+        return NULL;
       }
       buf = buf2;
     }
@@ -148,7 +148,7 @@ do_read_lines (char *path)
   ssize_t n;
 
   NEED_ROOT (NULL);
-  ABS_PATH (path, NULL);
+  ABS_PATH (path, return NULL);
 
   CHROOT_IN;
   fp = fopen (path, "r");
@@ -195,7 +195,7 @@ do_rm (char *path)
   int r;
 
   NEED_ROOT (-1);
-  ABS_PATH (path, -1);
+  ABS_PATH (path, return -1);
 
   CHROOT_IN;
   r = unlink (path);
@@ -215,7 +215,7 @@ do_chmod (int mode, char *path)
   int r;
 
   NEED_ROOT (-1);
-  ABS_PATH (path, -1);
+  ABS_PATH (path, return -1);
 
   CHROOT_IN;
   r = chmod (path, mode);
@@ -235,7 +235,7 @@ do_chown (int owner, int group, char *path)
   int r;
 
   NEED_ROOT (-1);
-  ABS_PATH (path, -1);
+  ABS_PATH (path, return -1);
 
   CHROOT_IN;
   r = chown (path, owner, group);
@@ -255,7 +255,7 @@ do_exists (char *path)
   int r;
 
   NEED_ROOT (-1);
-  ABS_PATH (path, -1);
+  ABS_PATH (path, return -1);
 
   CHROOT_IN;
   r = access (path, F_OK);
@@ -271,7 +271,7 @@ do_is_file (char *path)
   struct stat buf;
 
   NEED_ROOT (-1);
-  ABS_PATH (path, -1);
+  ABS_PATH (path, return -1);
 
   CHROOT_IN;
   r = lstat (path, &buf);
@@ -295,7 +295,7 @@ do_write_file (char *path, char *content, int size)
   int fd;
 
   NEED_ROOT (-1);
-  ABS_PATH (path, -1);
+  ABS_PATH (path, return -1);
 
   if (size == 0)
     size = strlen (content);
@@ -323,27 +323,84 @@ 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, return 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);
+  REQUIRE_ROOT_OR_RESOLVE_DEVICE (path, return NULL);
 
   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;
   }
 
@@ -358,7 +415,7 @@ do_file (char *path)
     return NULL;
   }
 
-  r = command (&out, &err, "file", "-bsL", buf, NULL);
+  r = command (&out, &err, "file", "-zbsL", buf, NULL);
   if (freeit) free (buf);
 
   if (r == -1) {
@@ -382,33 +439,30 @@ char *
 do_zfile (char *method, char *path)
 {
   int len;
+  const char *zcat;
   char *cmd;
   FILE *fp;
   char line[256];
 
   NEED_ROOT (NULL);
-  ABS_PATH (path, NULL);
-
-  len = 2 * strlen (path) + 64;
-  cmd = malloc (len);
-  if (!cmd) {
-    reply_with_perror ("malloc");
-    return NULL;
-  }
+  ABS_PATH (path, return NULL);
 
   if (strcmp (method, "gzip") == 0 || strcmp (method, "compress") == 0)
-    strcpy (cmd, "zcat");
+    zcat = "zcat";
   else if (strcmp (method, "bzip2") == 0)
-    strcpy (cmd, "bzcat");
+    zcat = "bzcat";
   else {
-    free (cmd);
     reply_with_error ("zfile: unknown method");
     return NULL;
   }
 
-  strcat (cmd, " /sysroot");
-  shell_quote (cmd + strlen (cmd), len - strlen (cmd), path);
-  strcat (cmd, " | file -bsL -");
+  if (asprintf_nowarn (&cmd, "%s %R | file -bsL -", zcat, path) == -1) {
+    reply_with_perror ("asprintf");
+    return NULL;
+  }
+
+  if (verbose)
+    fprintf (stderr, "%s\n", cmd);
 
   fp = popen (cmd, "r");
   if (fp == NULL) {