From 61821405d8f48117b82ce839c7196eb68c2d8266 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Wed, 5 Mar 2025 20:36:07 +0100 Subject: Style and warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- src/hooks.c | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) (limited to 'src/hooks.c') diff --git a/src/hooks.c b/src/hooks.c index 485f5f0..8440874 100644 --- a/src/hooks.c +++ b/src/hooks.c @@ -38,6 +38,10 @@ open_hooks_dir(char *hp) { char *env; +#ifndef WINDOWS + struct passwd *pwd; +#endif + if ((env = getenv("XDG_CONFIG_HOME")) != NULL && env[0] != '\0') { snprintf(hp, MAX_HOOK_PATH, "%s/redshift/hooks", env); @@ -51,7 +55,7 @@ open_hooks_dir(char *hp) } #ifndef WINDOWS - struct passwd *pwd = getpwuid(getuid()); + pwd = getpwuid(getuid()); /* TODO check failure */ snprintf(hp, MAX_HOOK_PATH, "%s/.config/redshift/hooks", pwd->pw_dir); return opendir(hp); #else @@ -64,16 +68,20 @@ void hooks_signal_period_change(enum period prev_period, enum period period) { char hooksdir_path[MAX_HOOK_PATH]; - DIR *hooks_dir = open_hooks_dir(hooksdir_path); + DIR *hooks_dir; + struct dirent *ent; + char *hook_name; + char hook_path[MAX_HOOK_PATH]; + int r; + + hooks_dir = open_hooks_dir(hooksdir_path); if (hooks_dir == NULL) return; - struct dirent* ent; while ((ent = readdir(hooks_dir)) != NULL) { /* Skip hidden and special files (., ..) */ if (ent->d_name[0] == '\0' || ent->d_name[0] == '.') continue; - char *hook_name = ent->d_name; - char hook_path[MAX_HOOK_PATH]; + hook_name = ent->d_name; snprintf(hook_path, sizeof(hook_path), "%s/%s", hooksdir_path, hook_name); @@ -81,21 +89,23 @@ hooks_signal_period_change(enum period prev_period, enum period period) /* Fork and exec the hook. We close stdout so the hook cannot interfere with the normal output. */ - pid_t pid = fork(); - if (pid == (pid_t)-1) { + switch (fork()) { + case -1: perror("fork"); - continue; - } else if (pid == 0) { /* Child */ + break; + case 0: close(STDOUT_FILENO); - int r = execl(hook_path, hook_name, - "period-changed", - period_names[prev_period], - period_names[period], NULL); + r = execl(hook_path, hook_name, + "period-changed", + period_names[prev_period], + period_names[period], NULL); if (r < 0 && errno != EACCES) perror("execl"); /* Only reached on error */ _exit(EXIT_FAILURE); + default: + break; } #endif } -- cgit v1.2.3-70-g09d2