X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ftest%2Ftest-fileio.c;h=1b998281912543a927ad00fa42997881d291a523;hb=c2fa048c4a70c8386c6d8fe939e5ea9edecf1e98;hp=06f3e28288abb0542ddf3c3c7770df746e0c5d00;hpb=1e5413f74faa378172d556e5dec35ab55de16bbf;p=elogind.git diff --git a/src/test/test-fileio.c b/src/test/test-fileio.c index 06f3e2828..1b9982819 100644 --- a/src/test/test-fileio.c +++ b/src/test/test-fileio.c @@ -41,9 +41,11 @@ static void test_parse_env_file(void) { char **i; unsigned k; - assert_se(mktemp(p)); + fd = mkostemp_safe(p, O_RDWR|O_CLOEXEC); + assert_se(fd >= 0); + close(fd); - fd = mkostemp(t, O_CLOEXEC); + fd = mkostemp_safe(t, O_RDWR|O_CLOEXEC); assert_se(fd >= 0); f = fdopen(fd, "w"); @@ -70,22 +72,22 @@ static void test_parse_env_file(void) { fflush(f); fclose(f); - r = load_env_file(t, NULL, &a); + r = load_env_file(NULL, t, NULL, &a); assert_se(r >= 0); STRV_FOREACH(i, a) log_info("Got: <%s>", *i); - assert_se(streq(a[0], "one=BAR")); - assert_se(streq(a[1], "two=bar")); - assert_se(streq(a[2], "three=333\nxxxx")); - assert_se(streq(a[3], "four=44\"44")); - assert_se(streq(a[4], "five=55\'55FIVEcinco")); - assert_se(streq(a[5], "six=seis sechs sis")); - assert_se(streq(a[6], "seven=sevenval#nocomment")); - assert_se(streq(a[7], "eight=eightval #nocomment")); - assert_se(streq(a[8], "export nine=nineval")); - assert_se(streq(a[9], "ten=")); + assert_se(streq_ptr(a[0], "one=BAR")); + assert_se(streq_ptr(a[1], "two=bar")); + assert_se(streq_ptr(a[2], "three=333\nxxxx")); + assert_se(streq_ptr(a[3], "four=44\"44")); + assert_se(streq_ptr(a[4], "five=55\'55FIVEcinco")); + assert_se(streq_ptr(a[5], "six=seis sechs sis")); + assert_se(streq_ptr(a[6], "seven=sevenval#nocomment")); + assert_se(streq_ptr(a[7], "eight=eightval #nocomment")); + assert_se(streq_ptr(a[8], "export nine=nineval")); + assert_se(streq_ptr(a[9], "ten=")); assert_se(a[10] == NULL); strv_env_clean_log(a, "test"); @@ -137,7 +139,7 @@ static void test_parse_env_file(void) { r = write_env_file(p, a); assert_se(r >= 0); - r = load_env_file(p, NULL, &b); + r = load_env_file(NULL, p, NULL, &b); assert_se(r >= 0); unlink(t); @@ -152,9 +154,11 @@ static void test_parse_multiline_env_file(void) { _cleanup_strv_free_ char **a = NULL, **b = NULL; char **i; - assert_se(mktemp(p)); + fd = mkostemp_safe(p, O_RDWR|O_CLOEXEC); + assert_se(fd >= 0); + close(fd); - fd = mkostemp(t, O_CLOEXEC); + fd = mkostemp_safe(t, O_RDWR|O_CLOEXEC); assert_se(fd >= 0); f = fdopen(fd, "w"); @@ -175,21 +179,21 @@ static void test_parse_multiline_env_file(void) { fflush(f); fclose(f); - r = load_env_file(t, NULL, &a); + r = load_env_file(NULL, t, NULL, &a); assert_se(r >= 0); STRV_FOREACH(i, a) log_info("Got: <%s>", *i); - assert_se(streq(a[0], "one=BAR VAR\tGAR")); - assert_se(streq(a[1], "two=bar var\tgar")); - assert_se(streq(a[2], "tri=bar var \tgar ")); + assert_se(streq_ptr(a[0], "one=BAR VAR\tGAR")); + assert_se(streq_ptr(a[1], "two=bar var\tgar")); + assert_se(streq_ptr(a[2], "tri=bar var \tgar ")); assert_se(a[3] == NULL); r = write_env_file(p, a); assert_se(r >= 0); - r = load_env_file(p, NULL, &b); + r = load_env_file(NULL, p, NULL, &b); assert_se(r >= 0); unlink(t); @@ -203,7 +207,7 @@ static void test_executable_is_script(void) { FILE *f; char *command; - fd = mkostemp(t, O_CLOEXEC); + fd = mkostemp_safe(t, O_RDWR|O_CLOEXEC); assert_se(fd >= 0); f = fdopen(fd, "w"); @@ -286,6 +290,71 @@ static void test_capeff(void) { } } +static void test_write_string_stream(void) { + char fn[] = "/tmp/test-write_string_stream-XXXXXX"; + _cleanup_fclose_ FILE *f = NULL; + int fd; + char buf[64]; + + fd = mkostemp_safe(fn, O_RDWR); + assert_se(fd >= 0); + + f = fdopen(fd, "r"); + assert_se(f); + assert_se(write_string_stream(f, "boohoo") < 0); + + f = freopen(fn, "r+", f); + assert_se(f); + + assert_se(write_string_stream(f, "boohoo") == 0); + rewind(f); + + assert_se(fgets(buf, sizeof(buf), f)); + assert_se(streq(buf, "boohoo\n")); + + unlink(fn); +} + +static void test_write_string_file(void) { + char fn[] = "/tmp/test-write_string_file-XXXXXX"; + char buf[64] = {}; + _cleanup_close_ int fd; + + fd = mkostemp_safe(fn, O_RDWR); + assert_se(fd >= 0); + + assert_se(write_string_file(fn, "boohoo") == 0); + + assert_se(read(fd, buf, sizeof(buf)) == 7); + assert_se(streq(buf, "boohoo\n")); + + unlink(fn); +} + +static void test_sendfile_full(void) { + char in_fn[] = "/tmp/test-sendfile_full-XXXXXX"; + char out_fn[] = "/tmp/test-sendfile_full-XXXXXX"; + _cleanup_close_ int in_fd, out_fd; + char text[] = "boohoo\nfoo\n\tbar\n"; + char buf[64] = {0}; + + in_fd = mkostemp_safe(in_fn, O_RDWR); + assert_se(in_fd >= 0); + out_fd = mkostemp_safe(out_fn, O_RDWR); + assert_se(out_fd >= 0); + + assert_se(write_string_file(in_fn, text) == 0); + assert_se(sendfile_full(out_fd, "/a/file/which/does/not/exist/i/guess") < 0); + assert_se(sendfile_full(out_fd, in_fn) == sizeof(text) - 1); + assert_se(lseek(out_fd, SEEK_SET, 0) == 0); + + assert_se(read(out_fd, buf, sizeof(buf)) == sizeof(text) - 1); + assert_se(streq(buf, text)); + + unlink(in_fn); + unlink(out_fn); +} + int main(int argc, char *argv[]) { log_parse_environment(); log_open(); @@ -295,6 +364,9 @@ int main(int argc, char *argv[]) { test_executable_is_script(); test_status_field(); test_capeff(); + test_write_string_stream(); + test_write_string_file(); + test_sendfile_full(); return 0; }