Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-07-03 16:47:46 +02:00
Code Issues Projects Releases Wiki Activity

properly close file senders on exit

Browse Source
This commit is contained in:
Jfreegman 2014-06-28 12:55:05 -04:00
parent 8d4f7fc32b
commit f8998b5891
No known key found for this signature in database
GPG Key ID: 3627F3144076AE63
4 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/chat.c
View File

@ -385,7 +385,7 @@ static void chat_onFileData(ToxWindow *self, Tox *m, int32_t num, uint8_t filenu
FILE *fp = friends[num].file_receiver.files[filenum]; FILE *fp = friends[num].file_receiver.files[filenum];
if (fp) { if (fp) {
if (fwrite(data, length, 1, friends[num].file_receiver.files[filenum]) != 1) { if (fwrite(data, length, 1, fp) != 1) {
uint8_t *msg = " * Error writing to file."; uint8_t *msg = " * Error writing to file.";
line_info_add(self, NULL, NULL, NULL, msg, SYS_MSG, 0, RED); line_info_add(self, NULL, NULL, NULL, msg, SYS_MSG, 0, RED);

36
src/file_senders.c
View File

@ -20,7 +20,6 @@
* *
*/ */
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <time.h> #include <time.h>
@ -35,17 +34,8 @@
FileSender file_senders[MAX_FILES]; FileSender file_senders[MAX_FILES];
uint8_t max_file_senders_index; uint8_t max_file_senders_index;
static void close_file_sender(ToxWindow *self, Tox *m, int i, uint8_t *msg, int CTRL, int filenum, int32_t friendnum) static void set_max_file_senders_index(void)
{ {
if (self->chatwin != NULL) {
line_info_add(self, NULL, NULL, NULL, msg, SYS_MSG, 0, 0);
alert_window(file_senders[i].toxwin, WINDOW_ALERT_2, true);
}
tox_file_send_control(m, friendnum, 0, filenum, CTRL, 0, 0);
fclose(file_senders[i].file);
memset(&file_senders[i], 0, sizeof(FileSender));
int j; int j;
for (j = max_file_senders_index; j > 0; --j) { for (j = max_file_senders_index; j > 0; --j) {
@ -56,14 +46,32 @@ static void close_file_sender(ToxWindow *self, Tox *m, int i, uint8_t *msg, int
max_file_senders_index = j; max_file_senders_index = j;
} }
/* Should only be called on exit */ static void close_file_sender(ToxWindow *self, Tox *m, int i, uint8_t *msg, int CTRL, int filenum, int32_t friendnum)
void close_all_file_senders(void) {
if (self->chatwin != NULL) {
line_info_add(self, NULL, NULL, NULL, msg, SYS_MSG, 0, 0);
alert_window(file_senders[i].toxwin, WINDOW_ALERT_2, true);
}
tox_file_send_control(m, friendnum, 0, filenum, CTRL, 0, 0);
fclose(file_senders[i].file);
memset(&file_senders[i], 0, sizeof(FileSender));
set_max_file_senders_index();
}
void close_all_file_senders(Tox *m)
{ {
int i; int i;
for (i = 0; i < max_file_senders_index; ++i) { for (i = 0; i < max_file_senders_index; ++i) {
if (file_senders[i].active) if (file_senders[i].active) {
fclose(file_senders[i].file); fclose(file_senders[i].file);
tox_file_send_control(m, file_senders[i].friendnum, 0, file_senders[i].filenum,
TOX_FILECONTROL_KILL, 0, 0);
memset(&file_senders[i], 0, sizeof(FileSender));
}
set_max_file_senders_index();
} }
} }

4
src/file_senders.h
View File

@ -44,9 +44,7 @@ typedef struct {
uint32_t line_id; uint32_t line_id;
} FileSender; } FileSender;
/* Should only be called on exit */ void close_all_file_senders(Tox *m);
void close_all_file_senders(void);
void do_file_senders(Tox *m); void do_file_senders(Tox *m);
#endif /* #define _filesenders_h */ #endif /* #define _filesenders_h */

5
src/toxic.c
View File

@ -95,7 +95,10 @@ static void ignore_SIGINT(int sig)
void exit_toxic_success(Tox *m) void exit_toxic_success(Tox *m)
{ {
store_data(m, DATA_FILE); store_data(m, DATA_FILE);
close_all_file_senders();
close_all_file_senders(m);
usleep(1000);
kill_all_windows(); kill_all_windows();
log_disable(prompt->chatwin->log); log_disable(prompt->chatwin->log);
line_info_cleanup(prompt->chatwin->hst); line_info_cleanup(prompt->chatwin->hst);