X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Ftransfer.c;h=c432815174b7460a680e34f6d1bfe8e1bdb90452;hb=dcf7a1a214150f84d51159c9c679b7697cb05298;hp=99843ae9dcc4e579a0d3b53b0cc7a19a0e98a90f;hpb=81386042ef8b2fbe50d1e1756434463e8f6b96d7;p=doldaconnect.git

diff --git a/daemon/transfer.c b/daemon/transfer.c
index 99843ae..c432815 100644
--- a/daemon/transfer.c
+++ b/daemon/transfer.c
@@ -1,6 +1,6 @@
 /*
  *  Dolda Connect - Modular multiuser Direct Connect-style client
- *  Copyright (C) 2004 Fredrik Tolf (fredrik@dolda2000.com)
+ *  Copyright (C) 2004 Fredrik Tolf <fredrik@dolda2000.com>
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -292,8 +292,12 @@ void *transfergetdata(struct transfer *transfer, size_t *size)
 	return(NULL);
     if((transfer->endpos >= 0) && (transfer->curpos + *size >= transfer->endpos))
     {
-	*size = transfer->endpos - transfer->curpos;
-	buf = srealloc(buf, *size);
+	if((*size = transfer->endpos - transfer->curpos) == 0) {
+	    free(buf);
+	    buf = NULL;
+	} else {
+	    buf = srealloc(buf, *size);
+	}
     }
     transfer->curpos += *size;
     bytesupload += *size;
@@ -301,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;
@@ -457,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");
@@ -627,9 +631,9 @@ int forkfilter(struct transfer *transfer)
 	errno = EACCES;
 	return(-1);
     }
-    filtername = findfile(icswcstombs(confgetstr("transfer", "filter"), NULL, NULL), NULL, 0);
+    filtername = findfile("dc-filter", pwent->pw_dir, 0);
     if(filtername == NULL)
-	filtername = findfile("dc-filter", pwent->pw_dir, 0);
+	filtername = findfile(icswcstombs(confgetstr("transfer", "filter"), NULL, NULL), NULL, 0);
     if(filtername == NULL)
     {
 	flog(LOG_WARNING, "could not find filter for user %s", pwent->pw_name);
@@ -666,7 +670,7 @@ int forkfilter(struct transfer *transfer)
     {
 	argv = NULL;
 	argvsize = argvdata = 0;
-	buf = sprintf2("%i", transfer->size);
+	buf = sprintf2("%ji", (intmax_t)transfer->size);
 	addtobuf(argv, filtername);
 	addtobuf(argv, filename);
 	addtobuf(argv, buf);