From d7409bbc5e24267b275692b48116254d842d3821 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Thu, 18 Feb 2021 11:38:44 +0100 Subject: fstree_from_file: Implement basic file globbing The base path is passed to the fstree_from_file function and in turn to the individual callbacks. The line parsing function is modified to allow '*' as mode, uid and gid for specifically marked callbacks. A glob callback is added that internally uses the fstree_from_dir scanning functions in combination with a filter callback. Directory scanning flags are parsed from the extra arguments before interpreting it as a path fragment. Signed-off-by: David Oberhollenzer --- bin/gensquashfs/mkfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/gensquashfs/mkfs.c b/bin/gensquashfs/mkfs.c index b25d325..ac53623 100644 --- a/bin/gensquashfs/mkfs.c +++ b/bin/gensquashfs/mkfs.c @@ -118,7 +118,7 @@ static int read_fstree(fstree_t *fs, options_t *opt, sqfs_xattr_writer_t *xwr, { int ret; - ret = fstree_from_file(fs, opt->infile); + ret = fstree_from_file(fs, opt->infile, opt->packdir); if (ret == 0 && selinux_handle != NULL) ret = relabel_tree_dfs(opt->cfg.filename, xwr, -- cgit v1.2.3