X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fupload.c;h=a1a37aee85fd7d10141c4c18b89d32904ae790b1;hb=168fd4ad5d1e5da93e11388095d41aaa8f804ceb;hp=623ad3a171e0380258d9edcc016e15cf683cf2d1;hpb=5d4ae18e2b93073080fbbf8c98b11eec15dbc1e6;p=libguestfs.git

diff --git a/daemon/upload.c b/daemon/upload.c
index 623ad3a..a1a37ae 100644
--- a/daemon/upload.c
+++ b/daemon/upload.c
@@ -27,68 +27,83 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "../src/guestfs_protocol.h"
+#include "guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"
 
+struct write_cb_data {
+  int fd;                       /* file descriptor */
+  uint64_t written;             /* bytes written so far */
+};
+
 static int
-write_cb (void *fd_ptr, const void *buf, size_t len)
+write_cb (void *data_vp, const void *buf, size_t len)
 {
-  int fd = *(int *)fd_ptr;
-  return xwrite (fd, buf, len);
+  struct write_cb_data *data = data_vp;
+  int r;
+
+  r = xwrite (data->fd, buf, len);
+  if (r == -1)
+    return -1;
+
+  data->written += len;
+
+  if (progress_hint > 0)
+    notify_progress (data->written, progress_hint);
+
+  return 0;
 }
 
 /* Has one FileIn parameter. */
 static int
 upload (const char *filename, int flags, int64_t offset)
 {
-  int err, fd, r, is_dev;
+  struct write_cb_data data = { .written = 0 };
+  int err, r, is_dev;
 
   is_dev = STRPREFIX (filename, "/dev/");
 
   if (!is_dev) CHROOT_IN;
-  fd = open (filename, flags, 0666);
+  data.fd = open (filename, flags, 0666);
   if (!is_dev) CHROOT_OUT;
-  if (fd == -1) {
+  if (data.fd == -1) {
     err = errno;
     r = cancel_receive ();
     errno = err;
-    if (r != -2) reply_with_perror ("%s", filename);
+    reply_with_perror ("%s", filename);
     return -1;
   }
 
   if (offset) {
-    if (lseek (fd, offset, SEEK_SET) == -1) {
+    if (lseek (data.fd, offset, SEEK_SET) == -1) {
       err = errno;
       r = cancel_receive ();
       errno = err;
-      if (r != -2) reply_with_perror ("lseek: %s", filename);
+      reply_with_perror ("lseek: %s", filename);
       return -1;
     }
   }
 
-  r = receive_file (write_cb, &fd);
+  r = receive_file (write_cb, &data.fd);
   if (r == -1) {		/* write error */
     err = errno;
     r = cancel_receive ();
     errno = err;
-    if (r != -2) reply_with_error ("write error: %s", filename);
-    close (fd);
+    reply_with_error ("write error: %s", filename);
+    close (data.fd);
     return -1;
   }
   if (r == -2) {		/* cancellation from library */
-    close (fd);
-    /* Do NOT send any error. */
+    /* This error is ignored by the library since it initiated the
+     * cancel.  Nevertheless we must send an error reply here.
+     */
+    reply_with_error ("file upload cancelled");
+    close (data.fd);
     return -1;
   }
 
-  if (close (fd) == -1) {
-    err = errno;
-    if (r == -1)                /* if r == 0, file transfer ended already */
-      r = cancel_receive ();
-    errno = err;
-    if (r != -2)
-      reply_with_perror ("close: %s", filename);
+  if (close (data.fd) == -1) {
+    reply_with_perror ("close: %s", filename);
     return -1;
   }