aboutsummaryrefslogtreecommitdiffstats
path: root/src/config.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/config.c83
1 files changed, 81 insertions, 2 deletions
diff --git a/src/config.c b/src/config.c
index 7843c08..29c5a53 100644
--- a/src/config.c
+++ b/src/config.c
@@ -30,7 +30,7 @@ usage_no_exit(FILE *f)
{
fprintf(f, _("Usage: %s %s\n"), argv0,
_("[-b brightness] [-c config-file] [-D | +D] [-E | +E | -e elevations] "
- "[-g gamma] [-l latitude:longitude | -l provider[:options]] "
+ "[-g gamma] [-H hook-file] [-l latitude:longitude | -l provider[:options]] "
"[-m method[:options]] [-P | +P] [-r | +r] [-dv] "
"[-O temperature | -o | -p | -t temperature | -x] | -h | -V"));
}
@@ -54,6 +54,7 @@ enum program_mode mode = PROGRAM_MODE_CONTINUAL;
int preserve_gamma;
int use_fade;
int verbose = 0;
+char *hook_file;
/**
@@ -78,6 +79,7 @@ print_help(void)
printf(_(" -e day:night Select solar elevation thresholds for day and night (Default: %g:%g)\n"),
DEFAULT_HIGH_ELEVATION, DEFAULT_LOW_ELEVATION);
printf(_(" -g day:night Additional gamma correction (Default: 1:1:1:1:1:1)\n"));
+ printf(_(" -H hook-file Select hook file or directrory\n"));
printf(_(" -h Display this help message\n"));
printf(_(" -l lat:lon Specific geographical location\n"));
printf(_(" -l provider[:options] Select location provider to get geographical location\n"));
@@ -657,6 +659,7 @@ load_defaults(struct settings *settings)
settings->night.gamma.value[1] = DEFAULT_NIGHT_GAMMA;
settings->night.gamma.value[2] = DEFAULT_NIGHT_GAMMA;
+ settings->hook_file.value = NULL;
settings->preserve_gamma.value = 1;
settings->use_fade.value = 1;
@@ -716,6 +719,12 @@ load_from_cmdline(struct settings *settings, int argc, char *argv[])
set_gamma(ARG(), &settings->day.gamma, &settings->night.gamma, NULL);
break;
+ case 'H':
+ settings->hook_file.source |= SETTING_CMDLINE;
+ free(settings->hook_file.value);
+ settings->hook_file.value = ARG();
+ break;
+
case 'h':
print_help();
exit(0);
@@ -899,6 +908,15 @@ load_from_config_ini(struct settings *settings, const char *key, char *value)
if (settings->use_fade.source <= SETTING_CONFIGFILE)
settings->use_fade.value = get_boolean(value, key);
+ } else if (!strcasecmp(key, "hook")) {
+ if (settings->hook_file.source & SETTING_CONFIGFILE)
+ weprintf(_("`hook' setting specified multiple times in configuration file."));
+ settings->hook_file.source |= SETTING_CONFIGFILE;
+ if (settings->hook_file.source <= SETTING_CONFIGFILE) {
+ free(settings->hook_file.value);
+ settings->hook_file.value = estrdup(value);
+ }
+
} else if (!strcasecmp(key, "preserve-gamma")) {
if (settings->preserve_gamma.source & SETTING_CONFIGFILE)
weprintf(_("`preserve-gamma' setting specified multiple times in configuration file."));
@@ -955,8 +973,11 @@ load_settings(struct settings *settings, int argc, char *argv[])
struct config_ini_section *section;
struct config_ini_setting *setting;
const struct time_period *first, *current;
+ const char *conf_path, *p;
+ char *conf_pathbuf, *s;
int i, j, n;
time_t duration;
+ size_t len;
/* Clear unused bit so they do not interfere with comparsion */
memset(&day_settings, 0, sizeof(day_settings));
@@ -965,7 +986,7 @@ load_settings(struct settings *settings, int argc, char *argv[])
/* Load settings; some validation takes place */
load_defaults(settings);
load_from_cmdline(settings, argc, argv);
- config_ini_init(&settings->config, settings->config_file);
+ conf_path = config_ini_init(&settings->config, settings->config_file, &conf_pathbuf);
if ((section = config_ini_get_section(&settings->config, "redshift")))
for (setting = section->settings; setting; setting = setting->next)
load_from_config_ini(settings, setting->name, setting->value);
@@ -1014,9 +1035,67 @@ load_settings(struct settings *settings, int argc, char *argv[])
goto settings_published;
}
+ /* Make hook file absolute if set from config file (relative to config file) */
+ if (settings->hook_file.source == SETTING_CONFIGFILE && conf_path) {
+#ifdef WINDOWS
+ /* Regular absolute path */
+ if (isalpha(settings->hook_file.value[0]) && settings->hook_file.value[1] == ':')
+ goto absolute_hook_path;
+ /* Absolute extended path or network path (relative extended paths do not exist) */
+ if (settings->hook_file.value[0] == '\\' && settings->hook_file.value[1] == '\\')
+ goto absolute_hook_path;
+ /* Path relative to root */
+ if (settings->hook_file.value[0] == '\\' || settings->hook_file.value[0] == '/') {
+ /* This is safe as we know that `conf_path` is a valid path */
+ if (isalpha(conf_path[0]) && conf_path[1] == ':') {
+ p = &conf_path[3];
+ goto base_found;
+ } else if (conf_path[0] == '\\' && conf_path[1] == '\\') {
+ p = &conf_path[2];
+ while (*p == '\\')
+ p++;
+ while (*p != '/' && *p != '\\')
+ p++;
+ goto base_found;
+ }
+ }
+#else
+ if (settings->hook_file.value[0] == '/')
+ goto absolute_hook_path;
+#endif
+ p = strrchr(conf_path, '/');
+ p = p ? &p[1] : conf_path;
+#ifdef WINDOWS
+ if (strrchr(p, '\\'))
+ p = &strrchr(p, '\\')[1];
+ base_found:
+#endif
+ len = (size_t)(p - conf_path);
+ s = emalloc(len + strlen(settings->hook_file.value) + 1U);
+ memcpy(s, conf_path, len);
+ stpcpy(&s[len], settings->hook_file.value);
+ free(settings->hook_file.value);
+ settings->hook_file.value = s;
+#ifdef WINDOWS
+ /* Used extended path is too long */
+ if (settings->hook_file.value[0] != '\\' && (len = strlen(settings->hook_file.value)) >= 260) {
+ /* We have already made sure the path is absolute, so \ prefix is always extended or network path */
+ settings->hook_file.value = erealloc(settings->hook_file.value, len + sizeof("\\\\?\\"));
+ memmove(&settings->hook_file.value[4], &settings->hook_file.value, len + 1U);
+ settings->hook_file.value[0] = '\\';
+ settings->hook_file.value[1] = '\\';
+ settings->hook_file.value[2] = '?';
+ settings->hook_file.value[3] = '\\';
+ }
+#endif
+ }
+ free(conf_pathbuf);
+absolute_hook_path:
+
/* Publish loaded settings */
if (mode == PROGRAM_MODE_ONE_SHOT && settings->until_death)
mode = PROGRAM_MODE_UNTIL_DEATH;
+ hook_file = settings->hook_file.value, settings->hook_file.value = NULL;
preserve_gamma = settings->preserve_gamma.value;
use_fade = settings->use_fade.value;
disable ^= settings->disabled.value;
generated by cgit v1.2.3-70-g09d2 (git 2.48.0) at 2025-04-05 17:45:12 +0000