summaryrefslogtreecommitdiff
path: root/tools/obexctl.c
diff options
context:
space:
mode:
authorERAMOTO Masaya <eramoto.masaya@jp.fujitsu.com>2018-02-09 18:12:38 +0900
committerLuiz Augusto von Dentz <luiz.von.dentz@intel.com>2018-02-12 13:36:11 +0200
commit5d2baeb644ae34a5fca7d88307f68b2b85c75e63 (patch)
tree2fb203317b5b87f26947fb143f6e876a955986cf /tools/obexctl.c
parent3c2d4613be1fa468afd550fc7335ff28abccf223 (diff)
downloadbluez-5d2baeb644ae34a5fca7d88307f68b2b85c75e63.tar.gz
tools/obexctl: Fix display of size on completion
Outputs zero as the transferred size on completion of transfer as below: [CHG] Transfer /org/bluez/obex/server/session3/transfer2 Transferred: 5339965 (@32KB/s 00:01) [CHG] Transfer /org/bluez/obex/server/session3/transfer2 Transferred: 5372726 (@32KB/s 00:00) [CHG] Transfer /org/bluez/obex/server/session3/transfer2 Transferred: 0 (@18446744073704178KB/s 00:00) [CHG] Transfer /org/bluez/obex/server/session3/transfer2 Status: complete
Diffstat (limited to 'tools/obexctl.c')
-rw-r--r--tools/obexctl.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/tools/obexctl.c b/tools/obexctl.c
index 4e46c7541..2ef1c044e 100644
--- a/tools/obexctl.c
+++ b/tools/obexctl.c
@@ -1862,6 +1862,14 @@ static void print_transferred(struct transfer_data *data, const char *str,
int seconds, minutes;
dbus_message_iter_get_basic(iter, &valu64);
+
+ /*
+ * Use the file size to output the proper size/speed since obexd resets
+ * the current transferred size to zero on completion of transfer.
+ */
+ if (valu64 == 0)
+ valu64 = data->size;
+
speed = valu64 - data->transferred;
data->transferred = valu64;