Generalize transargs into wcspairs.

[doldaconnect.git] / daemon / transfer.c

diff --git a/daemon/transfer.c b/daemon/transfer.c
index 61b3483..b2be0fe 100644 (file)
--- a/daemon/transfer.c
+++ b/daemon/transfer.c
@@ -46,8 +46,6 @@ GCBCHAIN(newtransfercb, struct transfer *);
 
 void freetransfer(struct transfer *transfer)
 {
-    struct transarg *ta;
-    
     if(transfer == transfers)
        transfers = transfer->next;
     if(transfer->next != NULL)
@@ -60,13 +58,8 @@ void freetransfer(struct transfer *transfer)
     CBCHAINFREE(transfer, trans_p);
     CBCHAINFREE(transfer, trans_destroy);
     CBCHAINFREE(transfer, trans_filterout);
-    while((ta = transfer->args) != NULL)
-    {
-       transfer->args = ta->next;
-       free(ta->rec);
-       free(ta->val);
-       free(ta);
-    }
+    while(transfer->args != NULL)
+       freewcspair(transfer->args, &transfer->args);
     if(transfer->filter != -1)
        killfilter(transfer);
     if(transfer->etimer != NULL)
@@ -128,17 +121,6 @@ struct transfer *newtransfer(void)
     return(new);
 }
 
-void transferaddarg(struct transfer *transfer, wchar_t *rec, wchar_t *val)
-{
-    struct transarg *ta;
-    
-    ta = smalloc(sizeof(*ta));
-    ta->rec = swcsdup(rec);
-    ta->val = swcsdup(val);
-    ta->next = transfer->args;
-    transfer->args = ta;
-}
-
 void transferattach(struct transfer *transfer, struct transferiface *iface, void *data)
 {
     if(transfer->iface != NULL)
@@ -623,7 +605,7 @@ int forkfilter(struct transfer *transfer)
     char **argv;
     size_t argvsize, argvdata;
     struct socket *insock, *outsock;
-    struct transarg *ta;
+    struct wcspair *ta;
     char *rec, *val;
 
     wfilename = transfer->path;
@@ -682,9 +664,22 @@ int forkfilter(struct transfer *transfer)
        addtobuf(argv, filename);
        addtobuf(argv, buf);
        addtobuf(argv, peerid);
+       if(transfer->hash)
+       {
+           if((buf = icwcstombs(unparsehash(transfer->hash), NULL)) != NULL)
+           {
+               /* XXX: I am very doubtful of this, but it can just as
+                * well be argued that all data should be presented as
+                * key-value pairs. */
+               addtobuf(argv, "hash");
+               addtobuf(argv, buf);
+           } else {
+               flog(LOG_WARNING, "could not convert hash to local charset");
+           }
+       }
        for(ta = transfer->args; ta != NULL; ta = ta->next)
        {
-           if((rec = icwcstombs(ta->rec, NULL)) == NULL)
+           if((rec = icwcstombs(ta->key, NULL)) == NULL)
                continue;
            if((val = icwcstombs(ta->val, NULL)) == NULL)
                continue;