aboutsummaryrefslogtreecommitdiffstats
path: root/src/config-ini.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/config-ini.c')
-rw-r--r--src/config-ini.c141
1 files changed, 51 insertions, 90 deletions
diff --git a/src/config-ini.c b/src/config-ini.c
index 4cac7e2..1dcda44 100644
--- a/src/config-ini.c
+++ b/src/config-ini.c
@@ -15,6 +15,7 @@
along with Redshift. If not, see <http://www.gnu.org/licenses/>.
Copyright (c) 2010-2018 Jon Lund Steffensen <jonlst@gmail.com>
+ Copyright (c) 2025 Mattias Andrée <m@maandree.se>
*/
#include "common.h"
@@ -42,13 +43,11 @@ open_config_file(const char *filepath)
if (f == NULL && (env = getenv("XDG_CONFIG_HOME")) != NULL &&
env[0] != '\0') {
- snprintf(cp, sizeof(cp),
- "%s/redshift/redshift.conf", env);
+ snprintf(cp, sizeof(cp), "%s/redshift/redshift.conf", env);
f = fopen(cp, "r");
if (f == NULL) {
/* Fall back to formerly used path. */
- snprintf(cp, sizeof(cp),
- "%s/redshift.conf", env);
+ snprintf(cp, sizeof(cp), "%s/redshift.conf", env);
f = fopen(cp, "r");
}
}
@@ -56,20 +55,17 @@ open_config_file(const char *filepath)
#ifdef WINDOWS
if (f == NULL && (env = getenv("localappdata")) != NULL &&
env[0] != '\0') {
- snprintf(cp, sizeof(cp),
- "%s\\redshift.conf", env);
+ snprintf(cp, sizeof(cp), "%s\\redshift.conf", env);
f = fopen(cp, "r");
}
#endif
if (f == NULL && (env = getenv("HOME")) != NULL &&
env[0] != '\0') {
- snprintf(cp, sizeof(cp),
- "%s/.config/redshift/redshift.conf", env);
+ snprintf(cp, sizeof(cp), "%s/.config/redshift/redshift.conf", env);
f = fopen(cp, "r");
if (f == NULL) {
/* Fall back to formerly used path. */
- snprintf(cp, sizeof(cp),
- "%s/.config/redshift.conf", env);
+ snprintf(cp, sizeof(cp), "%s/.config/redshift.conf", env);
f = fopen(cp, "r");
}
}
@@ -80,31 +76,28 @@ open_config_file(const char *filepath)
if (pwd != NULL) {
char *home = pwd->pw_dir;
if ((home != NULL) && (*home != '\0')) {
- snprintf(cp, sizeof(cp),
- "%s/.config/redshift/redshift.conf", home);
+ snprintf(cp, sizeof(cp), "%s/.config/redshift/redshift.conf", home);
f = fopen(cp, "r");
- if (f == NULL) {
+ if (!f) {
/* Fall back to formerly used path. */
- snprintf(cp, sizeof(cp),
- "%s/.config/redshift.conf", home);
+ snprintf(cp, sizeof(cp), "%s/.config/redshift.conf", home);
f = fopen(cp, "r");
}
} else {
- fprintf(stderr, _("Cannot determine your home directory, "
- "it is from the system's user table.\n"));
+ weprintf(_("Cannot determine your home directory,"
+ " it is from the system's user table."));
}
} else if (errno) {
- perror("getpwuid");
+ weprintf("getpwuid:");
} else {
- fprintf(stderr, _("Cannot determine your home directory, "
- "your user ID is missing from the system's user table.\n"));
+ weprintf(_("Cannot determine your home directory, your"
+ " user ID is missing from the system's user table."));
/* errno can either be set to any number of error codes,
or be zero if the user does not have a passwd entry. */
}
}
- if (f == NULL && (env = getenv("XDG_CONFIG_DIRS")) != NULL &&
- env[0] != '\0') {
+ if (f == NULL && (env = getenv("XDG_CONFIG_DIRS")) != NULL && *env) {
char *begin = env;
char *end;
int len;
@@ -114,33 +107,32 @@ open_config_file(const char *filepath)
len = (int)(end - begin);
if (len > 0) {
- snprintf(cp, sizeof(cp),
- "%.*s/redshift/redshift.conf", len, begin);
+ snprintf(cp, sizeof(cp), "%.*s/redshift/redshift.conf", len, begin);
f = fopen(cp, "r");
- if (f != NULL) {
+ if (f == NULL) {
/* Fall back to formerly used path. */
- snprintf(cp, sizeof(cp),
- "%.*s/redshift.conf", len, begin);
+ snprintf(cp, sizeof(cp), "%.*s/redshift.conf", len, begin);
f = fopen(cp, "r");
}
- if (f != NULL) break;
+ if (f != NULL)
+ break;
}
- if (end[0] == '\0') break;
- begin = end + 1;
+ if (*end)
+ break;
+ begin = &end[1];
}
}
if (f == NULL) {
- snprintf(cp, sizeof(cp),
- "%s/redshift.conf", "/etc");
+ snprintf(cp, sizeof(cp), "%s/redshift.conf", "/etc");
f = fopen(cp, "r");
}
#endif
} else {
f = fopen(filepath, "r");
if (f == NULL) {
- perror("fopen");
+ weprintf("fopen:");
return NULL;
}
}
@@ -161,29 +153,29 @@ config_ini_init(struct config_ini_state *state, const char *filepath)
f = open_config_file(filepath);
if (f == NULL) {
/* Only a serious error if a file was explicitly requested. */
- if (filepath != NULL) return -1;
- return 0;
+ return filepath ? 0 : -1;
}
for (;;) {
/* Handle the file input linewise. */
char *r = fgets(line, sizeof(line), f);
- if (r == NULL) break;
+ if (!r)
+ break;
/* Strip leading blanks and trailing newline. */
s = line + strspn(line, " \t");
s[strcspn(s, "\r\n")] = '\0';
/* Skip comments and empty lines. */
- if (s[0] == ';' || s[0] == '#' || s[0] == '\0') continue;
+ if (s[0] == ';' || s[0] == '#' || s[0] == '\0')
+ continue;
if (s[0] == '[') {
/* Read name of section. */
- const char *name = s+1;
+ const char *name = &s[1];
char *end = strchr(s, ']');
if (end == NULL || end[1] != '\0' || end == name) {
- fputs(_("Malformed section header in config"
- " file.\n"), stderr);
+ weprintf(_("Malformed section header in config file."));
fclose(f);
config_ini_free(state);
return -1;
@@ -192,12 +184,7 @@ config_ini_init(struct config_ini_state *state, const char *filepath)
*end = '\0';
/* Create section. */
- section = malloc(sizeof(struct config_ini_section));
- if (section == NULL) {
- fclose(f);
- config_ini_free(state);
- return -1;
- }
+ section = emalloc(sizeof(*section));
/* Insert into section list. */
section->name = NULL;
@@ -221,9 +208,8 @@ config_ini_init(struct config_ini_state *state, const char *filepath)
/* Split assignment at equals character. */
end = strchr(s, '=');
- if (end == NULL || end == s) {
- fputs(_("Malformed assignment in config"
- " file.\n"), stderr);
+ if (!end || end == s) {
+ weprintf(_("Malformed assignment in config file."));
fclose(f);
config_ini_free(state);
return -1;
@@ -232,21 +218,15 @@ config_ini_init(struct config_ini_state *state, const char *filepath)
*end++ = '\0';
value = end;
- if (section == NULL) {
- fputs(_("Assignment outside section in config"
- " file.\n"), stderr);
+ if (!section) {
+ weprintf(_("Assignment outside section in config file."));
fclose(f);
config_ini_free(state);
return -1;
}
/* Create section. */
- setting = malloc(sizeof(struct config_ini_setting));
- if (setting == NULL) {
- fclose(f);
- config_ini_free(state);
- return -1;
- }
+ setting = emalloc(sizeof(*setting));
/* Insert into section list. */
setting->name = NULL;
@@ -255,23 +235,13 @@ config_ini_init(struct config_ini_state *state, const char *filepath)
section->settings = setting;
/* Copy name of setting. */
- setting->name = malloc(end - s);
- if (setting->name == NULL) {
- fclose(f);
- config_ini_free(state);
- return -1;
- }
+ setting->name = emalloc(end - s);
memcpy(setting->name, s, end - s);
/* Copy setting value. */
value_len = strlen(value) + 1;
- setting->value = malloc(value_len);
- if (setting->value == NULL) {
- fclose(f);
- config_ini_free(state);
- return -1;
- }
+ setting->value = emalloc(value_len);
memcpy(setting->value, value, value_len);
}
@@ -285,36 +255,27 @@ config_ini_init(struct config_ini_state *state, const char *filepath)
void
config_ini_free(struct config_ini_state *state)
{
- struct config_ini_section *section = state->sections;
-
- while (section != NULL) {
- struct config_ini_setting *setting = section->settings;
- struct config_ini_section *section_prev = section;
-
- while (setting != NULL) {
- struct config_ini_setting *setting_prev = setting;
+ struct config_ini_section *section, *section_next;
+ struct config_ini_setting *setting, *setting_next;
+ for (section = state->sections; section; section = section_next) {
+ section_next = section->next;
+ for (setting = section->settings; setting; setting = setting_next) {
+ setting_next = setting->next;
free(setting->name);
free(setting->value);
- setting = setting->next;
- free(setting_prev);
+ free(setting);
}
-
free(section->name);
- section = section->next;
- free(section_prev);
+ free(section);
}
}
struct config_ini_section *
config_ini_get_section(struct config_ini_state *state, const char *name)
{
- struct config_ini_section *section = state->sections;
- while (section != NULL) {
- if (strcasecmp(section->name, name) == 0) {
+ struct config_ini_section *section;
+ for (section = state->sections; section; section = section->next)
+ if (!strcasecmp(section->name, name))
return section;
- }
- section = section->next;
- }
-
return NULL;
}
generated by cgit v1.2.3-70-g09d2 (git 2.48.0) at 2025-04-05 05:06:41 +0000