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 gusetfs_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);
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;
}
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");
return NULL;
}
- strcat (cmd, " /sysroot");
+ strcat (cmd, " ");
+ strcat (cmd, sysroot);
shell_quote (cmd + strlen (cmd), len - strlen (cmd), path);
strcat (cmd, " | file -bsL -");