/* 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
#include <stdio.h>
#include <stdlib.h>
+#include <stdint.h>
#include <string.h>
#include <fcntl.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
#include "../src/guestfs_protocol.h"
#include "daemon.h"
#include "actions.h"
static int
-write_cb (void *fd_ptr, const void *buf, int len)
+write_cb (void *fd_ptr, const void *buf, size_t len)
{
int fd = *(int *)fd_ptr;
return xwrite (fd, buf, len);
{
int err, fd, r, is_dev;
- is_dev = strncmp (filename, "/dev/", 5) == 0;
- if (!is_dev) {
- if (!root_mounted || filename[0] != '/') {
- cancel_receive ();
- reply_with_error ("upload: root must be mounted and path must be absolute");
- return -1;
- }
- }
+ is_dev = STRPREFIX (filename, "/dev/");
if (!is_dev) CHROOT_IN;
fd = open (filename, O_WRONLY|O_CREAT|O_TRUNC|O_NOCTTY, 0666);
if (!is_dev) CHROOT_OUT;
if (fd == -1) {
err = errno;
- cancel_receive ();
+ r = cancel_receive ();
errno = err;
- reply_with_perror ("%s", filename);
+ if (r != -2) reply_with_perror ("%s", filename);
return -1;
}
r = receive_file (write_cb, &fd);
if (r == -1) { /* write error */
err = errno;
- cancel_receive ();
+ r = cancel_receive ();
errno = err;
- reply_with_perror ("write: %s", filename);
+ if (r != -2) reply_with_error ("write error: %s", filename);
close (fd);
return -1;
}
if (close (fd) == -1) {
err = errno;
- cancel_receive ();
+ if (r == -1) /* if r == 0, file transfer ended already */
+ r = cancel_receive ();
errno = err;
- reply_with_perror ("close: %s", filename);
+ if (r != -2)
+ reply_with_perror ("close: %s", filename);
return -1;
}
int fd, r, is_dev;
char buf[GUESTFS_MAX_CHUNK_SIZE];
- NEED_ROOT_OR_IS_DEVICE (filename, -1);
-
- is_dev = strncmp (filename, "/dev/", 5) == 0;
+ is_dev = STRPREFIX (filename, "/dev/");
if (!is_dev) CHROOT_IN;
fd = open (filename, O_RDONLY);
return -1;
}
+ /* Calculate the size of the file or device for notification messages. */
+ uint64_t total, sent = 0;
+ if (!is_dev) {
+ struct stat statbuf;
+ if (fstat (fd, &statbuf) == -1) {
+ reply_with_perror ("%s", filename);
+ close (fd);
+ return -1;
+ }
+ total = statbuf.st_size;
+ } else {
+ int64_t size = do_blockdev_getsize64 (filename);
+ if (size == -1) {
+ /* do_blockdev_getsize64 has already sent a reply. */
+ close (fd);
+ return -1;
+ }
+ total = (uint64_t) size;
+ }
+
/* Now we must send the reply message, before the file contents. After
* this there is no opportunity in the protocol to send any error
* message back. Instead we can only cancel the transfer.
close (fd);
return -1;
}
+
+ sent += r;
+ notify_progress (sent, total);
}
if (r == -1) {
return -1;
}
- send_file_end (0); /* Normal end of file. */
+ if (send_file_end (0)) /* Normal end of file. */
+ return -1;
+
return 0;
}