From: Alberto Leiva Popper <ydahhrk@gmail.com>
Date: Fri, 20 Oct 2023 22:14:21 +0000 (-0600)
Subject: Patch errors detected by unit tests
X-Git-Tag: 1.6.0~41
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6125d017f3a480bb5b6f007de3f6b8819b7cb2ce;p=thirdparty%2FFORT-validator.git

Patch errors detected by unit tests
---

diff --git a/src/common.c b/src/common.c
index f09cf321..d83eb399 100644
--- a/src/common.c
+++ b/src/common.c
@@ -288,8 +288,12 @@ create_dir_recursive(char const *path, bool include_basename)
 	}
 
 	result = dir_exists(localuri); /* short circuit */
-	if (result != 0)
+	if (result > 0) {
+		result = 0;
 		goto end;
+	} else if (result < 0) {
+		goto end;
+	}
 
 	for (i = 1; localuri[i] != '\0'; i++) {
 		if (localuri[i] == '/') {
diff --git a/test/types/uri_test.c b/test/types/uri_test.c
index 052fae1b..66852180 100644
--- a/test/types/uri_test.c
+++ b/test/types/uri_test.c
@@ -144,13 +144,13 @@ START_TEST(check_caged)
 
 	ck_assert_int_eq(0, uri_create(&notification, UT_HTTPS, "https://a.b.c/d/e.xml"));
 	ck_assert_int_eq(0, uri_create(&uri, UT_CAGED, "rsync://x.y.z/v/w.cer"));
-	ck_assert_str_eq("rrdp/a.b.c/d/e.xml/x.y.z/v/w.cer", uri_get_local(uri));
+	ck_assert_str_eq("tmp/rrdp/a.b.c/d/e.xml/x.y.z/v/w.cer", uri_get_local(uri));
 	uri_refput(uri);
 	uri_refput(notification);
 
 	ck_assert_int_eq(0, uri_create(&notification, UT_HTTPS, "https://a.b.c"));
 	ck_assert_int_eq(0, uri_create(&uri, UT_CAGED, "rsync://w"));
-	ck_assert_str_eq("rrdp/a.b.c/w", uri_get_local(uri));
+	ck_assert_str_eq("tmp/rrdp/a.b.c/w", uri_get_local(uri));
 	uri_refput(uri);
 	uri_refput(notification);
 }