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

a few fixes

Browse Source
This commit is contained in:
Jfreegman 2014-08-12 03:01:18 -04:00
parent 0f4cffbacc
commit 5718ad52db
No known key found for this signature in database
GPG Key ID: 3627F3144076AE63
4 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/dns.c
View File

@ -108,15 +108,23 @@ static int load_dns_domainlist(void)
char line[MAX_DNS_LINE]; char line[MAX_DNS_LINE];
while (fgets(line, sizeof(line), fp) && dns3_servers.lines < MAX_DNS_SERVERS) { while (fgets(line, sizeof(line), fp) && dns3_servers.lines < MAX_DNS_SERVERS) {
if (strlen(line) < (DNS3_KEY_SIZE * 2) + 4) int linelen = strlen(line);
if (linelen < DNS3_KEY_SIZE * 2 + 5)
continue; continue;
if (line[linelen - 1] == '\n')
line[--linelen] = '\0';
const char *name = strtok(line, " "); const char *name = strtok(line, " ");
const char *keystr = strtok(NULL, " "); const char *keystr = strtok(NULL, " ");
if (name == NULL || keystr == NULL) if (name == NULL || keystr == NULL)
continue; continue;
if (strlen(keystr) != DNS3_KEY_SIZE * 2)
continue;
snprintf(dns3_servers.names[dns3_servers.lines], sizeof(dns3_servers.names[dns3_servers.lines]), "%s", name); snprintf(dns3_servers.names[dns3_servers.lines], sizeof(dns3_servers.names[dns3_servers.lines]), "%s", name);
int res = hex_string_to_bytes(dns3_servers.keys[dns3_servers.lines], DNS3_KEY_SIZE, keystr); int res = hex_string_to_bytes(dns3_servers.keys[dns3_servers.lines], DNS3_KEY_SIZE, keystr);

6
src/global_commands.c
View File

@ -352,8 +352,7 @@ void cmd_note(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MA
int len = strlen(msg) - 1; int len = strlen(msg) - 1;
msg[len] = '\0'; msg[len] = '\0';
tox_set_status_message(m, (uint8_t *) msg, (uint16_t) len); prompt_update_statusmessage(prompt, m, msg);
prompt_update_statusmessage(prompt, msg);
} }
void cmd_prompt_help(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]) void cmd_prompt_help(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE])
@ -412,7 +411,6 @@ void cmd_status(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[
int len = strlen(msg) - 1; int len = strlen(msg) - 1;
msg[len] = '\0'; msg[len] = '\0';
tox_set_status_message(m, (uint8_t *) msg, (uint16_t) len); prompt_update_statusmessage(prompt, m, msg);
prompt_update_statusmessage(prompt, msg);
} }
} }

11
src/prompt.c
View File

@ -102,12 +102,14 @@ void prompt_update_nick(ToxWindow *prompt, const char *nick)
statusbar->nick_len = strlen(statusbar->nick); statusbar->nick_len = strlen(statusbar->nick);
} }
/* Updates own statusmessage in prompt statusbar */ /* Updates own statusmessage */
void prompt_update_statusmessage(ToxWindow *prompt, const char *statusmsg) void prompt_update_statusmessage(ToxWindow *prompt, Tox *m, const char *statusmsg)
{ {
StatusBar *statusbar = prompt->stb; StatusBar *statusbar = prompt->stb;
snprintf(statusbar->statusmsg, sizeof(statusbar->statusmsg), "%s", statusmsg); snprintf(statusbar->statusmsg, sizeof(statusbar->statusmsg), "%s", statusmsg);
statusbar->statusmsg_len = strlen(statusbar->statusmsg); int len = strlen(statusbar->statusmsg);
statusbar->statusmsg_len = len;
tox_set_status_message(m, (uint8_t *) statusmsg, (uint64_t) len);
} }
/* Updates own status in prompt statusbar */ /* Updates own status in prompt statusbar */
@ -404,10 +406,9 @@ void prompt_init_statusbar(ToxWindow *self, Tox *m)
snprintf(statusmsg, sizeof(statusmsg), "Toxing on Toxic v.%s", toxic_ver); snprintf(statusmsg, sizeof(statusmsg), "Toxing on Toxic v.%s", toxic_ver);
s_len = strlen(statusmsg); s_len = strlen(statusmsg);
statusmsg[s_len] = '\0'; statusmsg[s_len] = '\0';
tox_set_status_message(m, (uint8_t *) statusmsg, (uint64_t) s_len);
} }
prompt_update_statusmessage(prompt, statusmsg); prompt_update_statusmessage(prompt, m, statusmsg);
prompt_update_status(prompt, status); prompt_update_status(prompt, status);
prompt_update_nick(prompt, nick); prompt_update_nick(prompt, nick);

2
src/prompt.h
View File

@ -43,7 +43,7 @@ ToxWindow new_prompt(void);
void prep_prompt_win(void); void prep_prompt_win(void);
void prompt_init_statusbar(ToxWindow *self, Tox *m); void prompt_init_statusbar(ToxWindow *self, Tox *m);
void prompt_update_nick(ToxWindow *prompt, const char *nick); void prompt_update_nick(ToxWindow *prompt, const char *nick);
void prompt_update_statusmessage(ToxWindow *prompt, const char *statusmsg); void prompt_update_statusmessage(ToxWindow *prompt, Tox *m, const char *statusmsg);
void prompt_update_status(ToxWindow *prompt, uint8_t status); void prompt_update_status(ToxWindow *prompt, uint8_t status);
void prompt_update_connectionstatus(ToxWindow *prompt, bool is_connected); void prompt_update_connectionstatus(ToxWindow *prompt, bool is_connected);
void kill_prompt_window(ToxWindow *self); void kill_prompt_window(ToxWindow *self);