From 5db89638a57e6eb8819b8b61d21780562e64d377 Mon Sep 17 00:00:00 2001
From: smitsohu <smitsohu@gmail.com>
Date: Sun, 13 Mar 2022 21:17:32 +0100
Subject: fbuilder: unify callback functions

---
 src/fbuilder/build_fs.c | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/fbuilder/build_fs.c b/src/fbuilder/build_fs.c
index f7cf840c2..9038e1953 100644
--- a/src/fbuilder/build_fs.c
+++ b/src/fbuilder/build_fs.c
@@ -132,9 +132,20 @@ static void etc_callback(char *ptr) {
 	if (strncmp(ptr, "/etc/firejail", 13) == 0)
 		return;
 
+	// extract the directory:
+	assert(strncmp(ptr, "/etc", 4) == 0);
+	char *p1 = ptr + 4;
+	if (*p1 != '/')
+		return;
+	p1++;
+
+	if (*p1 == '/')	// double '/'
+		p1++;
+	if (*p1 == '\0')
+		return;
+
 	// add only top files and directories
-	ptr += 5;	// skip "/etc/"
-	char *end = strchr(ptr, '/');
+	char *end = strchr(p1, '/');
 	if (end)
 		*end = '\0';
 	etc_out = filedb_add(etc_out, ptr);
@@ -178,6 +189,11 @@ static char *var_skip[] = {
 static FileDB *var_out = NULL;
 static FileDB *var_skip = NULL;
 static void var_callback(char *ptr) {
+	// skip /var/lib/flatpak, /var/lib/snapd directory
+	if (strncmp(ptr, "/var/lib/flatpak", 16) == 0 ||
+	    strncmp(ptr, "/var/lib/snapd", 14) == 0)
+		return;
+
 	// extract the directory:
 	assert(strncmp(ptr, "/var", 4) == 0);
 	char *p1 = ptr + 4;
@@ -198,8 +214,6 @@ void build_var(const char *fname, FILE *fp) {
 	assert(fname);
 
 	var_skip = filedb_load_whitelist(var_skip, "whitelist-var-common.inc", "whitelist /var/");
-	var_skip = filedb_add(var_skip, "lib/flatpak");
-	var_skip = filedb_add(var_skip, "lib/snapd");
 	process_files(fname, "/var", var_callback);
 
 	// always whitelist /var
-- 
cgit v1.2.3-70-g09d2