diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-10-19 09:30:30 +0200 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-10-19 10:10:50 +0200 |
commit | a3ee0916b14b0a319ee2d8bca283a8c1f17e29ef (patch) | |
tree | 59283bfeae3880f481985d7bc1ad3d7d8bdfef07 /src | |
parent | 9ca1efbc4624efab1fb30acd79f7b84c53d18206 (diff) | |
download | systemd-a3ee0916b14b0a319ee2d8bca283a8c1f17e29ef.tar.gz |
resolved,test-fileio: use "re" when opening files
This doesn't matter too much, because neither of those programs forks, but
let's dot he generally correct thing anyway.
Diffstat (limited to 'src')
-rw-r--r-- | src/resolve/resolved-dns-trust-anchor.c | 2 | ||||
-rw-r--r-- | src/test/test-fileio.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/resolve/resolved-dns-trust-anchor.c b/src/resolve/resolved-dns-trust-anchor.c index 9dbe861070..69a484dc12 100644 --- a/src/resolve/resolved-dns-trust-anchor.c +++ b/src/resolve/resolved-dns-trust-anchor.c @@ -423,7 +423,7 @@ static int dns_trust_anchor_load_files( _cleanup_fclose_ FILE *g = NULL; unsigned n = 0; - g = fopen(*f, "r"); + g = fopen(*f, "re"); if (!g) { if (errno == ENOENT) continue; diff --git a/src/test/test-fileio.c b/src/test/test-fileio.c index 2cc7107803..4f084f6162 100644 --- a/src/test/test-fileio.c +++ b/src/test/test-fileio.c @@ -554,15 +554,15 @@ TEST(search_and_fopen) { f = safe_fclose(f); p = mfree(p); - r = search_and_fopen("/a/file/which/does/not/exist/i/guess", "r", NULL, (const char**) dirs, &f, &p); + r = search_and_fopen("/a/file/which/does/not/exist/i/guess", "re", NULL, (const char**) dirs, &f, &p); assert_se(r == -ENOENT); - r = search_and_fopen("afilewhichdoesnotexistiguess", "r", NULL, (const char**) dirs, &f, &p); + r = search_and_fopen("afilewhichdoesnotexistiguess", "re", NULL, (const char**) dirs, &f, &p); assert_se(r == -ENOENT); r = unlink(name); assert_se(r == 0); - r = search_and_fopen(basename(name), "r", NULL, (const char**) dirs, &f, &p); + r = search_and_fopen(basename(name), "re", NULL, (const char**) dirs, &f, &p); assert_se(r == -ENOENT); } @@ -595,15 +595,15 @@ TEST(search_and_fopen_nulstr) { f = safe_fclose(f); p = mfree(p); - r = search_and_fopen_nulstr("/a/file/which/does/not/exist/i/guess", "r", NULL, dirs, &f, &p); + r = search_and_fopen_nulstr("/a/file/which/does/not/exist/i/guess", "re", NULL, dirs, &f, &p); assert_se(r == -ENOENT); - r = search_and_fopen_nulstr("afilewhichdoesnotexistiguess", "r", NULL, dirs, &f, &p); + r = search_and_fopen_nulstr("afilewhichdoesnotexistiguess", "re", NULL, dirs, &f, &p); assert_se(r == -ENOENT); r = unlink(name); assert_se(r == 0); - r = search_and_fopen_nulstr(basename(name), "r", NULL, dirs, &f, &p); + r = search_and_fopen_nulstr(basename(name), "re", NULL, dirs, &f, &p); assert_se(r == -ENOENT); } |