aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-09-22 19:45:54 -04:00
Code

Don't expose upload_processes

Browse Source 
That's actually not good practise.
Realized this when checking for multiple symbol definition in issue
mentioned below.

Regards https://github.com/profanity-im/profanity/issues/1314
This commit is contained in:
Michael Vetter 2020-04-17 10:05:09 +02:00
parent 00fc0e2e8d
commit 9be7d29f1b
4 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/tools/http_upload.c
View File

@ -65,6 +65,7 @@ struct curl_data_t {
size_t size;
};
GSList *upload_processes = NULL;
static int
_xferinfo(void *userdata, curl_off_t dltotal, curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow)
@ -332,3 +333,23 @@ off_t file_size(const char* const filename)
stat(filename, &st);
return st.st_size;
}
void
http_upload_cancel_processes(ProfWin *window)
{
GSList *upload_process = upload_processes;
while (upload_process) {
HTTPUpload *upload = upload_process->data;
if (upload->window == window) {
upload->cancel = 1;
break;
}
upload_process = g_slist_next(upload_process);
}
}
void
http_upload_add_upload(HTTPUpload *upload)
{
upload_processes = g_slist_append(upload_processes, upload);
}

5
src/tools/http_upload.h
View File

@ -57,11 +57,12 @@ typedef struct http_upload_t {
int cancel;
} HTTPUpload;
GSList *upload_processes;
void* http_file_put(void *userdata);
char* file_mime_type(const char* const file_name);
off_t file_size(const char* const file_name);
void http_upload_cancel_processes(ProfWin *window);
void http_upload_add_upload(HTTPUpload *upload);
#endif

11
src/ui/window_list.c
View File

@ -50,6 +50,7 @@
#include "ui/window_list.h"
#include "xmpp/xmpp.h"
#include "xmpp/roster_list.h"
#include "tools/http_upload.h"
static GHashTable *windows;
static int current;
@ -519,15 +520,7 @@ wins_close_by_num(int i)
ProfWin *window = wins_get_by_num(i);
if (window) {
// cancel upload proccesses of this window
GSList *upload_process = upload_processes;
while (upload_process) {
HTTPUpload *upload = upload_process->data;
if (upload->window == window) {
upload->cancel = 1;
break;
}
upload_process = g_slist_next(upload_process);
}
http_upload_cancel_processes(window);
switch (window->type) {
case WIN_CHAT:

2
src/xmpp/iq.c
View File

@ -2402,7 +2402,7 @@ _http_upload_response_id_handler(xmpp_stanza_t *const stanza, void *const userda
if (get_url) xmpp_free(ctx, get_url);
pthread_create(&(upload->worker), NULL, &http_file_put, upload);
upload_processes = g_slist_append(upload_processes, upload);
http_upload_add_upload(upload);
} else {
log_error("Invalid XML in HTTP Upload slot");
return 1;