mirror of
https://github.com/Tha14/toxic.git
synced 2024-12-23 11:53:26 +01:00
Use configdir.c instead of hardcoded paths for the list of DHT servers.
This commit is contained in:
parent
bb0251a027
commit
9367508824
@ -19,9 +19,9 @@
|
||||
*/
|
||||
|
||||
#ifdef _win32
|
||||
#define CONFIGDIR "\\toxic\\"
|
||||
#define CONFIGDIR "\\tox\\"
|
||||
#else
|
||||
#define CONFIGDIR "/toxic/"
|
||||
#define CONFIGDIR "/tox/"
|
||||
#endif
|
||||
|
||||
#ifndef S_ISDIR
|
||||
|
35
main.c
35
main.c
@ -27,7 +27,7 @@
|
||||
|
||||
/* Export for use in Callbacks */
|
||||
char *DATA_FILE = NULL;
|
||||
char dir[256];
|
||||
char *SRVLIST_FILE = NULL;
|
||||
|
||||
void on_window_resize(int sig)
|
||||
{
|
||||
@ -36,17 +36,6 @@ void on_window_resize(int sig)
|
||||
clear();
|
||||
}
|
||||
|
||||
void setdir()
|
||||
{
|
||||
#ifdef WIN32
|
||||
strcpy(dir, "%appdata%/.tox/");
|
||||
#elif defined(MAC_OSX)
|
||||
strcpy(dir, "~/Library/Application Support/.tox/");
|
||||
#elif defined(linux)
|
||||
strcpy(dir, "~/.tox/");
|
||||
#endif
|
||||
}
|
||||
|
||||
static void init_term()
|
||||
{
|
||||
/* Setup terminal */
|
||||
@ -103,16 +92,12 @@ static Messenger *init_tox()
|
||||
/* Connects to a random DHT server listed in the DHTservers file */
|
||||
int init_connection(void)
|
||||
{
|
||||
FILE *fp = NULL;
|
||||
|
||||
if (DHT_isconnected())
|
||||
return 0;
|
||||
|
||||
#if WIN32
|
||||
FILE *fp = fopen("%appdata%/.tox/DHTservers", "r");
|
||||
#elif MAC_OSX
|
||||
FILE *fp = fopen("~/Library/Application Support/.tox/DHTservers", "r");
|
||||
#else
|
||||
FILE *fp = fopen("~/.tox/DHTservers", "r");
|
||||
#endif
|
||||
fp = fopen(SRVLIST_FILE, "r");
|
||||
|
||||
if (!fp)
|
||||
return 1;
|
||||
@ -279,7 +264,6 @@ static void load_data(Messenger *m, char *path)
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
setdir();
|
||||
char *user_config_dir = get_user_config_dir();
|
||||
int config_err = 0;
|
||||
|
||||
@ -306,16 +290,20 @@ int main(int argc, char *argv[])
|
||||
config_err = create_user_config_dir(user_config_dir);
|
||||
|
||||
if (config_err) {
|
||||
strcat(DATA_FILE, dir);
|
||||
DATA_FILE = strdup("data");
|
||||
SRVLIST_FILE = strdup("../../other/DHTservers");
|
||||
|
||||
|
||||
} else {
|
||||
DATA_FILE = malloc(strlen(user_config_dir) + strlen(CONFIGDIR) + strlen("data") + 1);
|
||||
strcpy(DATA_FILE, user_config_dir);
|
||||
strcat(DATA_FILE, CONFIGDIR);
|
||||
strcat(DATA_FILE, dir);
|
||||
DATA_FILE = strdup("data");
|
||||
strcat(DATA_FILE, "data");
|
||||
|
||||
SRVLIST_FILE = malloc(strlen(user_config_dir) + strlen(CONFIGDIR) + strlen("DHTservers") + 1);
|
||||
strcpy(SRVLIST_FILE, user_config_dir);
|
||||
strcat(SRVLIST_FILE, CONFIGDIR);
|
||||
strcat(SRVLIST_FILE, "DHTservers");
|
||||
}
|
||||
}
|
||||
|
||||
@ -352,5 +340,6 @@ int main(int argc, char *argv[])
|
||||
|
||||
cleanupMessenger(m);
|
||||
free(DATA_FILE);
|
||||
free(SRVLIST_FILE);
|
||||
return 0;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user