fbuider cleanup

1 files changed, 42 insertions, 59 deletions

diff --git a/src/fbuilder/build_fs.c b/src/fbuilder/build_fs.c
index 2d63c6fb9..771dc94cb 100644
--- a/src/fbuilder/build_fs.c
+++ b/src/fbuilder/build_fs.c
@@ -21,20 +21,19 @@
 #include "fbuilder.h"
 
 // common file processing function, using the callback for each line in the file
-static void process_file(char *fname, FILE *fp, const char *dir, void (*callback)(char *)) {
+static void process_file(const char *fname, const char *dir, void (*callback)(char *)) {
         assert(fname);
-        assert(fp);
         assert(dir);
         assert(callback);
 
         int dir_len = strlen(dir);
 
         // process trace file
-        /* FILE *fp = fdopen(fd, "r"); */
-        /* if (!fp) { */
-        /*      fprintf(stderr, "Error: cannot open %s\n", fname); */
-        /*      exit(1); */
-        /* } */
+        FILE *fp = fopen(fname, "r");
+        if (!fp) {
+                fprintf(stderr, "Error: cannot open %s\n", fname);
+                exit(1);
+        }
 
         char buf[MAX_BUF];
         while (fgets(buf, MAX_BUF, fp)) {
@@ -83,18 +82,17 @@ static void process_file(char *fname, FILE *fp, const char *dir, void (*callback
                 callback(ptr);
         }
 
-        /* fclose(fp); */
+        fclose(fp);
 }
 
 // process fname, fname.1, fname.2, fname.3, fname.4, fname.5
-static void process_files(char *fname, FILE *fp, const char *dir, void (*callback)(char *)) {
+static void process_files(const char *fname, const char *dir, void (*callback)(char *)) {
         assert(fname);
-        assert(fp);
         assert(dir);
         assert(callback);
 
         // run fname
-        process_file(fname, fp, dir, callback);
+        process_file(fname, dir, callback);
 
         // run all the rest
         struct stat s;
@@ -103,13 +101,8 @@ static void process_files(char *fname, FILE *fp, const char *dir, void (*callbac
                 char *newname;
                 if (asprintf(&newname, "%s.%d", fname, i) == -1)
                         errExit("asprintf");
-                if (stat(newname, &s) == 0) {
-                  int nfd = open(newname, O_RDONLY);
-                  FILE *nfp = fdopen(nfd, "r");
-                  process_file(newname, nfp, dir, callback);
-                  fclose(nfp);
-                  unlink(newname);
-                }
+                if (stat(newname, &s) == 0)
+                        process_file(newname, dir, callback);
                 free(newname);
         }
 }
@@ -132,23 +125,21 @@ static void etc_callback(char *ptr) {
         etc_out = filedb_add(etc_out, ptr);
 }
 
-void build_etc(char *fname, FILE *fp, FILE *fpo) {
+void build_etc(const char *fname, FILE *fp) {
         assert(fname);
-        assert(fp);
-        assert(fpo);
 
-        process_files(fname, fp, "/etc", etc_callback);
+        process_files(fname, "/etc", etc_callback);
 
-        fprintf(fpo, "private-etc ");
+        fprintf(fp, "private-etc ");
         if (etc_out == NULL)
-                fprintf(fpo, "none\n");
+                fprintf(fp, "none\n");
         else {
                 FileDB *ptr = etc_out;
                 while (ptr) {
-                        fprintf(fpo, "%s,", ptr->fname);
+                        fprintf(fp, "%s,", ptr->fname);
                         ptr = ptr->next;
                 }
-                fprintf(fpo, "\n");
+                fprintf(fp, "\n");
         }
 }
 
@@ -169,17 +160,15 @@ static void var_callback(char *ptr) {
                 var_out = filedb_add(var_out, ptr);
 }
 
-void build_var(char *fname, FILE *fp, FILE *fpo) {
+void build_var(const char *fname, FILE *fp) {
         assert(fname);
-        assert(fp);
-        assert(fpo);
 
-        process_files(fname, fp, "/var", var_callback);
+        process_files(fname, "/var", var_callback);
 
         if (var_out == NULL)
-                fprintf(fpo, "blacklist /var\n");
+                fprintf(fp, "blacklist /var\n");
         else
-                filedb_print(var_out, "whitelist ", fpo);
+                filedb_print(var_out, "whitelist ", fp);
 }
 
 
@@ -208,17 +197,15 @@ static void share_callback(char *ptr) {
         share_out = filedb_add(share_out, ptr);
 }
 
-void build_share(char *fname, FILE *fp, FILE *fpo) {
+void build_share(const char *fname, FILE *fp) {
         assert(fname);
-        assert(fp);
-        assert(fpo);
 
-        process_files(fname, fp, "/usr/share", share_callback);
+        process_files(fname, "/usr/share", share_callback);
 
         if (share_out == NULL)
-                fprintf(fpo, "blacklist /usr/share\n");
+                fprintf(fp, "blacklist /usr/share\n");
         else
-                filedb_print(share_out, "whitelist ", fpo);
+                filedb_print(share_out, "whitelist ", fp);
 }
 
 //*******************************************
@@ -229,23 +216,21 @@ static void tmp_callback(char *ptr) {
         filedb_add(tmp_out, ptr);
 }
 
-void build_tmp(char *fname, FILE *fp, FILE *fpo) {
+void build_tmp(const char *fname, FILE *fp) {
         assert(fname);
-        assert(fp);
-        assert(fpo);
 
-        process_files(fname, fp, "/tmp", tmp_callback);
+        process_files(fname, "/tmp", tmp_callback);
 
         if (tmp_out == NULL)
-                fprintf(fpo, "private-tmp\n");
+                fprintf(fp, "private-tmp\n");
         else {
-                fprintf(fpo, "\n");
-                fprintf(fpo, "# private-tmp\n");
-                fprintf(fpo, "# File accessed in /tmp directory:\n");
-                fprintf(fpo, "# ");
+                fprintf(fp, "\n");
+                fprintf(fp, "# private-tmp\n");
+                fprintf(fp, "# File accessed in /tmp directory:\n");
+                fprintf(fp, "# ");
                 FileDB *ptr = tmp_out;
                 while (ptr) {
-                        fprintf(fpo, "%s,", ptr->fname);
+                        fprintf(fp, "%s,", ptr->fname);
                         ptr = ptr->next;
                 }
                 printf("\n");
@@ -309,26 +294,24 @@ static void dev_callback(char *ptr) {
                 filedb_add(dev_out, ptr);
 }
 
-void build_dev(char *fname, FILE *fp, FILE *fpo) {
+void build_dev(const char *fname, FILE *fp) {
         assert(fname);
-        assert(fp);
-        assert(fpo);
 
-        process_files(fname, fp, "/dev", dev_callback);
+        process_files(fname, "/dev", dev_callback);
 
         if (dev_out == NULL)
-                fprintf(fpo, "private-dev\n");
+                fprintf(fp, "private-dev\n");
         else {
-                fprintf(fpo, "\n");
-                fprintf(fpo, "# private-dev\n");
-                fprintf(fpo, "# This is the list of devices accessed (on top of regular private-dev devices:\n");
-                fprintf(fpo, "# ");
+                fprintf(fp, "\n");
+                fprintf(fp, "# private-dev\n");
+                fprintf(fp, "# This is the list of devices accessed (on top of regular private-dev devices:\n");
+                fprintf(fp, "# ");
                 FileDB *ptr = dev_out;
                 while (ptr) {
-                        fprintf(fpo, "%s,", ptr->fname);
+                        fprintf(fp, "%s,", ptr->fname);
                         ptr = ptr->next;
                 }
-                fprintf(fpo, "\n");
+                fprintf(fp, "\n");
         }
 }