Generate ADC PID more reliably.

[doldaconnect.git] / daemon / transfer.c

diff --git a/daemon/transfer.c b/daemon/transfer.c
index e2fe54e..328fb33 100644 (file)
--- a/daemon/transfer.c
+++ b/daemon/transfer.c
@@ -305,7 +305,7 @@ void *transfergetdata(struct transfer *transfer, size_t *size)
     return(buf);
 }
 
-void transferprepul(struct transfer *transfer, size_t size, size_t start, size_t end, struct socket *lesk)
+void transferprepul(struct transfer *transfer, off_t size, off_t start, off_t end, struct socket *lesk)
 {
     transfersetsize(transfer, size);
     transfer->curpos = start;
@@ -461,7 +461,7 @@ void transfersetnick(struct transfer *transfer, wchar_t *newnick)
     CBCHAINDOCB(transfer, trans_ac, transfer, L"nick");
 }
 
-void transfersetsize(struct transfer *transfer, int newsize)
+void transfersetsize(struct transfer *transfer, off_t newsize)
 {
     transfer->size = newsize;
     CBCHAINDOCB(transfer, trans_ac, transfer, L"size");
@@ -616,9 +616,7 @@ int forkfilter(struct transfer *transfer)
     struct wcspair *ta;
     char *rec, *val;
 
-    wfilename = transfer->path;
-    if(transfer->fnet->filebasename != NULL)
-       wfilename = transfer->fnet->filebasename(wfilename);
+    wfilename = fnfilebasename(transfer->path);
     if(transfer->auth == NULL)
     {
        flog(LOG_WARNING, "tried to fork filter for transfer with NULL authhandle (tranfer %i)", transfer->id);
@@ -670,7 +668,7 @@ int forkfilter(struct transfer *transfer)
     {
        argv = NULL;
        argvsize = argvdata = 0;
-       buf = sprintf2("%zi", transfer->size);
+       buf = sprintf2("%ji", (intmax_t)transfer->size);
        addtobuf(argv, filtername);
        addtobuf(argv, filename);
        addtobuf(argv, buf);