strip trailing whitespace

9 files changed, 73 insertions, 73 deletions

diff --git a/src/fbuilder/build_bin.c b/src/fbuilder/build_bin.c
index fb92fb630..b69e089c3 100644
--- a/src/fbuilder/build_bin.c
+++ b/src/fbuilder/build_bin.c
@@ -23,21 +23,21 @@ static FileDB *bin_out = NULL;
 
 static void process_bin(const char *fname) {
         assert(fname);
-        
+
         // process trace file
         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)) {
                 // remove \n
                 char *ptr = strchr(buf, '\n');
                 if (ptr)
                         *ptr = '\0';
-        
+
                 // parse line: 4:galculator:access /etc/fonts/conf.d:0
                 // number followed by :
                 ptr = buf;
@@ -89,7 +89,7 @@ static void process_bin(const char *fname) {
 
                 bin_out = filedb_add(bin_out, ptr);
         }
-        
+
         fclose(fp);
 }
 
@@ -97,10 +97,10 @@ static void process_bin(const char *fname) {
 // process fname, fname.1, fname.2, fname.3, fname.4, fname.5
 void build_bin(const char *fname, FILE *fp) {
         assert(fname);
-        
+
         // run fname
         process_bin(fname);
-        
+
         // run all the rest
         struct stat s;
         int i;
diff --git a/src/fbuilder/build_fs.c b/src/fbuilder/build_fs.c
index f1a27a35a..3f685623e 100644
--- a/src/fbuilder/build_fs.c
+++ b/src/fbuilder/build_fs.c
@@ -25,23 +25,23 @@ static void process_file(const char *fname, const char *dir, void (*callback)(ch
         assert(fname);
         assert(dir);
         assert(callback);
-        
+
         int dir_len = strlen(dir);
-        
+
         // process trace file
         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)) {
                 // remove \n
                 char *ptr = strchr(buf, '\n');
                 if (ptr)
                         *ptr = '\0';
-        
+
                 // parse line: 4:galculator:access /etc/fonts/conf.d:0
                 // number followed by :
                 ptr = buf;
@@ -78,10 +78,10 @@ static void process_file(const char *fname, const char *dir, void (*callback)(ch
                 if (!ptr2)
                         continue;
                 *ptr2 = '\0';
-                
+
                 callback(ptr);
         }
-        
+
         fclose(fp);
 }
 
@@ -90,10 +90,10 @@ static void process_files(const char *fname, const char *dir, void (*callback)(c
         assert(fname);
         assert(dir);
         assert(callback);
-        
+
         // run fname
         process_file(fname, dir, callback);
-        
+
         // run all the rest
         struct stat s;
         int i;
@@ -127,9 +127,9 @@ static void etc_callback(char *ptr) {
 
 void build_etc(const char *fname, FILE *fp) {
         assert(fname);
-        
+
         process_files(fname, "/etc", etc_callback);
-        
+
         fprintf(fp, "private-etc ");
         if (etc_out == NULL)
                 fprintf(fp, "none\n");
@@ -140,7 +140,7 @@ void build_etc(const char *fname, FILE *fp) {
                         ptr = ptr->next;
                 }
                 fprintf(fp, "\n");
-        }       
+        }
 }
 
 //*******************************************
@@ -164,7 +164,7 @@ void build_var(const char *fname, FILE *fp) {
         assert(fname);
 
         process_files(fname, "/var", var_callback);
-        
+
         if (var_out == NULL)
                 fprintf(fp, "blacklist /var\n");
         else
@@ -218,9 +218,9 @@ static void tmp_callback(char *ptr) {
 
 void build_tmp(const char *fname, FILE *fp) {
         assert(fname);
-        
+
         process_files(fname, "/tmp", tmp_callback);
-        
+
         if (tmp_out == NULL)
                 fprintf(fp, "private-tmp\n");
         else {
@@ -247,7 +247,7 @@ static char *dev_skip[] = {
         "/dev/random",
         "/dev/urandom",
         "/dev/tty",
-        "/dev/snd", 
+        "/dev/snd",
         "/dev/dri",
         "/dev/pts",
         "/dev/nvidia0",
@@ -296,9 +296,9 @@ static void dev_callback(char *ptr) {
 
 void build_dev(const char *fname, FILE *fp) {
         assert(fname);
-        
+
         process_files(fname, "/dev", dev_callback);
-        
+
         if (dev_out == NULL)
                 fprintf(fp, "private-dev\n");
         else {
diff --git a/src/fbuilder/build_home.c b/src/fbuilder/build_home.c
index 9bbd2c258..18bf5d702 100644
--- a/src/fbuilder/build_home.c
+++ b/src/fbuilder/build_home.c
@@ -29,7 +29,7 @@ static void load_whitelist_common(void) {
                 fprintf(stderr, "Error: cannot open whitelist-common.inc\n");
                 exit(1);
         }
-        
+
         char buf[MAX_BUF];
         while (fgets(buf, MAX_BUF, fp)) {
                 if (strncmp(buf, "whitelist ~/", 12) != 0)
@@ -39,33 +39,33 @@ static void load_whitelist_common(void) {
                 if (!ptr)
                         continue;
                 *ptr = '\0';
-                
+
                 // add the file to skip list
                 db_skip = filedb_add(db_skip, fn);
         }
-        
-        fclose(fp);     
+
+        fclose(fp);
 }
 
 void process_home(const char *fname, char *home, int home_len) {
         assert(fname);
         assert(home);
         assert(home_len);
-        
+
         // process trace file
         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)) {
                 // remove \n
                 char *ptr = strchr(buf, '\n');
                 if (ptr)
                         *ptr = '\0';
-        
+
                 // parse line: 4:galculator:access /etc/fonts/conf.d:0
                 // number followed by :
                 ptr = buf;
@@ -107,8 +107,8 @@ void process_home(const char *fname, char *home, int home_len) {
                 if (strcmp(ptr, home) == 0)
                         continue;
                 ptr += home_len + 1;
-                
-                // skip files handled automatically by firejail 
+
+                // skip files handled automatically by firejail
                 if (strcmp(ptr, ".Xauthority") == 0 ||
                     strcmp(ptr, ".Xdefaults-debian") == 0 ||
                     strncmp(ptr, ".config/pulse/", 13) == 0 ||
@@ -116,8 +116,8 @@ void process_home(const char *fname, char *home, int home_len) {
                     strncmp(ptr, ".bash_hist", 10) == 0 ||
                     strcmp(ptr, ".bashrc") == 0)
                         continue;
-                
-                
+
+
                 // try to find the relevant directory for this file
                 char *dir = extract_dir(ptr);
                 char *toadd = (dir)? dir: ptr;
@@ -160,7 +160,7 @@ void process_home(const char *fname, char *home, int home_len) {
 // process fname, fname.1, fname.2, fname.3, fname.4, fname.5
 void build_home(const char *fname, FILE *fp) {
         assert(fname);
-                
+
         // load whitelist common
         load_whitelist_common();
 
@@ -172,10 +172,10 @@ void build_home(const char *fname, FILE *fp) {
         if (!home)
                 errExit("getpwuid");
         int home_len = strlen(home);
-        
+
         // run fname
         process_home(fname, home, home_len);
-        
+
         // run all the rest
         struct stat s;
         int i;
@@ -187,7 +187,7 @@ void build_home(const char *fname, FILE *fp) {
                         process_home(newname, home, home_len);
                 free(newname);
         }
-        
+
         // print the out list if any
         if (db_out) {
                 filedb_print(db_out, "whitelist ~/", fp);
diff --git a/src/fbuilder/build_profile.c b/src/fbuilder/build_profile.c
index de9f79232..5fead41c5 100644
--- a/src/fbuilder/build_profile.c
+++ b/src/fbuilder/build_profile.c
@@ -43,7 +43,7 @@ static char *cmdlist[] = {
 static void clear_tmp_files(void) {
         unlink(STRACE_OUTPUT);
         unlink(TRACE_OUTPUT);
-        
+
         // run all the rest
         int i;
         for (i = 1; i <= 5; i++) {
@@ -62,22 +62,22 @@ void build_profile(int argc, char **argv, int index, FILE *fp) {
                 fprintf(stderr, "Error: application name missing\n");
                 exit(1);
         }
-        
+
         // clean /tmp files
         clear_tmp_files();
-        
+
         // detect strace
         int have_strace = 0;
         if (access("/usr/bin/strace", X_OK) == 0)
                 have_strace = 1;
-        
+
         // calculate command length
         unsigned len = (int) sizeof(cmdlist) / sizeof(char*) + argc - index + 1;
         if (arg_debug)
                 printf("command len %d + %d + 1\n", (int) (sizeof(cmdlist) / sizeof(char*)), argc - index);
         char *cmd[len];
         cmd[0] = cmdlist[0];    // explicit assignemnt to clean scan-build error
-        
+
         // build command
         unsigned i = 0;
         for (i = 0; i < (int) sizeof(cmdlist) / sizeof(char*); i++) {
@@ -97,7 +97,7 @@ void build_profile(int argc, char **argv, int index, FILE *fp) {
                 for (i = 0; i < len; i++)
                         printf("\t%s\n", cmd[i]);
         }
-        
+
         // fork and execute
         pid_t child = fork();
         if (child == -1)
@@ -108,7 +108,7 @@ void build_profile(int argc, char **argv, int index, FILE *fp) {
                 (void) rv;
                 errExit("execv");
         }
-        
+
         // wait for all processes to finish
         int status;
         if (waitpid(child, &status, 0) != child)
@@ -122,18 +122,18 @@ void build_profile(int argc, char **argv, int index, FILE *fp) {
                 fprintf(fp, "# Persistent global definitions\n");
                 fprintf(fp, "# include /etc/firejail/globals.local\n");
                 fprintf(fp, "\n");
-                
+
                 fprintf(fp, "### basic blacklisting\n");
                 fprintf(fp, "include /etc/firejail/disable-common.inc\n");
                 fprintf(fp, "# include /etc/firejail/disable-devel.inc\n");
                 fprintf(fp, "include /etc/firejail/disable-passwdmgr.inc\n");
                 fprintf(fp, "# include /etc/firejail/disable-programs.inc\n");
                 fprintf(fp, "\n");
-                
+
                 fprintf(fp, "### home directory whitelisting\n");
                 build_home(TRACE_OUTPUT, fp);
                 fprintf(fp, "\n");
-                
+
                 fprintf(fp, "### filesystem\n");
                 build_tmp(TRACE_OUTPUT, fp);
                 build_dev(TRACE_OUTPUT, fp);
@@ -158,7 +158,7 @@ void build_profile(int argc, char **argv, int index, FILE *fp) {
                 fprintf(fp, "### network\n");
                 build_protocol(TRACE_OUTPUT, fp);
                 fprintf(fp, "\n");
-                
+
                 fprintf(fp, "### environment\n");
                 fprintf(fp, "shell none\n");
 
diff --git a/src/fbuilder/build_seccomp.c b/src/fbuilder/build_seccomp.c
index 63f37e34a..85190f0f2 100644
--- a/src/fbuilder/build_seccomp.c
+++ b/src/fbuilder/build_seccomp.c
@@ -23,13 +23,13 @@
 void build_seccomp(const char *fname, FILE *fp) {
         assert(fname);
         assert(fp);
-        
+
         FILE *fp2 = fopen(fname, "r");
         if (!fp2) {
                 fprintf(stderr, "Error: cannot open %s\n", fname);
                 exit(1);
         }
-        
+
         char buf[MAX_BUF];
         int line = 1;
         int position = 0;
@@ -39,7 +39,7 @@ void build_seccomp(const char *fname, FILE *fp) {
                 char *ptr = strchr(buf, '\n');
                 if (ptr)
                         *ptr = '\0';
-                
+
                 // first line:
                 //% time     seconds  usecs/call     calls    errors syscall
                 if (line == 1) {
@@ -61,7 +61,7 @@ void build_seccomp(const char *fname, FILE *fp) {
                         // get out on the next "----" line
                         if (*buf == '-')
                                 break;
-                        
+
                         if (line == 3)
                                 fprintf(fp, "# seccomp.keep %s", buf + position);
                         else
@@ -89,21 +89,21 @@ int netlink = 0;
 int packet = 0;
 static void process_protocol(const char *fname) {
         assert(fname);
-        
+
         // process trace file
         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)) {
                 // remove \n
                 char *ptr = strchr(buf, '\n');
                 if (ptr)
                         *ptr = '\0';
-        
+
                 // parse line: 4:galculator:access /etc/fonts/conf.d:0
                 // number followed by :
                 ptr = buf;
@@ -136,7 +136,7 @@ static void process_protocol(const char *fname) {
                 else if (strncmp(ptr, "AF_PACKET ", 9) == 0)
                         packet = 1;
         }
-        
+
         fclose(fp);
 }
 
@@ -144,10 +144,10 @@ static void process_protocol(const char *fname) {
 // process fname, fname.1, fname.2, fname.3, fname.4, fname.5
 void build_protocol(const char *fname, FILE *fp) {
         assert(fname);
-        
+
         // run fname
         process_protocol(fname);
-        
+
         // run all the rest
         struct stat s;
         int i;
@@ -159,7 +159,7 @@ void build_protocol(const char *fname, FILE *fp) {
                         process_protocol(newname);
                 free(newname);
         }
-        
+
         int net = 0;
         if (unix_s || inet || inet6 || netlink || packet) {
                 fprintf(fp, "protocol ");
diff --git a/src/fbuilder/fbuilder.h b/src/fbuilder/fbuilder.h
index 81dc951ec..711167704 100644
--- a/src/fbuilder/fbuilder.h
+++ b/src/fbuilder/fbuilder.h
@@ -25,7 +25,7 @@
 #include <pwd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
- 
+
 
 #define MAX_BUF 4096
 // main.c
diff --git a/src/fbuilder/filedb.c b/src/fbuilder/filedb.c
index b7162c2d6..6b57954d3 100644
--- a/src/fbuilder/filedb.c
+++ b/src/fbuilder/filedb.c
@@ -24,14 +24,14 @@ FileDB *filedb_find(FileDB *head, const char *fname) {
         FileDB *ptr = head;
         int found = 0;
         int len = strlen(fname);
-        
+
         while (ptr) {
                 // exact name
                 if (strcmp(fname, ptr->fname) == 0) {
                         found = 1;
                         break;
                 }
-                
+
                 // parent directory in the list
                 if (len > ptr->len &&
                     fname[ptr->len] == '/' &&
@@ -42,10 +42,10 @@ FileDB *filedb_find(FileDB *head, const char *fname) {
 
                 ptr = ptr->next;
         }
-        
+
         if (found)
                 return ptr;
-        
+
         return NULL;
 }
 
@@ -55,7 +55,7 @@ FileDB *filedb_add(FileDB *head, const char *fname) {
         // don't add it if it is already there or if the parent directory is already in the list
         if (filedb_find(head, fname))
                 return head;
-        
+
         // add a new entry
         FileDB *entry = malloc(sizeof(FileDB));
         if (!entry)
diff --git a/src/fbuilder/main.c b/src/fbuilder/main.c
index 1b997ccdb..697b53700 100644
--- a/src/fbuilder/main.c
+++ b/src/fbuilder/main.c
@@ -40,7 +40,7 @@ printf("\n");
         int prog_index = 0;
         FILE *fp = stdout;
         int prof_file = 0;
-        
+
         // parse arguments and extract program index
         for (i = 1; i < argc; i++) {
                 if (strcmp(argv[i], "-h") == 0 || strcmp(argv[i], "--help") == 0 || strcmp(argv[i], "-?") ==0) {
@@ -57,7 +57,7 @@ printf("\n");
                                 fprintf(stderr, "Error fbuild: --build=profile-name is not supported for root user.\n");
                                 exit(1);
                         }
-                        
+
                         // check file access
                         fp = fopen(argv[i] + 8, "w");
                         if (!fp) {
@@ -77,7 +77,7 @@ printf("\n");
                         break;
                 }
         }
-        
+
         if (prog_index == 0) {
                 fprintf(stderr, "Error fbuilder: program and arguments required\n");
                 usage();
@@ -85,7 +85,7 @@ printf("\n");
                         fclose(fp);
                 exit(1);
         }
-        
+
         build_profile(argc, argv, prog_index, fp);
         if (prof_file)
                 fclose(fp);
diff --git a/src/fbuilder/utils.c b/src/fbuilder/utils.c
index 902290899..c07d2e925 100644
--- a/src/fbuilder/utils.c
+++ b/src/fbuilder/utils.c
@@ -56,17 +56,17 @@ char *extract_dir(char *fname) {
         assert(fname);
         if (is_dir(fname))
                 return NULL;
-        
+
         char *name = strdup(fname);
         if (!name)
                 errExit("strdup");
-                
+
         char *ptr = strrchr(name, '/');
         if (!ptr) {
                 free(name);
                 return NULL;
         }
         *ptr = '\0';
-        
+
         return name;
 }