New upstream version 1.11.0+dfsgupstream/1.11.0+dfsg

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 44 insertions, 0 deletions

diff --git a/src/unit_test.c b/daemon/unit_test.c
index e3eb146ad..9978647b4 100644
--- a/src/unit_test.c
+++ b/daemon/unit_test.c
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 #include "common.h"
 
 static int check_number_printing(void) {
@@ -1197,8 +1199,50 @@ static int test_variable_renames(void) {
     return 1;
 }
 
+int check_strdupz_path_subpath() {
+
+    struct strdupz_path_subpath_checks {
+        const char *path;
+        const char *subpath;
+        const char *result;
+    } checks[] = {
+            { "",                "",            "."                     },
+            { "/",               "",            "/"                     },
+            { "/etc/netdata",    "",            "/etc/netdata"          },
+            { "/etc/netdata///", "",            "/etc/netdata"          },
+            { "/etc/netdata///", "health.d",    "/etc/netdata/health.d" },
+            { "/etc/netdata///", "///health.d", "/etc/netdata/health.d" },
+            { "/etc/netdata",    "///health.d", "/etc/netdata/health.d" },
+            { "",                "///health.d", "./health.d"            },
+            { "/",               "///health.d", "/health.d"             },
+
+            // terminator
+            { NULL, NULL, NULL }
+    };
+
+    size_t i;
+    for(i = 0; checks[i].result ; i++) {
+        char *s = strdupz_path_subpath(checks[i].path, checks[i].subpath);
+        fprintf(stderr, "strdupz_path_subpath(\"%s\", \"%s\") = \"%s\": ", checks[i].path, checks[i].subpath, s);
+        if(!s || strcmp(s, checks[i].result) != 0) {
+            freez(s);
+            fprintf(stderr, "FAILED\n");
+            return 1;
+        }
+        else {
+            freez(s);
+            fprintf(stderr, "OK\n");
+        }
+    }
+
+    return 0;
+}
+
 int run_all_mockup_tests(void)
 {
+    if(check_strdupz_path_subpath())
+        return 1;
+
     if(check_number_printing())
         return 1;