Move environment-file helpers to environment.c

Author: johanmalm

environment.c

@@ -0,0 +1,128 @@
+// SPDX-License-Identifier: GPL-2.0-only
+#define _POSIX_C_SOURCE 200809L
+#include <assert.h>
+#include <ctype.h>
+#include <dirent.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include "theme.h"
+
+static void
+rtrim(char **s)
+{
+	size_t len = strlen(*s);
+	if (!len) {
+		return;
+	}
+	char *end = *s + len - 1;
+	while (end >= *s && isspace(*end)) {
+		end--;
+	}
+	*(end + 1) = '\0';
+}
+
+static char *
+string_strip(char *s)
+{
+	rtrim(&s);
+	while (isspace(*s)) {
+		s++;
+	}
+	return s;
+}
+
+static char *
+get_value(char *line, const char *key)
+{
+	if (!line || !*line || line[0] == '#') {
+		return NULL;
+	}
+	char *p = strchr(line, '=');
+	if (!p) {
+		return NULL;
+	}
+	*p = '\0';
+	if (!!strcmp(key, string_strip(line))) {
+		return NULL;
+	}
+	char *value = string_strip(++p);
+	return value ? value : NULL;
+}
+
+void
+environment_get(char *buffer, size_t size, const char *key)
+{
+	char filename[4096];
+	snprintf(filename, sizeof(filename), "%s/%s", getenv("HOME"), ".config/labwc/environment");
+
+	char *value = NULL;
+	char *line = NULL;
+	size_t len = 0;
+	FILE *stream = fopen(filename, "r");
+	if (!stream) {
+		return;
+	}
+
+	while (getline(&line, &len, stream) != -1) {
+		char *p = strrchr(line, '\n');
+		if (p) {
+			*p = '\0';
+		}
+		value = get_value(line, key);
+		if (value) {
+			snprintf(buffer, size, "%s", value);
+			break;
+		}
+	}
+	free(line);
+	fclose(stream);
+}
+
+void
+environment_set(const char *key, const char *value)
+{
+	/* set cursor for labwc  - should cover 'replace' or 'append' */
+	char xcur[4096] = {0};
+	strcpy(xcur, key);
+	strcat(xcur, "=");
+	char filename[4096];
+	char bufname[4096];
+	char *home = getenv("HOME");
+	snprintf(filename, sizeof(filename), "%s/%s", home, ".config/labwc/environment");
+	snprintf(bufname, sizeof(bufname), "%s/%s", home, ".config/labwc/buf");
+	FILE *fe = fopen(filename, "r");
+	FILE *fw = fopen(bufname, "a");
+	if ((fe == NULL) || (fw == NULL)) {
+		perror("Unable to open file!");
+		return;
+	}
+	char chunk[128];
+	while (fgets(chunk, sizeof(chunk), fe) != NULL) {
+		if (strstr(chunk, xcur) != NULL) {
+			continue;
+		} else {
+			fprintf(fw, "%s", chunk);
+		}
+	}
+	fclose(fe);
+	if (value) {
+		fprintf(fw, "%s\n", strcat(xcur, value));
+	}
+	fclose(fw);
+	rename(bufname, filename);
+}
+
+void
+environment_set_num(const char *key, int value)
+{
+	char buffer[255];
+	snprintf(buffer, 255, "%d", value);
+
+	environment_set(key, buffer);
+}
+

environment.h

@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+#ifndef ENVIRONMENT_H
+#define ENVIRONMENT_H
+#include <stdio.h>
+
+void environment_get(char *buffer, size_t size, const char *key);
+
+void environment_set(const char *key, const char *value);
+void environment_set_num(const char *key, int value);
+
+#endif /* ENVIRONMENT_H */

keyboard-layouts.c

@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #define _POSIX_C_SOURCE 200809L
+#include <stdio.h>
 #include <stdbool.h>
 #include <string.h>
 #include "keyboard-layouts.h"

keyboard-layouts.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef KEYBOARD_LAYOUTS_H
 #define KEYBOARD_LAYOUTS_H
-#include <gtk/gtk.h>
+#include <glib.h>
 
 struct layout {
 	char *lang;

meson.build

@@ -15,6 +15,7 @@ executable(
   files(
     'main.c',
     'xml.c',
+    'environment.c',
     'theme.c',
     'keyboard-layouts.c',
     'stack-appearance.c',

stack-lang.c

@@ -1,83 +1,13 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #define _POSIX_C_SOURCE 200809L
 #include <ctype.h>
+#include "environment.h"
 #include "keyboard-layouts.h"
 #include "state.h"
 #include "stack-lang.h"
 #include "theme.h"
 #include "xml.h"
 
-static void
-rtrim(char **s)
-{
-	size_t len = strlen(*s);
-	if (!len) {
-		return;
-	}
-	char *end = *s + len - 1;
-	while (end >= *s && isspace(*end)) {
-		end--;
-	}
-	*(end + 1) = '\0';
-}
-
-static char *
-string_strip(char *s)
-{
-	rtrim(&s);
-	while (isspace(*s)) {
-		s++;
-	}
-	return s;
-}
-
-static char *
-get_value(char *line, const char *key)
-{
-	if (!line || !*line || line[0] == '#') {
-		return NULL;
-	}
-	char *p = strchr(line, '=');
-	if (!p) {
-		return NULL;
-	}
-	*p = '\0';
-	if (!!strcmp(key, string_strip(line))) {
-		return NULL;
-	}
-	char *value = string_strip(++p);
-	return value ? value : NULL;
-}
-
-static void
-environment_get(char *buffer, size_t size, const char *key)
-{
-	char filename[4096];
-	snprintf(filename, sizeof(filename), "%s/%s", getenv("HOME"), ".config/labwc/environment");
-
-	char *value = NULL;
-	char *line = NULL;
-	size_t len = 0;
-	FILE *stream = fopen(filename, "r");
-	if (!stream) {
-		return;
-	}
-
-	while (getline(&line, &len, stream) != -1) {
-		char *p = strrchr(line, '\n');
-		if (p) {
-			*p = '\0';
-		}
-		value = get_value(line, key);
-		if (value) {
-			snprintf(buffer, size, "%s", value);
-			break;
-		}
-	}
-	free(line);
-	fclose(stream);
-}
-
 void
 stack_lang_init(struct state *state, GtkWidget *stack)
 {

update.c

@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #include <assert.h>
+#include "environment.h"
 #include "state.h"
 #include "update.h"
 #include "xml.h"
@@ -16,49 +17,6 @@ spawn_sync(char const *command)
 	}
 }
 
-static void
-environment_set(const char *key, const char *value)
-{
-	/* set cursor for labwc  - should cover 'replace' or 'append' */
-	char xcur[4096] = {0};
-	strcpy(xcur, key);
-	strcat(xcur, "=");
-	char filename[4096];
-	char bufname[4096];
-	char *home = getenv("HOME");
-	snprintf(filename, sizeof(filename), "%s/%s", home, ".config/labwc/environment");
-	snprintf(bufname, sizeof(bufname), "%s/%s", home, ".config/labwc/buf");
-	FILE *fe = fopen(filename, "r");
-	FILE *fw = fopen(bufname, "a");
-	if ((fe == NULL) || (fw == NULL)) {
-		perror("Unable to open file!");
-		return;
-	}
-	char chunk[128];
-	while (fgets(chunk, sizeof(chunk), fe) != NULL) {
-		if (strstr(chunk, xcur) != NULL) {
-			continue;
-		} else {
-			fprintf(fw, "%s", chunk);
-		}
-	}
-	fclose(fe);
-	if (value) {
-		fprintf(fw, "%s\n", strcat(xcur, value));
-	}
-	fclose(fw);
-	rename(bufname, filename);
-}
-
-static void
-environment_set_num(const char *key, int value)
-{
-	char buffer[255];
-	snprintf(buffer, 255, "%d", value);
-
-	environment_set(key, buffer);
-}
-
 static const char
 *first_field(const char *s, char delim)
 {