Add fallback implementation for getsubopt()

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

4 files changed, 51 insertions, 1 deletions

diff --git a/configure.ac b/configure.ac
index d468a2a..cb11161 100644
--- a/configure.ac
+++ b/configure.ac
@@ -218,7 +218,7 @@ AX_COMPILE_CHECK_SIZEOF(long long)
 AC_CHECK_HEADERS([sys/xattr.h], [], [])
 AC_CHECK_HEADERS([sys/sysinfo.h], [], [])
 
-AC_CHECK_FUNCS([strndup getline])
+AC_CHECK_FUNCS([strndup getline getsubopt])
 
 ##### generate output #####
 
diff --git a/include/util/compat.h b/include/util/compat.h
index 5c9e4fb..a1a45b6 100644
--- a/include/util/compat.h
+++ b/include/util/compat.h
@@ -120,4 +120,8 @@ ssize_t getline(char **line, size_t *n, FILE *fp);
 char *strndup(const char *str, size_t max_len);
 #endif
 
+#ifndef HAVE_GETSUBOPT
+int getsubopt(char **opt, char *const *keys, char **val);
+#endif
+
 #endif /* COMPAT_H */
diff --git a/lib/util/Makemodule.am b/lib/util/Makemodule.am
index 23e5c4e..b5fef29 100644
--- a/lib/util/Makemodule.am
+++ b/lib/util/Makemodule.am
@@ -2,6 +2,7 @@ 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_CFLAGS = $(AM_CFLAGS)
 libutil_la_CPPFLAGS = $(AM_CPPFLAGS)
 libutil_la_LDFLAGS = $(AM_LDFLAGS)
diff --git a/lib/util/getsubopt.c b/lib/util/getsubopt.c
new file mode 100644
index 0000000..5cf19d1
--- /dev/null
+++ b/lib/util/getsubopt.c
@@ -0,0 +1,45 @@
+/* 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