From f138e4a24919682cf477cf93ae47b9a89bb5a3f0 Mon Sep 17 00:00:00 2001
From: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Date: Thu, 10 Dec 2020 16:00:44 +0100
Subject: Move fstree dirscan code back to libfstree

Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
---
 bin/gensquashfs/mkfs.h | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

(limited to 'bin/gensquashfs/mkfs.h')

diff --git a/bin/gensquashfs/mkfs.h b/bin/gensquashfs/mkfs.h
index 6aa0c87..e1e4e1b 100644
--- a/bin/gensquashfs/mkfs.h
+++ b/bin/gensquashfs/mkfs.h
@@ -34,7 +34,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>
-#include <dirent.h>
 #include <stdio.h>
 #include <errno.h>
 #include <ctype.h>
@@ -51,22 +50,14 @@ typedef struct {
 	unsigned int force_gid_value;
 	bool force_uid;
 	bool force_gid;
-} options_t;
-
-enum {
-	DIR_SCAN_KEEP_TIME = 0x01,
-
-	DIR_SCAN_ONE_FILESYSTEM = 0x02,
 
-	DIR_SCAN_READ_XATTR = 0x04,
-};
+	bool scan_xattr;
+} options_t;
 
 void process_command_line(options_t *opt, int argc, char **argv);
 
-int fstree_from_dir(fstree_t *fs, const char *path, unsigned int flags);
-
 int xattrs_from_dir(fstree_t *fs, const char *path, void *selinux_handle,
-		    sqfs_xattr_writer_t *xwr, unsigned int flags);
+		    sqfs_xattr_writer_t *xwr, bool scan_xattr);
 
 void *selinux_open_context_file(const char *filename);
 
-- 
cgit v1.2.3