Patch errors detected by unit tests

diff --git a/src/common.c b/src/common.c
index f09cf321921292f1541a6982d5f8fb0d7d463256..d83eb39931bd8332c2d4653256a39d62a2fadcaa 100644 (file)
--- 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 052fae1b71c59df47ac0b91e39f818606ea331c2..66852180981138b67427a0e4a8f500118876ed5a 100644 (file)
--- 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);
 }