Mercurial > gftp.yaz
changeset 319:2ad0b9a00fdd
2003-11-23 Brian Masney <masneyb@gftp.org>
* src/gtk/transfer.c - when transfering a file, if the file being
transfered is greater in the destination than in the source, overwrite
it
* lib/rfc959.c (rfc959_ipv6_data_connection_new) - when parsing the
output, parse the integers as unsigned.
| author | masneyb |
|---|---|
| date | Sun, 23 Nov 2003 15:52:22 +0000 |
| parents | 97eabcff39a3 |
| children | 853981bbd4d7 |
| files | ChangeLog lib/rfc959.c src/gtk/transfer.c |
| diffstat | 3 files changed, 29 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Nov 12 00:39:32 2003 +0000 +++ b/ChangeLog Sun Nov 23 15:52:22 2003 +0000 @@ -1,3 +1,11 @@ +2003-11-23 Brian Masney <masneyb@gftp.org> + * src/gtk/transfer.c - when transfering a file, if the file being + transfered is greater in the destination than in the source, overwrite + it + + * lib/rfc959.c (rfc959_ipv6_data_connection_new) - when parsing the + output, parse the integers as unsigned. + 2003-11-9 Brian Masney <masneyb@gftp.org> * lib/options.h lib/protoocols.c - added enable_ipv6 option. @@ -8,6 +16,9 @@ * debian/* - updated Debian package files from Aurelien Jarno <aurel32@debian.org> +2003-11-9 Brian Masney <masneyb@gftp.org> + * Officially released 2.0.16 + * debian/ChangeLog - incremented version to 2.0.16 * docs/Makefile.am - clean up documentation in clean target @@ -1751,7 +1762,7 @@ * cvsclean - added this script - * *.[ch] - added $Id: ChangeLog,v 1.173 2003/11/10 01:59:50 masneyb Exp $ tags + * *.[ch] - added $Id: ChangeLog,v 1.174 2003/11/23 15:52:19 masneyb Exp $ tags * debian/* - updated files from Debian maintainer
--- a/lib/rfc959.c Wed Nov 12 00:39:32 2003 +0000 +++ b/lib/rfc959.c Sun Nov 23 15:52:22 2003 +0000 @@ -822,7 +822,7 @@ return (GFTP_EFATAL); } - if (sscanf (pos, "|||%d|", &port) != 1) + if (sscanf (pos, "|||%u|", &port) != 1) { request->logging_function (gftp_logging_error, request, _("Invalid EPSV response '%s'\n"),
--- a/src/gtk/transfer.c Wed Nov 12 00:39:32 2003 +0000 +++ b/src/gtk/transfer.c Sun Nov 23 15:52:22 2003 +0000 @@ -1993,19 +1993,24 @@ add_data[0] = pos; if (overwrite_default) - add_data[3] = _("Overwrite"); + { + add_data[3] = _("Overwrite"); + tempfle->transfer_action = GFTP_TRANS_ACTION_OVERWRITE; + } + else if (tempfle->startsize == tempfle->size) + { + add_data[3] = _("Skip"); + tempfle->transfer_action = GFTP_TRANS_ACTION_SKIP; + } + else if (tempfle->startsize > tempfle->size) + { + add_data[3] = _("Overwrite"); + tempfle->transfer_action = GFTP_TRANS_ACTION_OVERWRITE; + } else { - if (tempfle->startsize >= tempfle->size) - { - add_data[3] = _("Skip"); - tempfle->transfer_action = GFTP_TRANS_ACTION_SKIP; - } - else - { - add_data[3] = _("Resume"); - tempfle->transfer_action = GFTP_TRANS_ACTION_RESUME; - } + add_data[3] = _("Resume"); + tempfle->transfer_action = GFTP_TRANS_ACTION_RESUME; } add_data[1] = insert_commas (tempfle->size, tempstr, sizeof (tempstr));