From 789c491c1ed4456d184b458cf6e8f6a880b94554 Mon Sep 17 00:00:00 2001
From: Jfreegman <Jfreegman@gmail.com>
Date: Tue, 3 Jun 2014 16:04:57 -0400
Subject: [PATCH] fix a few file transfer bugs

---
 src/chat.c          | 32 +++++++++++++++++++++-----------
 src/chat_commands.c |  2 +-
 src/file_senders.c  |  4 ++--
 src/toxic_windows.h |  2 +-
 4 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/src/chat.c b/src/chat.c
index 7f32f30..0bf22ef 100644
--- a/src/chat.c
+++ b/src/chat.c
@@ -324,21 +324,28 @@ static void chat_onFileControl(ToxWindow *self, Tox *m, int32_t num, uint8_t rec
 
     const uint8_t *filename;
     uint8_t msg[MAX_STR_SIZE] = {0};
+    int i;   /* file_sender index */
 
-    if (receive_send == 0)
+    if (receive_send == 0) {
         filename = friends[num].file_receiver.filenames[filenum];
-    else
-        filename = file_senders[filenum].pathname;
+    } else {
+        for (i = 0; i < MAX_FILES; ++i) {
+            if (file_senders[i].filenum == filenum)
+                break;
+        }
+
+        filename = file_senders[i].pathname;
+    }
 
     switch (control_type) {
         case TOX_FILECONTROL_ACCEPT:
-            snprintf(msg, sizeof(msg), "File transfer for '%s' accepted (%.1f%%)", filename, 0.0);
-            file_senders[filenum].line_id = self->chatwin->hst->line_end->id + 1;
+            if (receive_send == 1) {
+                snprintf(msg, sizeof(msg), "File transfer for '%s' accepted (%.1f%%)", filename, 0.0);
+                file_senders[i].line_id = self->chatwin->hst->line_end->id + 1;
+            }
+
             break;
 
-            /*case TOX_FILECONTROL_PAUSE:
-                wprintw(ctx->history, "File transfer for '%s' paused.\n", filename);
-                break; */
         case TOX_FILECONTROL_KILL:
             snprintf(msg, sizeof(msg), "File transfer for '%s' failed.", filename);
 
@@ -348,8 +355,11 @@ static void chat_onFileControl(ToxWindow *self, Tox *m, int32_t num, uint8_t rec
             break;
 
         case TOX_FILECONTROL_FINISHED:
-            snprintf(msg, sizeof(msg), "File transfer for '%s' complete.", filename);
-            chat_close_file_receiver(num, filenum);
+            if (receive_send == 0) {
+                snprintf(msg, sizeof(msg), "File transfer for '%s' complete.", filename);
+                chat_close_file_receiver(num, filenum);
+            }
+
             break;
     }
 
@@ -382,7 +392,7 @@ static void chat_onFileData(ToxWindow *self, Tox *m, int32_t num, uint8_t filenu
 
     const uint8_t *name = friends[num].file_receiver.filenames[filenum];
     snprintf(msg, sizeof(msg), "Saving file as: '%s' (%.1Lf%%)", name, pct_remain);
-    line_info_set(self, friends[num].file_receiver.line_id, msg);
+    line_info_set(self, friends[num].file_receiver.line_id[filenum], msg);
 
 }
 
diff --git a/src/chat_commands.c b/src/chat_commands.c
index a0eb2ab..063d16d 100644
--- a/src/chat_commands.c
+++ b/src/chat_commands.c
@@ -185,7 +185,7 @@ void cmd_savefile(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv
         uint8_t msg[MAX_STR_SIZE];
         snprintf(msg, sizeof(msg), "Saving file as: '%s' (%.1f%%)", filename, 0.0);
         line_info_add(self, NULL, NULL, NULL, msg, SYS_MSG, 0, 0);
-        friends[self->num].file_receiver.line_id = self->chatwin->hst->line_end->id;
+        friends[self->num].file_receiver.line_id[filenum] = self->chatwin->hst->line_end->id;
 
         if ((friends[self->num].file_receiver.files[filenum] = fopen(filename, "a")) == NULL) {
             errmsg = "* Error writing to file.";
diff --git a/src/file_senders.c b/src/file_senders.c
index b8529d0..69aaca5 100644
--- a/src/file_senders.c
+++ b/src/file_senders.c
@@ -107,9 +107,9 @@ void do_file_senders(Tox *m)
                 if (remain)
                     pct_remain = (1 - (remain / size)) * 100;
 
-                const uint8_t *name = file_senders[filenum].pathname;
+                const uint8_t *name = file_senders[i].pathname;
                 snprintf(msg, sizeof(msg), "File transfer for '%s' accepted (%.1Lf%%)", name, pct_remain);
-                line_info_set(self, file_senders[filenum].line_id, msg);
+                line_info_set(self, file_senders[i].line_id, msg);
             }
 
             if (file_senders[i].piecelen == 0) {
diff --git a/src/toxic_windows.h b/src/toxic_windows.h
index fc0d2d5..30d0f18 100644
--- a/src/toxic_windows.h
+++ b/src/toxic_windows.h
@@ -219,7 +219,7 @@ struct FileReceiver {
     FILE *files[MAX_FILES];
     bool pending[MAX_FILES];
     uint64_t size[MAX_FILES];
-    uint32_t line_id;
+    uint32_t line_id[MAX_FILES];
 };
 
 /* End file transfer code */