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

Cleanup and Error fixes

Browse Source 
Add several frees that were missing to prevent memory leaks
Replace strcpy with strdup where appropriate
Replace _stat with __stat64 for building on Windows
This commit is contained in:
Simon Levermann 2013-08-08 16:36:16 +02:00
parent c3c144ddd0
commit a9ec08b998
3 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
configdir.c
View File

@ -56,10 +56,8 @@ char *get_user_config_dir(void)
)
if (!result) return NULL;
user_config_dir = malloc(strlen(appdata) + 1);
if (user_config_dir) {
strcpy(user_config_dir, appdata);
}
user_config_dir = strdup(appdata);
return user_config_dir;
#elif defined __APPLE__
@ -78,10 +76,7 @@ char *get_user_config_dir(void)
#else
if (getenv("XDG_CONFIG_HOME")) {
user_config_dir = malloc(strlen(getenv("XDG_CONFIG_HOME")) + 1);
if (user_config_dir) {
strcpy(user_config_dir, getenv("XDG_CONFIG_HOME"));
}
user_config_dir = strdup(getenv("XDG_CONFIG_HOME"));
} else {
user_config_dir = malloc(strlen(getenv("HOME")) + strlen("/.config") + 1);
if (user_config_dir) {
@ -109,12 +104,10 @@ int create_user_config_dir(char *path)
strcat(fullpath, CONFIGDIR);
mkdir_err = _mkdir(fullpath);
if (mkdir_err) {
if(errno != EEXIST) return -1;
struct _stat buf;
if(_wstat64(fullpath, &buf)) return -1;
if(!S_ISDIR(buf.st_mode)) return -1;
struct __stat64 buf;
if (mkdir_err && (errno != EEXIST || _wstat64(fullpath, &buf) || !S_ISDIR(buf.st_mode))) {
free(fullpath);
return -1;
}
#else
@ -122,10 +115,8 @@ int create_user_config_dir(char *path)
mkdir_err = mkdir(path, 0700);
struct stat buf;
if(mkdir_err) {
if(errno != EEXIST) return -1;
if(stat(path, &buf)) return -1;
if(!S_ISDIR(buf.st_mode)) return -1;
if(mkdir_err && (errno != EEXIST || stat(path, &buf) || !S_ISDIR(buf.st_mode))) {
return -1;
}
char *fullpath = malloc(strlen(path) + strlen(CONFIGDIR) + 1);
@ -134,13 +125,12 @@ int create_user_config_dir(char *path)
mkdir_err = mkdir(fullpath, 0700);
if(mkdir_err) {
if(errno != EEXIST) return -1;
if(stat(fullpath, &buf)) return -1;
if(!S_ISDIR(buf.st_mode)) return -1;
if(mkdir_err && (errno != EEXIST || stat(fullpath, &buf) || !S_ISDIR(buf.st_mode))) {
free(fullpath);
return -1;
}
#endif
return 0;
}
}

2
configdir.h
View File

@ -30,4 +30,4 @@
char *get_user_config_dir(void);
int create_user_config_dir(char *path);
int create_user_config_dir(char *path);

1
main.c
View File

@ -370,6 +370,7 @@ int main(int argc, char *argv[])
init_term();
init_tox();
load_data(filename);
free(filename);
init_windows();
init_window_status();