X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Finitrd.c;h=3c960b2f641ab31d503554546df3378d5c4300a0;hp=c1c7ce03aa744662361a3141e4f50031942844ec;hb=4d900cdac8258daa2e99c6ceb2a4985154e94150;hpb=6bda071b5cd8393b37653687027c4ae6c6cf3804

diff --git a/daemon/initrd.c b/daemon/initrd.c
index c1c7ce0..3c960b2 100644
--- a/daemon/initrd.c
+++ b/daemon/initrd.c
@@ -21,14 +21,17 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <limits.h>
 #include <unistd.h>
+#include <fcntl.h>
+#include <sys/stat.h>
 
-#include "../src/guestfs_protocol.h"
+#include "guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"
 
 char **
-do_initrd_list (char *path)
+do_initrd_list (const char *path)
 {
   FILE *fp;
   char *cmd;
@@ -37,9 +40,6 @@ do_initrd_list (char *path)
   int size = 0, alloc = 0;
   size_t len;
 
-  NEED_ROOT (return NULL);
-  ABS_PATH (path, return NULL);
-
   /* "zcat /sysroot/<path> | cpio --quiet -it", but path must be quoted. */
   if (asprintf_nowarn (&cmd, "zcat %R | cpio --quiet -it", path) == -1) {
     reply_with_perror ("asprintf");
@@ -81,3 +81,126 @@ do_initrd_list (char *path)
 
   return filenames;
 }
+
+char *
+do_initrd_cat (const char *path, const char *filename, size_t *size_r)
+{
+  char tmpdir[] = "/tmp/initrd-cat-XXXXXX";
+  if (mkdtemp (tmpdir) == NULL) {
+    reply_with_perror ("mkdtemp");
+    return NULL;
+  }
+
+  /* "zcat /sysroot/<path> | cpio --quiet -id file", but paths must be quoted */
+  char *cmd;
+  if (asprintf_nowarn (&cmd, "cd %Q && zcat %R | cpio --quiet -id %Q",
+                       tmpdir, path, filename) == -1) {
+    reply_with_perror ("asprintf");
+    rmdir (tmpdir);
+    return NULL;
+  }
+
+  /* Extract file into temporary directory.  This may create subdirs.
+   * It's also possible that this doesn't create anything at all
+   * (eg. if the named file does not exist in the cpio archive) --
+   * cpio is silent in this case.
+   */
+  int r = system (cmd);
+  if (r == -1) {
+    reply_with_perror ("command failed: %s", cmd);
+    rmdir (tmpdir);
+    return NULL;
+  }
+  if (WEXITSTATUS (r) != 0) {
+    reply_with_perror ("command failed with return code %d",
+                       WEXITSTATUS (r));
+    rmdir (tmpdir);
+    return NULL;
+  }
+
+  /* See if we got a file. */
+  char fullpath[PATH_MAX];
+  snprintf (fullpath, sizeof fullpath, "%s/%s", tmpdir, filename);
+
+  struct stat statbuf;
+  int fd;
+
+  fd = open (fullpath, O_RDONLY);
+  if (fd == -1) {
+    reply_with_perror ("open: %s:%s", path, filename);
+    rmdir (tmpdir);
+    return NULL;
+  }
+
+  /* From this point, we know the file exists, so we require full
+   * cleanup.
+   */
+  char *ret = NULL;
+
+  if (fstat (fd, &statbuf) == -1) {
+    reply_with_perror ("fstat: %s:%s", path, filename);
+    goto cleanup;
+  }
+
+  /* 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 (statbuf.st_size >= GUESTFS_MESSAGE_MAX) {
+    reply_with_error ("%s:%s: file is too large for the protocol",
+                      path, filename);
+    goto cleanup;
+  }
+
+  ret = malloc (statbuf.st_size);
+  if (ret == NULL) {
+    reply_with_perror ("malloc");
+    goto cleanup;
+  }
+
+  if (xread (fd, ret, statbuf.st_size) == -1) {
+    reply_with_perror ("read: %s:%s", path, filename);
+    free (ret);
+    ret = NULL;
+    goto cleanup;
+  }
+
+  if (close (fd) == -1) {
+    reply_with_perror ("close: %s:%s", path, filename);
+    free (ret);
+    ret = NULL;
+    goto cleanup;
+  }
+  fd = -1;
+
+  /* Mustn't touch *size_r until we are sure that we won't return any
+   * error (RHBZ#589039).
+   */
+  *size_r = statbuf.st_size;
+
+ cleanup:
+  if (fd >= 0)
+    close (fd);
+
+  /* Remove the file. */
+  if (unlink (fullpath) == -1) {
+    fprintf (stderr, "unlink: ");
+    perror (fullpath);
+    /* non-fatal */
+  }
+
+  /* Remove the directories up to and including the temp directory. */
+  do {
+    char *p = strrchr (fullpath, '/');
+    if (!p) break;
+    *p = '\0';
+    if (rmdir (fullpath) == -1) {
+      fprintf (stderr, "rmdir: ");
+      perror (fullpath);
+      /* non-fatal */
+    }
+  } while (STRNEQ (fullpath, tmpdir));
+
+  return ret;
+}