aboutsummaryrefslogtreecommitdiff
path: root/lib/fstree/test/add_by_path.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/fstree/test/add_by_path.c')
-rw-r--r--lib/fstree/test/add_by_path.c107
1 files changed, 60 insertions, 47 deletions
diff --git a/lib/fstree/test/add_by_path.c b/lib/fstree/test/add_by_path.c
index 7df1e55..7fb9d37 100644
--- a/lib/fstree/test/add_by_path.c
+++ b/lib/fstree/test/add_by_path.c
@@ -10,11 +10,24 @@
#include "common.h"
#include "util/test.h"
+static dir_entry_t *mkentry(const char *name, sqfs_u16 mode, sqfs_u32 uid,
+ sqfs_u32 gid)
+{
+ dir_entry_t *ent = calloc(1, sizeof(*ent) + strlen(name) + 1);
+
+ TEST_NOT_NULL(ent);
+ strcpy(ent->name, name);
+ ent->mode = mode;
+ ent->uid = uid;
+ ent->gid = gid;
+ return ent;
+}
+
int main(int argc, char **argv)
{
fstree_defaults_t fsd;
tree_node_t *a, *b;
- struct stat sb;
+ dir_entry_t *ent;
fstree_t fs;
char *opts;
(void)argc; (void)argv;
@@ -23,20 +36,16 @@ int main(int argc, char **argv)
TEST_ASSERT(parse_fstree_defaults(&fsd, opts) == 0);
free(opts);
TEST_ASSERT(fstree_init(&fs, &fsd) == 0);
-
- memset(&sb, 0, sizeof(sb));
- sb.st_mode = S_IFDIR | 0750;
- sb.st_uid = 1000;
- sb.st_gid = 100;
-
TEST_EQUAL_UI(fs.root->link_count, 2);
- a = fstree_add_generic(&fs, "dir", &sb, NULL);
+ ent = mkentry("dir", S_IFDIR | 0750, 1000, 100);
+ a = fstree_add_generic(&fs, ent, NULL);
+ free(ent);
TEST_NOT_NULL(a);
TEST_STR_EQUAL(a->name, "dir");
- TEST_EQUAL_UI(a->mode, sb.st_mode);
- TEST_EQUAL_UI(a->uid, sb.st_uid);
- TEST_EQUAL_UI(a->gid, sb.st_gid);
+ TEST_EQUAL_UI(a->mode, (S_IFDIR | 0750));
+ TEST_EQUAL_UI(a->uid, 1000);
+ TEST_EQUAL_UI(a->gid, 100);
TEST_ASSERT(a->parent == fs.root);
TEST_EQUAL_UI(a->link_count, 2);
TEST_NULL(a->next);
@@ -44,61 +53,68 @@ int main(int argc, char **argv)
TEST_EQUAL_UI(fs.root->link_count, 3);
TEST_ASSERT(!(a->flags & FLAG_DIR_CREATED_IMPLICITLY));
- memset(&sb, 0, sizeof(sb));
- sb.st_mode = S_IFBLK | 0640;
- sb.st_rdev = 1234;
-
- b = fstree_add_generic(&fs, "blkdev", &sb, NULL);
+ ent = mkentry("blkdev", S_IFBLK | 0640, 0, 0);
+ ent->rdev = 1234;
+ b = fstree_add_generic(&fs, ent, NULL);
+ free(ent);
TEST_NOT_NULL(b);
TEST_ASSERT(b != a);
TEST_STR_EQUAL(b->name, "blkdev");
- TEST_EQUAL_UI(b->mode, sb.st_mode);
- TEST_EQUAL_UI(b->uid, sb.st_uid);
- TEST_EQUAL_UI(b->gid, sb.st_gid);
+ TEST_EQUAL_UI(b->mode, (S_IFBLK | 0640));
+ TEST_EQUAL_UI(b->uid, 0);
+ TEST_EQUAL_UI(b->gid, 0);
TEST_ASSERT(b->parent == fs.root);
TEST_EQUAL_UI(b->link_count, 1);
- TEST_EQUAL_UI(b->data.devno, sb.st_rdev);
+ TEST_EQUAL_UI(b->data.devno, 1234);
TEST_ASSERT(b->next == a);
TEST_EQUAL_UI(fs.root->link_count, 4);
TEST_ASSERT(fs.root->data.children == b);
- TEST_NULL(fstree_add_generic(&fs, "blkdev/foo", &sb, NULL));
+ ent = mkentry("blkdev/foo", S_IFBLK | 0640, 0, 0);
+ TEST_NULL(fstree_add_generic(&fs, ent, NULL));
TEST_EQUAL_UI(errno, ENOTDIR);
+ free(ent);
- TEST_NULL(fstree_add_generic(&fs, "dir", &sb, NULL));
+ ent = mkentry("dir", S_IFBLK | 0640, 0, 0);
+ TEST_NULL(fstree_add_generic(&fs, ent, NULL));
TEST_EQUAL_UI(errno, EEXIST);
+ free(ent);
- memset(&sb, 0, sizeof(sb));
- sb.st_mode = S_IFDIR | 0755;
- TEST_NULL(fstree_add_generic(&fs, "dir", &sb, NULL));
+ ent = mkentry("dir", S_IFDIR | 0755, 0, 0);
+ TEST_NULL(fstree_add_generic(&fs, ent, NULL));
TEST_EQUAL_UI(errno, EEXIST);
+ free(ent);
- memset(&sb, 0, sizeof(sb));
- sb.st_mode = S_IFCHR | 0444;
- b = fstree_add_generic(&fs, "dir/chrdev", &sb, NULL);
+ ent = mkentry("dir/chrdev", S_IFCHR | 0444, 0, 0);
+ ent->rdev = 5678;
+ b = fstree_add_generic(&fs, ent, NULL);
+ free(ent);
TEST_NOT_NULL(b);
- TEST_EQUAL_UI(b->mode, sb.st_mode);
- TEST_EQUAL_UI(b->uid, sb.st_uid);
- TEST_EQUAL_UI(b->gid, sb.st_gid);
+ TEST_EQUAL_UI(b->mode, (S_IFCHR | 0444));
+ TEST_EQUAL_UI(b->uid, 0);
+ TEST_EQUAL_UI(b->gid, 0);
TEST_EQUAL_UI(b->link_count, 1);
TEST_ASSERT(b->parent == a);
- TEST_EQUAL_UI(b->data.devno, sb.st_rdev);
+ TEST_EQUAL_UI(b->data.devno, 5678);
TEST_NULL(b->next);
TEST_ASSERT(a->data.children == b);
TEST_EQUAL_UI(a->link_count, 3);
TEST_EQUAL_UI(fs.root->link_count, 4);
- b = fstree_add_generic(&fs, "dir/foo/chrdev", &sb, NULL);
+ ent = mkentry("dir/foo/chrdev", S_IFCHR | 0444, 0, 0);
+ ent->rdev = 91011;
+ b = fstree_add_generic(&fs, ent, NULL);
+ free(ent);
TEST_NOT_NULL(b);
TEST_NULL(b->next);
- TEST_EQUAL_UI(b->mode, sb.st_mode);
- TEST_EQUAL_UI(b->uid, sb.st_uid);
- TEST_EQUAL_UI(b->gid, sb.st_gid);
+ TEST_EQUAL_UI(b->mode, (S_IFCHR | 0444));
+ TEST_EQUAL_UI(b->uid, 0);
+ TEST_EQUAL_UI(b->gid, 0);
TEST_EQUAL_UI(b->link_count, 1);
TEST_ASSERT(b->parent != a);
TEST_ASSERT(b->parent->parent == a);
- TEST_EQUAL_UI(b->data.devno, sb.st_rdev);
+ TEST_EQUAL_UI(b->data.devno, 91011);
TEST_NULL(b->next);
TEST_EQUAL_UI(a->link_count, 4);
@@ -112,25 +128,22 @@ int main(int argc, char **argv)
TEST_EQUAL_UI(b->gid, 42);
TEST_EQUAL_UI(b->link_count, 3);
- memset(&sb, 0, sizeof(sb));
- sb.st_mode = S_IFDIR | 0750;
- sb.st_uid = 1000;
- sb.st_gid = 100;
-
- a = fstree_add_generic(&fs, "dir/foo", &sb, NULL);
+ ent = mkentry("dir/foo", S_IFDIR | 0755, 1000, 100);
+ a = fstree_add_generic(&fs, ent, NULL);
TEST_NOT_NULL(a);
TEST_ASSERT(a == b);
TEST_ASSERT(!(a->flags & FLAG_DIR_CREATED_IMPLICITLY));
- TEST_EQUAL_UI(a->mode, sb.st_mode);
- TEST_EQUAL_UI(a->uid, sb.st_uid);
- TEST_EQUAL_UI(a->gid, sb.st_gid);
+ TEST_EQUAL_UI(a->mode, (S_IFDIR | 0755));
+ TEST_EQUAL_UI(a->uid, 1000);
+ TEST_EQUAL_UI(a->gid, 100);
TEST_EQUAL_UI(a->link_count, 3);
TEST_EQUAL_UI(a->parent->link_count, 4);
TEST_EQUAL_UI(fs.root->link_count, 4);
- TEST_NULL(fstree_add_generic(&fs, "dir/foo", &sb, NULL));
+ TEST_NULL(fstree_add_generic(&fs, ent, NULL));
TEST_EQUAL_UI(errno, EEXIST);
+ free(ent);
fstree_cleanup(&fs);
return EXIT_SUCCESS;
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-04 03:43:59 +0000