pidgin.yaz: libpurple/ft.c comparison

comparison libpurple/ft.c @ 29712:d5fe33c3a765

propagate from branch 'im.pidgin.pidgin' (head 42a8485e73af5f2091d307b51c09dded94eceb24) to branch 'im.pidgin.pidgin.next.minor' (head 4edcf8da14be654127117da5af0cbdd7a0616439)

author	John Bailey <rekkanoryo@rekkanoryo.org>
date	Tue, 17 Nov 2009 07:33:47 +0000
parents	18667ce1f55d
children	1e19c439fa7a

comparison

equal deleted inserted replaced

-:546e870dc506
+:d5fe33c3a765
 	enum {
 		PURPLE_XFER_READY_NONE = 0x0,
 		PURPLE_XFER_READY_UI   = 0x1,
 		PURPLE_XFER_READY_PRPL = 0x2,
 	} ready;
+	GByteArray *buffer;
 } PurpleXferPrivData;
 static int purple_xfer_choose_file(PurpleXfer *xfer);
 static void
 purple_xfer_priv_data_destroy(gpointer data)
 {
 	PurpleXferPrivData *priv = data;
+	if (priv->buffer)
+		g_byte_array_free(priv->buffer, TRUE);
 	g_free(priv);
 }
 GList *
 purple_xfers_get_all()
 	xfer->ref = 1;
 	xfer->type    = type;
 	xfer->account = account;
 	xfer->who     = g_strdup(who);
-	xfer->ui_ops  = purple_xfers_get_ui_ops();
+	xfer->ui_ops  = ui_ops = purple_xfers_get_ui_ops();
 	xfer->message = NULL;
 	xfer->current_buffer_size = FT_INITIAL_BUFFER_SIZE;
 	xfer->fd = -1;
 	priv = g_new0(PurpleXferPrivData, 1);
 	priv->ready = PURPLE_XFER_READY_NONE;
+	if (ui_ops && ui_ops->data_not_sent) {
+		/* If the ui will handle unsent data no need for buffer */
+		priv->buffer = NULL;
+	} else {
+		priv->buffer = g_byte_array_sized_new(FT_INITIAL_BUFFER_SIZE);
+	}
 	g_hash_table_insert(xfers_data, xfer, priv);
 	ui_ops = purple_xfer_get_ui_ops(xfer);
 	if (ui_ops != NULL && ui_ops->new_xfer != NULL)
 static void
 purple_xfer_destroy(PurpleXfer *xfer)
 {
 	PurpleXferUiOps *ui_ops;
+	PurpleXferPrivData *priv;
-	g_return_if_fail(xfer != NULL);
+	g_return_if_fail(xfer != NULL);
+	priv = g_hash_table_lookup(xfers_data, xfer);
 	/* Close the file browser, if it's open */
 	purple_request_close_with_handle(xfer);
 	if (purple_xfer_get_status(xfer) == PURPLE_XFER_STATUS_STARTED)
 		r = (xfer->ops.write)(buffer, s, xfer);
 	} else {
 		r = write(xfer->fd, buffer, s);
 		if (r < 0 && errno == EAGAIN)
 			r = 0;
-		if ((purple_xfer_get_bytes_sent(xfer)+r) >= purple_xfer_get_size(xfer))
-			purple_xfer_set_completed(xfer, TRUE);
 	}
 	return r;
 }
 				purple_xfer_cancel_local(xfer);
 				g_free(buffer);
 				return;
 			}
-			if ((purple_xfer_get_size(xfer) > 0) &&
-				((purple_xfer_get_bytes_sent(xfer)+r) >= purple_xfer_get_size(xfer)))
-				purple_xfer_set_completed(xfer, TRUE);
 		} else if(r < 0) {
 			purple_xfer_cancel_remote(xfer);
 			g_free(buffer);
 			return;
 		}
 	} else if (xfer->type == PURPLE_XFER_SEND) {
 		size_t result;
 		size_t s = MIN(purple_xfer_get_bytes_remaining(xfer), xfer->current_buffer_size);
+		PurpleXferPrivData *priv = g_hash_table_lookup(xfers_data, xfer);
 		/* this is so the prpl can keep the connection open
 		   if it needs to for some odd reason. */
 		if (s == 0) {
 			if (xfer->watcher) {
 				purple_input_remove(xfer->watcher);
 				xfer->watcher = 0;
 			}
 			return;
 		}
+		if (priv->buffer) {
+			s = s - priv->buffer->len;
+		}
 		if (ui_ops && ui_ops->ui_read) {
 			gssize tmp = ui_ops->ui_read(xfer, &buffer, s);
 			if (tmp == 0) {
 				/*
 				 */
 				if (xfer->watcher != 0) {
 					purple_input_remove(xfer->watcher);
 					xfer->watcher = 0;
 				}
+				/*
-				return;
+				 * if we requested 0 bytes it's only normal that en up here
+				 * we shouldn't return as we still have something to
+				 * write in priv->buffer
+				 */
+				if (s != 0)
+					return;
 			} else if (tmp < 0) {
 				purple_debug_error("filetransfer", "Unable to read whole buffer.\n");
 				purple_xfer_cancel_local(xfer);
 				return;
 			}
 				purple_xfer_cancel_local(xfer);
 				g_free(buffer);
 				return;
 			}
 		}
-		/* Write as much as we're allowed to. */
+		if (priv->buffer) {
+			priv->buffer = g_byte_array_append(priv->buffer, buffer, result);
+			g_free(buffer);
+			buffer = priv->buffer->data;
+			result = priv->buffer->len;
+		}
 		r = purple_xfer_write(xfer, buffer, result);
 		if (r == -1) {
 			purple_xfer_cancel_remote(xfer);
 			g_free(buffer);
 			return;
-		} else if (r < result) {
+		} else if (r == result) {
-			if (ui_ops == NULL || (ui_ops->ui_read == NULL && ui_ops->ui_write == NULL)) {
-				/* We have to seek back in the file now. */
-				fseek(xfer->dest_fp, r - s, SEEK_CUR);
-			}
-			else {
-				ui_ops->data_not_sent(xfer, buffer + r, result - r);
-			}
-		} else {
 			/*
 			 * We managed to write the entire buffer.  This means our
 			 * network is fast and our buffer is too small, so make it
 			 * bigger.
 			 */
 			purple_xfer_increase_buffer_size(xfer);
+		} else {
+			if (ui_ops && ui_ops->data_not_sent)
+				ui_ops->data_not_sent(xfer, buffer + r, result -r);
+		}
+		if (priv->buffer) {
+			/*
+			 * Remove what we wrote
+			 * If we wrote the whole buffer the byte array will be empty
+			 * Otherwise we'll kee what wasn't sent for next time.
+			 */
+			buffer = NULL;
+			priv->buffer = g_byte_array_remove_range(priv->buffer, 0, r);
 		}
 	}
 	if (r > 0) {
 		if (purple_xfer_get_size(xfer) > 0)
 		if (ui_ops != NULL && ui_ops->update_progress != NULL)
 			ui_ops->update_progress(xfer,
 				purple_xfer_get_progress(xfer));
 	}
-	if (purple_xfer_is_completed(xfer))
+	if ((purple_xfer_get_size(xfer) > 0) &&
+	((purple_xfer_get_bytes_sent(xfer)) >= purple_xfer_get_size(xfer))) {
+		purple_xfer_set_completed(xfer, TRUE);
 		purple_xfer_end(xfer);
+	}
 }
 static void
 transfer_cb(gpointer data, gint source, PurpleInputCondition condition)
 {

Mercurial > pidgin.yaz

comparison libpurple/ft.c @ 29712:d5fe33c3a765