Cleanup: move all the compatibillity fluff to a dedicated "libcompat"

Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>

4 files changed, 3 insertions, 131 deletions

diff --git a/lib/util/Makemodule.am b/lib/util/Makemodule.am
index b5fef29..6a1a6a8 100644
--- a/lib/util/Makemodule.am
+++ b/lib/util/Makemodule.am
@@ -1,8 +1,6 @@
-libutil_la_SOURCES = include/util/util.h include/util/compat.h
-libutil_la_SOURCES += lib/util/str_table.c include/util/str_table.h
-libutil_la_SOURCES += lib/util/alloc.c lib/util/canonicalize_name.c
-libutil_la_SOURCES += lib/util/strndup.c lib/util/getline.c
-libutil_la_SOURCES += lib/util/getsubopt.c
+libutil_la_SOURCES = include/util/util.h include/util/str_table.h
+libutil_la_SOURCES += lib/util/str_table.c lib/util/canonicalize_name.c
+libutil_la_SOURCES += lib/util/alloc.c
 libutil_la_CFLAGS = $(AM_CFLAGS)
 libutil_la_CPPFLAGS = $(AM_CPPFLAGS)
 libutil_la_LDFLAGS = $(AM_LDFLAGS)
diff --git a/lib/util/getline.c b/lib/util/getline.c
deleted file mode 100644
index 996bef2..0000000
--- a/lib/util/getline.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* SPDX-License-Identifier: LGPL-3.0-or-later */
-/*
- * getline.c
- *
- * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
- */
-#include "config.h"
-#include "util/compat.h"
-
-#include <string.h>
-#include <stdlib.h>
-
-#ifndef HAVE_GETLINE
-ssize_t getline(char **line, size_t *n, FILE *fp)
-{
-	size_t new_cap, len = 0, cap = 0;
-	char *buffer = NULL, *new;
-	int c;
-
-	if (feof(fp) || ferror(fp))
-		return -1;
-
-	do {
-		c = fgetc(fp);
-
-		if (ferror(fp))
-			return -1;
-
-		if (c == EOF)
-			c = '\n';
-
-		if (len == cap) {
-			new_cap = cap ? cap * 2 : 32;
-			new = realloc(buffer, new_cap);
-
-			if (new == NULL)
-				return -1;
-
-			buffer = new;
-			cap = new_cap;
-		}
-
-		buffer[len++] = c;
-	} while (c != '\n');
-
-	*line = buffer;
-	*n = len;
-	return len;
-}
-#endif
diff --git a/lib/util/getsubopt.c b/lib/util/getsubopt.c
deleted file mode 100644
index 5cf19d1..0000000
--- a/lib/util/getsubopt.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* SPDX-License-Identifier: LGPL-3.0-or-later */
-/*
- * getsubopt.c
- *
- * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
- */
-#include "config.h"
-#include "util/compat.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-#ifndef HAVE_GETSUBOPT
-int getsubopt(char **opt, char *const *keys, char **val)
-{
-	char *str = *opt;
-	size_t i, len;
-
-	*val = NULL;
-	*opt = strchr(str, ',');
-
-	if (*opt == NULL) {
-		*opt = str + strlen(str);
-	} else {
-		*(*opt)++ = '\0';
-	}
-
-	for (i = 0; keys[i]; ++i) {
-		len = strlen(keys[i]);
-
-		if (strncmp(keys[i], str, len) != 0)
-			continue;
-
-		if (str[len] != '=' && str[len] != '\0')
-			continue;
-
-		if (str[len] == '=')
-			*val = str + len + 1;
-
-		return i;
-	}
-
-	return -1;
-}
-#endif
diff --git a/lib/util/strndup.c b/lib/util/strndup.c
deleted file mode 100644
index 8031d23..0000000
--- a/lib/util/strndup.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* SPDX-License-Identifier: LGPL-3.0-or-later */
-/*
- * strndup.c
- *
- * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
- */
-#include "config.h"
-#include "util/compat.h"
-
-#include <string.h>
-#include <stdlib.h>
-
-#ifndef HAVE_STRNDUP
-char *strndup(const char *str, size_t max_len)
-{
-	size_t len = 0;
-	char *out;
-
-	while (len < max_len && str[len] != '\0')
-		++len;
-
-	out = malloc(len + 1);
-
-	if (out != NULL) {
-		memcpy(out, str, len);
-		out[len] = '\0';
-	}
-
-	return out;
-}
-#endif