comparison libpurple/ft.c @ 29497:1326fd4dfdc9

ft: Don't try to read from the source file if the byte array already holds enough data for the current write. I'm not sure if this check should be added to the UI read side too.

29496:a0adf0bb19b7

			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. */

				return;
			}

			result = tmp;
		} else {
			buffer = g_malloc0(s);
			result = fread(buffer, 1, s, xfer->dest_fp);
			if (result != s) {
				purple_debug_error("filetransfer", "Unable to read whole buffer.\n");
				purple_xfer_cancel_local(xfer);
				g_free(buffer);
				return;
			}
		}
	
		if (priv->buffer) {
			priv->buffer = g_byte_array_append(priv->buffer, buffer, result);

29497:1326fd4dfdc9

			purple_xfer_cancel_remote(xfer);
			g_free(buffer);
			return;
		}
	} else if (xfer->type == PURPLE_XFER_SEND) {
		size_t result = 0;
		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. */

				return;
			}

			result = tmp;
		} else {
			gboolean read = TRUE;
			if (priv->buffer) {
				if (priv->buffer->len < s) {
					s -= priv->buffer->len;
					read = TRUE;
				} else {
					read = FALSE;
				}
			}
			if (read) {
				buffer = g_malloc(s);
				result = fread(buffer, 1, s, xfer->dest_fp);
				if (result != s) {
					purple_debug_error("filetransfer", "Unable to read whole buffer.\n");
					purple_xfer_cancel_local(xfer);
					g_free(buffer);
					return;
				}
			}
		}
	
		if (priv->buffer) {
			priv->buffer = g_byte_array_append(priv->buffer, buffer, result);