Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-15 17:47:09 +00:00
Code Issues Releases Activity

Fix removing the config and sending a SIGUSR1 results in segfault

Browse Source 
This re-implements the fix of the previous commit because that one
assumed that only overwriting the configfile can cause the config
to reload
This commit is contained in:
Nikolas Garofil 2010-02-23 14:41:11 +01:00
parent 085c39d394
commit ba06e0acad
1 changed files with 52 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
src/conky.c
View File

@ -3915,12 +3915,10 @@ static void main_loop(void)
len = read(inotify_fd, inotify_buff, INOTIFY_BUF_LEN); len = read(inotify_fd, inotify_buff, INOTIFY_BUF_LEN);
while (len > 0 && idx < len) { while (len > 0 && idx < len) {
struct inotify_event *ev = (struct inotify_event *) &inotify_buff[idx]; struct inotify_event *ev = (struct inotify_event *) &inotify_buff[idx];
if (ev->wd == inotify_config_wd) { if (ev->wd == inotify_config_wd && (ev->mask & IN_MODIFY || ev->mask & IN_IGNORED)) {
if (ev->mask & IN_MODIFY) {
/* current_config should be reloaded */ /* current_config should be reloaded */
NORM_ERR("'%s' modified, reloading...", current_config); NORM_ERR("'%s' modified, reloading...", current_config);
reload_config(); reload_config();
}
if (ev->mask & IN_IGNORED) { if (ev->mask & IN_IGNORED) {
/* for some reason we get IN_IGNORED here /* for some reason we get IN_IGNORED here
* sometimes, so we need to re-add the watch */ * sometimes, so we need to re-add the watch */
@ -5588,10 +5586,57 @@ static const struct option longopts[] = {
{ 0, 0, 0, 0 } { 0, 0, 0, 0 }
}; };
void set_current_config() {
/* check if specified config file is valid */
if (current_config) {
struct stat sb;
if (stat(current_config, &sb) ||
(!S_ISREG(sb.st_mode) && !S_ISLNK(sb.st_mode))) {
NORM_ERR("invalid configuration file '%s'\n", current_config);
free(current_config);
current_config = 0;
}
}
/* load current_config, CONFIG_FILE or SYSTEM_CONFIG_FILE */
if (!current_config) {
/* load default config file */
char buf[DEFAULT_TEXT_BUFFER_SIZE];
FILE *fp;
/* Try to use personal config file first */
to_real_path(buf, CONFIG_FILE);
if (buf[0] && (fp = fopen(buf, "r"))) {
current_config = strndup(buf, max_user_text);
fclose(fp);
}
/* Try to use system config file if personal config not readable */
if (!current_config && (fp = fopen(SYSTEM_CONFIG_FILE, "r"))) {
current_config = strndup(SYSTEM_CONFIG_FILE, max_user_text);
fclose(fp);
}
/* No readable config found */
if (!current_config) {
#define NOCFGFILEFOUND "no readable personal or system-wide config file found"
#ifdef BUILD_BUILTIN_CONFIG
current_config = strdup("==builtin==");
NORM_ERR(NOCFGFILEFOUND
", using builtin default");
#else
CRIT_ERR(NULL, NULL, NOCFGFILEFOUND);
#endif /* ! CONF_OUTPUT */
}
}
}
void initialisation(int argc, char **argv) { void initialisation(int argc, char **argv) {
struct sigaction act, oact; struct sigaction act, oact;
set_default_configurations(); set_default_configurations();
set_current_config();
load_config_file(current_config); load_config_file(current_config);
currentconffile = conftree_add(currentconffile, current_config); currentconffile = conftree_add(currentconffile, current_config);
@ -5873,48 +5918,7 @@ int main(int argc, char **argv)
} }
} }
/* check if specified config file is valid */ set_current_config();
if (current_config) {
struct stat sb;
if (stat(current_config, &sb) ||
(!S_ISREG(sb.st_mode) && !S_ISLNK(sb.st_mode))) {
NORM_ERR("invalid configuration file '%s'\n", current_config);
free(current_config);
current_config = 0;
}
}
/* load current_config, CONFIG_FILE or SYSTEM_CONFIG_FILE */
if (!current_config) {
/* load default config file */
char buf[DEFAULT_TEXT_BUFFER_SIZE];
FILE *fp;
/* Try to use personal config file first */
to_real_path(buf, CONFIG_FILE);
if (buf[0] && (fp = fopen(buf, "r"))) {
current_config = strndup(buf, max_user_text);
fclose(fp);
}
/* Try to use system config file if personal config not readable */
if (!current_config && (fp = fopen(SYSTEM_CONFIG_FILE, "r"))) {
current_config = strndup(SYSTEM_CONFIG_FILE, max_user_text);
fclose(fp);
}
/* No readable config found */
if (!current_config) {
#ifdef CONFIG_OUTPUT
current_config = strdup("==builtin==");
NORM_ERR("no readable personal or system-wide config file found,"
" using builtin default");
#else
CRIT_ERR(NULL, NULL, "no readable personal or system-wide config file found");
#endif /* ! CONF_OUTPUT */
}
}
#ifdef XOAP #ifdef XOAP
/* Load xoap keys, if existing */ /* Load xoap keys, if existing */