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

a few fixes, update example config file

Browse Source
This commit is contained in:
Jfreegman 2014-09-26 03:22:47 -04:00
parent 544c402f78
commit 940af2c711
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
misc/toxic.conf.example
View File

@ -45,6 +45,9 @@ tox = {
// Path for downloaded files // Path for downloaded files
// download_path="/home/USERNAME/Downloads/"; // download_path="/home/USERNAME/Downloads/";
// Path for your avatar (file must be a .png and cannot exceed 16.3 KiB)
// avatar_path="/home/USERNAME/Pictures/youravatar.png";
// Path for chatlogs // Path for chatlogs
// chatlogs_path="/home/USERNAME/toxic_chatlogs/"; // chatlogs_path="/home/USERNAME/toxic_chatlogs/";
}; };

6
src/global_commands.c
View File

@ -191,11 +191,11 @@ void cmd_avatar(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[
return; return;
} }
if (string_is_empty(argv[1])) if (strlen(argv[1]) < 3)
return; return;
if (argv[1][0] != '\"') { if (argv[1][0] != '\"') {
line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Note must be enclosed in quotes."); line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Path must be enclosed in quotes.");
return; return;
} }
@ -237,7 +237,7 @@ void cmd_avatar(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[
if (avatar == NULL) if (avatar == NULL)
exit_toxic_err("Failed in set_avatar", FATALERR_MEMORY); exit_toxic_err("Failed in set_avatar", FATALERR_MEMORY);
if (fread(avatar, sz, 1, fp) == -1) { if (fread(avatar, sz, 1, fp) != 1) {
fclose(fp); fclose(fp);
free(avatar); free(avatar);
line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to set avatar: Read fail."); line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "Failed to set avatar: Read fail.");

2
src/misc_tools.h
View File

@ -118,7 +118,7 @@ off_t file_size(const char *path);
/* compares the first size bytes of fp and signature. /* compares the first size bytes of fp and signature.
Returns 0 if they are the same, 1 if they differ, and -1 on error. Returns 0 if they are the same, 1 if they differ, and -1 on error.
On success this function will seek back to the beginning of fp and will not close fp */ On success this function will seek back to the beginning of fp */
int check_file_signature(const char *signature, size_t size, FILE *fp); int check_file_signature(const char *signature, size_t size, FILE *fp);
#endif /* #define MISC_TOOLS_H */ #endif /* #define MISC_TOOLS_H */