Merge branch 'master' of pc18:/srv/git/r/doldaconnect

diff --git a/configure.in b/configure.in
index b8d1d88..e0fd6ee 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 AC_INIT(daemon/main.c)
-AM_INIT_AUTOMAKE([doldaconnect], [1.1])
+AM_INIT_AUTOMAKE([doldaconnect], [1.2])
 AM_CONFIG_HEADER(config.h)
 
 DOLDA_AC_GROUP([Checking build chain])

diff --git a/daemon/fnet-dc.c b/daemon/fnet-dc.c
index d934025..c4d81c6 100644 (file)
--- a/daemon/fnet-dc.c
+++ b/daemon/fnet-dc.c
@@ -641,7 +641,7 @@ static int trresumecb(struct transfer *transfer, wchar_t *cmd, wchar_t *arg, str
            flog(LOG_WARNING, "filter returned no position for \"resume\" on transfer %i", transfer->id);
            freedcpeer(peer);
        } else {
-           transfer->curpos = wcstol(arg, NULL, 10);
+           transfer->curpos = wcstoll(arg, NULL, 10);
            peer->hascurpos = 1;
            requestfile(peer);
        }