Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-23 02:13:01 +01:00
Code Issues Projects Releases Wiki Activity

handle duplicate files and another bug fix

Browse Source
This commit is contained in:
Jfreegman 2013-10-17 22:20:40 -04:00
parent 2ff1da396c
commit 34cc342010
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/chat.c
View File

@ -128,6 +128,18 @@ static void chat_onFileSendRequest(ToxWindow *self, Tox *m, int num, uint8_t fil
return; return;
} }
/* Append current time to duplicate file names */
FILE *filecheck = NULL;
if ((filecheck = fopen(filename, "r"))) {
struct tm *timeinfo = get_time();
uint8_t cur_time[MAX_STR_SIZE];
snprintf(cur_time, sizeof(cur_time), ".%02d:%02d:%02d", timeinfo->tm_hour, timeinfo->tm_min,
timeinfo->tm_sec);
strncat(filename, cur_time, MAX_STR_SIZE);
fclose(filecheck);
}
wprintw(ctx->history, "Type '/savefile %d' to accept the file transfer.\n", filenum); wprintw(ctx->history, "Type '/savefile %d' to accept the file transfer.\n", filenum);
friends[num].file_receiver.pending_file_transfers[filenum] = num; friends[num].file_receiver.pending_file_transfers[filenum] = num;
@ -144,8 +156,12 @@ static void chat_onFileControl(ToxWindow *self, Tox *m, int num, uint8_t receive
return; return;
ChatContext *ctx = (ChatContext *) self->chatwin; ChatContext *ctx = (ChatContext *) self->chatwin;
uint8_t *filename;
uint8_t *filename = friends[num].file_receiver.filenames[filenum]; if (receive_send == 0)
filename = friends[num].file_receiver.filenames[filenum];
else
filename = file_senders[filenum].pathname;
switch(control_type) { switch(control_type) {
case TOX_FILECONTROL_ACCEPT: case TOX_FILECONTROL_ACCEPT: