shared: add API for replacing @FOO@ style variables in strings

diff --git a/.gitignore b/.gitignore
index 94a85423ab6184d5c3b5fd7070f312a8659cd691..18e4e23c507fdfe6f065cc1fa9f08312dd6eebec 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+/test-replace-var

 /test-journal-enum
 /test-sleep
 /localectl
 /test-journal-enum
 /test-sleep
 /localectl

diff --git a/Makefile.am b/Makefile.am
index 452de152dc42ade459126f77c5a6493b46caf28d..53a3bb9f900897e6b02fbe8272bf8e94cbd47bab 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -798,6 +798,8 @@ libsystemd_shared_la_SOURCES = \
        src/shared/spawn-ask-password-agent.h \
        src/shared/specifier.c \
        src/shared/specifier.h \
        src/shared/spawn-ask-password-agent.h \
        src/shared/specifier.c \
        src/shared/specifier.h \

+       src/shared/replace-var.c \
+       src/shared/replace-var.h \

        src/shared/spawn-polkit-agent.c \
        src/shared/spawn-polkit-agent.h \
        src/shared/hwclock.c \
        src/shared/spawn-polkit-agent.c \
        src/shared/spawn-polkit-agent.h \
        src/shared/hwclock.c \


@@ -1182,7 +1184,8 @@ noinst_PROGRAMS += \
        test-log \
        test-unit-file \
        test-date \
        test-log \
        test-unit-file \
        test-date \

-       test-sleep
+       test-sleep \
+       test-replace-var

 
 TESTS += \
        test-job-type \
 
 TESTS += \
        test-job-type \


@@ -1191,7 +1194,8 @@ TESTS += \
        test-unit-name \
        test-unit-file \
        test-date \
        test-unit-name \
        test-unit-file \
        test-date \

-       test-sleep
+       test-sleep \
+       test-replace-var

 
 test_engine_SOURCES = \
        src/test/test-engine.c
 
 test_engine_SOURCES = \
        src/test/test-engine.c


@@ -1265,6 +1269,12 @@ test_sleep_SOURCES = \
 test_sleep_LDADD = \
        libsystemd-core.la
 
 test_sleep_LDADD = \
        libsystemd-core.la
 

+test_replace_var_SOURCES = \
+       src/test/test-replace-var.c
+
+test_replace_var_LDADD = \
+       libsystemd-shared.la
+

 test_daemon_SOURCES = \
        src/test/test-daemon.c
 
 test_daemon_SOURCES = \
        src/test/test-daemon.c
 

diff --git a/src/shared/replace-var.c b/src/shared/replace-var.c
new file mode 100644 (file)
index 0000000..e11c57a
--- /dev/null
+++ b/src/shared/replace-var.c
@@ -0,0 +1,110 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+/***
+  This file is part of systemd.
+
+  Copyright 2012 Lennart Poettering
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include <string.h>
+
+#include "macro.h"
+#include "util.h"
+#include "replace-var.h"
+
+/*
+ * Generic infrastructure for replacing @FOO@ style variables in
+ * strings. Will call a callback for each replacement.
+ */
+
+static int get_variable(const char *b, char **r) {
+        size_t k;
+        char *t;
+
+        assert(b);
+        assert(r);
+
+        if (*b != '@')
+                return 0;
+
+        k = strspn(b + 1, "ABCDEFGHIJKLMNOPQRSTUVWXYZ_");
+        if (k <= 0 || b[k+1] != '@')
+                return 0;
+
+        t = strndup(b + 1, k);
+        if (!t)
+                return -ENOMEM;
+
+        *r = t;
+        return 1;
+}
+
+char *replace_var(const char *text, char *(*lookup)(const char *variable, void*userdata), void *userdata) {
+        char *r, *t;
+        const char *f;
+        size_t l;
+
+        assert(text);
+        assert(lookup);
+
+        l = strlen(text);
+        r = new(char, l+1);
+        if (!r)
+                return NULL;
+
+        f = text;
+        t = r;
+        while (*f) {
+                _cleanup_free_ char *v = NULL, *n = NULL;
+                char *a;
+                int k;
+                size_t skip, d, nl;
+
+                k = get_variable(f, &v);
+                if (k < 0)
+                        goto oom;
+                if (k == 0) {
+                        *(t++) = *(f++);
+                        continue;
+                }
+
+                n = lookup(v, userdata);
+                if (!n)
+                        goto oom;
+
+                skip = strlen(v) + 2;
+
+                d = t - r;
+                nl = l - skip + strlen(n);
+                a = realloc(r, nl + 1);
+                if (!a)
+                        goto oom;
+
+                l = nl;
+                r = a;
+                t = r + d;
+
+                t = stpcpy(t, n);
+                f += skip;
+        }
+
+        *t = 0;
+        return r;
+
+oom:
+        free(r);
+        return NULL;
+}

diff --git a/src/shared/replace-var.h b/src/shared/replace-var.h
new file mode 100644 (file)
index 0000000..7eaee93
--- /dev/null
+++ b/src/shared/replace-var.h
@@ -0,0 +1,24 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+#pragma once
+
+/***
+  This file is part of systemd.
+
+  Copyright 2012 Lennart Poettering
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+char *replace_var(const char *text, char *(*lookup)(const char *variable, void*userdata), void *userdata);

diff --git a/src/test/test-replace-var.c b/src/test/test-replace-var.c
new file mode 100644 (file)
index 0000000..b1d42d7
--- /dev/null
+++ b/src/test/test-replace-var.c
@@ -0,0 +1,46 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+/***
+  This file is part of systemd.
+
+  Copyright 2012 Lennart Poettering
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include <string.h>
+
+#include "util.h"
+#include "macro.h"
+#include "replace-var.h"
+
+static char *lookup(const char *variable, void *userdata) {
+        return strjoin("<<<", variable, ">>>", NULL);
+}
+
+int main(int argc, char *argv[]) {
+        char *r;
+
+        assert_se(r = replace_var("@@@foobar@xyz@HALLO@foobar@test@@testtest@TEST@...@@@", lookup, NULL));
+        puts(r);
+        assert_se(streq(r, "@@@foobar@xyz<<<HALLO>>>foobar@test@@testtest<<<TEST>>>...@@@"));
+        free(r);
+
+        assert_se(r = strreplace("XYZFFFFXYZFFFFXYZ", "XYZ", "ABC"));
+        puts(r);
+        assert_se(streq(r, "ABCFFFFABCFFFFABC"));
+        free(r);
+
+        return 0;
+}