diff options
author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2023-05-05 01:25:43 +0200 |
---|---|---|
committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2023-05-05 01:26:06 +0200 |
commit | 7ce4b36d517ac5fade36240d293ff784ef6a9305 (patch) | |
tree | f0c246595251d27f62010aca770b25bb5f7ea336 /lib/fstree/test/mknode_simple.c | |
parent | 7a39921d7fff089c87ac183d3c0d6e42e5cbaa04 (diff) |
Internalize fstree_mknode, consolidate fstree functionality
The fstree_mknode function is only used internally, remove the
declaration from the header and internalize it. The code using it is
consolidated into fstree.c.
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'lib/fstree/test/mknode_simple.c')
-rw-r--r-- | lib/fstree/test/mknode_simple.c | 47 |
1 files changed, 31 insertions, 16 deletions
diff --git a/lib/fstree/test/mknode_simple.c b/lib/fstree/test/mknode_simple.c index c7efb49..a96ee42 100644 --- a/lib/fstree/test/mknode_simple.c +++ b/lib/fstree/test/mknode_simple.c @@ -11,12 +11,17 @@ int main(int argc, char **argv) { + fstree_defaults_t defaults; tree_node_t *node; struct stat sb; fstree_t fs; + int ret; (void)argc; (void)argv; - memset(&fs, 0, sizeof(fs)); + memset(&defaults, 0, sizeof(defaults)); + ret = fstree_init(&fs, &defaults); + TEST_EQUAL_I(ret, 0); + memset(&sb, 0, sizeof(sb)); sb.st_mode = S_IFSOCK | 0654; sb.st_uid = 123; @@ -24,19 +29,22 @@ int main(int argc, char **argv) sb.st_rdev = 789; sb.st_size = 1337; - node = fstree_mknode(NULL, "sockfile", 8, NULL, &sb); + node = fstree_add_generic(&fs, "/sockfile", &sb, "target"); + TEST_NOT_NULL(node); + TEST_ASSERT(node->parent == fs.root); TEST_ASSERT((char *)node->name >= (char *)node->payload); TEST_STR_EQUAL(node->name, "sockfile"); TEST_EQUAL_UI(node->uid, sb.st_uid); TEST_EQUAL_UI(node->gid, sb.st_gid); TEST_EQUAL_UI(node->mode, sb.st_mode); TEST_EQUAL_UI(node->link_count, 1); - TEST_NULL(node->parent); TEST_NULL(node->data.target); TEST_EQUAL_UI(node->data.devno, 0); - free(node); - memset(&fs, 0, sizeof(fs)); + fstree_cleanup(&fs); + ret = fstree_init(&fs, &defaults); + TEST_EQUAL_I(ret, 0); + memset(&sb, 0, sizeof(sb)); sb.st_mode = S_IFIFO | 0654; sb.st_uid = 123; @@ -44,19 +52,22 @@ int main(int argc, char **argv) sb.st_rdev = 789; sb.st_size = 1337; - node = fstree_mknode(NULL, "fifo", 4, NULL, &sb); + node = fstree_add_generic(&fs, "/fifo", &sb, "target"); + TEST_NOT_NULL(node); + TEST_ASSERT(node->parent == fs.root); TEST_ASSERT((char *)node->name >= (char *)node->payload); TEST_STR_EQUAL(node->name, "fifo"); TEST_EQUAL_UI(node->uid, sb.st_uid); TEST_EQUAL_UI(node->gid, sb.st_gid); TEST_EQUAL_UI(node->mode, sb.st_mode); TEST_EQUAL_UI(node->link_count, 1); - TEST_NULL(node->parent); TEST_NULL(node->data.target); TEST_EQUAL_UI(node->data.devno, 0); - free(node); - memset(&fs, 0, sizeof(fs)); + fstree_cleanup(&fs); + ret = fstree_init(&fs, &defaults); + TEST_EQUAL_I(ret, 0); + memset(&sb, 0, sizeof(sb)); sb.st_mode = S_IFBLK | 0654; sb.st_uid = 123; @@ -64,7 +75,9 @@ int main(int argc, char **argv) sb.st_rdev = 789; sb.st_size = 1337; - node = fstree_mknode(NULL, "blkdev", 6, NULL, &sb); + node = fstree_add_generic(&fs, "/blkdev", &sb, NULL); + TEST_NOT_NULL(node); + TEST_ASSERT(node->parent == fs.root); TEST_ASSERT((char *)node->name >= (char *)node->payload); TEST_STR_EQUAL(node->name, "blkdev"); TEST_EQUAL_UI(node->uid, sb.st_uid); @@ -72,10 +85,11 @@ int main(int argc, char **argv) TEST_EQUAL_UI(node->mode, sb.st_mode); TEST_EQUAL_UI(node->link_count, 1); TEST_EQUAL_UI(node->data.devno, sb.st_rdev); - TEST_NULL(node->parent); - free(node); - memset(&fs, 0, sizeof(fs)); + fstree_cleanup(&fs); + ret = fstree_init(&fs, &defaults); + TEST_EQUAL_I(ret, 0); + memset(&sb, 0, sizeof(sb)); sb.st_mode = S_IFCHR | 0654; sb.st_uid = 123; @@ -83,7 +97,9 @@ int main(int argc, char **argv) sb.st_rdev = 789; sb.st_size = 1337; - node = fstree_mknode(NULL, "chardev", 7, NULL, &sb); + node = fstree_add_generic(&fs, "/chardev", &sb, NULL); + TEST_NOT_NULL(node); + TEST_ASSERT(node->parent == fs.root); TEST_ASSERT((char *)node->name >= (char *)node->payload); TEST_STR_EQUAL(node->name, "chardev"); TEST_EQUAL_UI(node->uid, sb.st_uid); @@ -91,8 +107,7 @@ int main(int argc, char **argv) TEST_EQUAL_UI(node->mode, sb.st_mode); TEST_EQUAL_UI(node->link_count, 1); TEST_EQUAL_UI(node->data.devno, sb.st_rdev); - TEST_NULL(node->parent); - free(node); + fstree_cleanup(&fs); return EXIT_SUCCESS; } |