chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-event: fix typo
[elogind.git]
/
src
/
test
/
test-copy.c
diff --git
a/src/test/test-copy.c
b/src/test/test-copy.c
index d70a0be2a22b798052073756645a18c9d02b5195..5c96f610053b6d0dca325ca3458620b9cde5b1a4 100644
(file)
--- a/
src/test/test-copy.c
+++ b/
src/test/test-copy.c
@@
-44,7
+44,7
@@
static void test_copy_file(void) {
assert_se(write_string_file(fn, "foo bar bar bar foo") == 0);
assert_se(write_string_file(fn, "foo bar bar bar foo") == 0);
- assert_se(copy_file(fn, fn_copy, 0, 0644) == 0);
+ assert_se(copy_file(fn, fn_copy, 0, 0644
, 0
) == 0);
assert_se(read_full_file(fn_copy, &buf, &sz) == 0);
assert_se(streq(buf, "foo bar bar bar foo\n"));
assert_se(read_full_file(fn_copy, &buf, &sz) == 0);
assert_se(streq(buf, "foo bar bar bar foo\n"));
@@
-90,15
+90,15
@@
static void test_copy_tree(void) {
rm_rf_dangerous(original_dir, false, true, false);
STRV_FOREACH(p, files) {
rm_rf_dangerous(original_dir, false, true, false);
STRV_FOREACH(p, files) {
- char *f = str
append
a(original_dir, *p);
+ char *f = str
join
a(original_dir, *p);
assert_se(mkdir_parents(f, 0755) >= 0);
assert_se(write_string_file(f, "file") == 0);
}
STRV_FOREACH_PAIR(link, p, links) {
assert_se(mkdir_parents(f, 0755) >= 0);
assert_se(write_string_file(f, "file") == 0);
}
STRV_FOREACH_PAIR(link, p, links) {
- char *f = str
append
a(original_dir, *p);
- char *l = str
append
a(original_dir, *link);
+ char *f = str
join
a(original_dir, *p);
+ char *l = str
join
a(original_dir, *link);
assert_se(mkdir_parents(l, 0755) >= 0);
assert_se(symlink(f, l) == 0);
assert_se(mkdir_parents(l, 0755) >= 0);
assert_se(symlink(f, l) == 0);
@@
-109,7
+109,7
@@
static void test_copy_tree(void) {
STRV_FOREACH(p, files) {
_cleanup_free_ char *buf = NULL;
size_t sz = 0;
STRV_FOREACH(p, files) {
_cleanup_free_ char *buf = NULL;
size_t sz = 0;
- char *f = str
append
a(copy_dir, *p);
+ char *f = str
join
a(copy_dir, *p);
assert_se(access(f, F_OK) == 0);
assert_se(read_full_file(f, &buf, &sz) == 0);
assert_se(access(f, F_OK) == 0);
assert_se(read_full_file(f, &buf, &sz) == 0);
@@
-118,8
+118,8
@@
static void test_copy_tree(void) {
STRV_FOREACH_PAIR(link, p, links) {
_cleanup_free_ char *target = NULL;
STRV_FOREACH_PAIR(link, p, links) {
_cleanup_free_ char *target = NULL;
- char *f = str
append
a(original_dir, *p);
- char *l = str
append
a(copy_dir, *link);
+ char *f = str
join
a(original_dir, *p);
+ char *l = str
join
a(copy_dir, *link);
assert_se(readlink_and_canonicalize(l, &target) == 0);
assert_se(path_equal(f, target));
assert_se(readlink_and_canonicalize(l, &target) == 0);
assert_se(path_equal(f, target));