35 files changed, 144 insertions, 144 deletions

diff --git a/etc/signal-desktop.profile b/etc/signal-desktop.profile
index b9f7a6c33..2cb2f644e 100644
--- a/etc/signal-desktop.profile
+++ b/etc/signal-desktop.profile
@@ -16,7 +16,7 @@ mkdir ${HOME}/.config/Signal
 whitelist ${DOWNLOADS}
 whitelist ${HOME}/.config/Signal
 include /etc/firejail/whitelist-common.inc
-include /etc/firejail/whitelist-var-common.inc 
+include /etc/firejail/whitelist-var-common.inc
 
 caps.drop all
 netfilter
diff --git a/etc/tcpserver.net b/etc/tcpserver.net
index e60404e6b..9c39ee5fb 100644
--- a/etc/tcpserver.net
+++ b/etc/tcpserver.net
@@ -9,7 +9,7 @@
 # Usage:  $ARG1 in this template is replaced by 5001 from command line below
 #
 #   firejail --net=eth0 --ip=192.168.1.105 --netfilter=/etc/firejail/tcpserver.net,5001 server-program
-#      
+#
 ###################################################################
 
 # allow server traffic
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;
 }
diff --git a/src/fcopy/main.c b/src/fcopy/main.c
index 753d9c0a0..913234702 100644
--- a/src/fcopy/main.c
+++ b/src/fcopy/main.c
@@ -122,7 +122,7 @@ void copy_link(const char *target, const char *linkpath, mode_t mode, uid_t uid,
         // if the link is already there, don't create it
         struct stat s;
         if (stat(linkpath, &s) == 0)
-               return;  
+               return;
 
         char *rp = realpath(target, NULL);
         if (rp) {
diff --git a/src/firecfg/desktop_files.c b/src/firecfg/desktop_files.c
index c1d456147..2edc4c83b 100644
--- a/src/firecfg/desktop_files.c
+++ b/src/firecfg/desktop_files.c
@@ -41,7 +41,7 @@ static int check_profile(const char *name, const char *homedir) {
                         printf("found %s\n", profname2);
                 rv = 1;
         }
-                
+
         free(profname1);
         free(profname2);
         return rv;
@@ -58,11 +58,11 @@ static int have_profile(const char *filename, const char *homedir) {
 
         // we get strange names here, such as .org.gnom.gedit.desktop, com.uploadedlobster.peek.desktop,
         // or io.github.Pithos.desktop; extract the word before .desktop
-        
+
         char *tmpfname = strdup(filename);
         if (!tmpfname)
                 errExit("strdup");
-                
+
         // check .desktop extension
         int len = strlen(tmpfname);
         if (len <= 8)
@@ -70,14 +70,14 @@ static int have_profile(const char *filename, const char *homedir) {
         if (strcmp(tmpfname + len - 8, ".desktop"))
                 return 0;
         tmpfname[len - 8] = '\0';
-        
+
         // extract last word
         char *last_word = strrchr(tmpfname, '.');
         if (last_word)
                 last_word++;
         else
                 last_word = tmpfname;
-        
+
         // try lowercase
         last_word[0] = tolower(last_word[0]);
         int rv = check_profile(last_word, homedir);
@@ -85,7 +85,7 @@ static int have_profile(const char *filename, const char *homedir) {
                 free(tmpfname);
                 return rv;
         }
-        
+
         // try uppercase
         last_word[0] = toupper(last_word[0]);
         rv = check_profile(last_word, homedir);
@@ -228,12 +228,12 @@ void fix_desktop_files(char *homedir) {
                                 }
                         }
                 }
-                
+
                 if (change_exec == NULL && change_dbus == 0) {
                         munmap(buf, sb.st_size + 1);
                         continue;
                 }
-                
+
                 munmap(buf, sb.st_size + 1);
 
                 //****************************************************
@@ -247,13 +247,13 @@ void fix_desktop_files(char *homedir) {
                         printf("   %s skipped: file exists\n", filename);
                         continue;
                 }
-                
+
                 FILE *fpin = fopen(filename, "r");
                 if (!fpin) {
                         fprintf(stderr, "Error: cannot open /usr/share/applications/%s\n", filename);
                         continue;
                 }
-                
+
                 FILE *fpout = fopen(outname, "w");
                 if (!fpout) {
                         fprintf(stderr, "Error: cannot open ~/.local/share/applications/%s\n", outname);
@@ -277,9 +277,9 @@ void fix_desktop_files(char *homedir) {
                                         fprintf(fpout, "Exec=%s\n", change_exec);
                         }
                         else
-                                fprintf(fpout, "%s", fbuf);     
+                                fprintf(fpout, "%s", fbuf);
                 }
-                
+
                 if (change_exec)
                         free(change_exec);
                 fclose(fpin);
diff --git a/src/firejail/checkcfg.c b/src/firejail/checkcfg.c
index 2fedb2f81..f101a8457 100644
--- a/src/firejail/checkcfg.c
+++ b/src/firejail/checkcfg.c
@@ -364,7 +364,7 @@ int checkcfg(int val) {
                         }
                         else
                                 goto errout;
-                        
+
                         free(ptr);
                 }
 
diff --git a/src/firejail/fs.c b/src/firejail/fs.c
index 653a656b3..4d99b70bd 100644
--- a/src/firejail/fs.c
+++ b/src/firejail/fs.c
@@ -605,7 +605,7 @@ void fs_proc_sys_dev_boot(void) {
         // disable various ipc sockets in /run/user
         if (!arg_writable_run_user) {
                 struct stat s;
-        
+
                 char *fname;
                 if (asprintf(&fname, "/run/user/%d", getuid()) == -1)
                         errExit("asprintf");
@@ -619,7 +619,7 @@ void fs_proc_sys_dev_boot(void) {
                         if (stat(fnamegpg, &s) == 0)
                                 disable_file(BLACKLIST_FILE, fnamegpg);
                         free(fnamegpg);
-        
+
                         // disable /run/user/{uid}/systemd
                         char *fnamesysd;
                         if (asprintf(&fnamesysd, "/run/user/%d/systemd", getuid()) == -1)
diff --git a/src/firejail/fs_bin.c b/src/firejail/fs_bin.c
index 9e19ac8d7..dc8423071 100644
--- a/src/firejail/fs_bin.c
+++ b/src/firejail/fs_bin.c
@@ -136,7 +136,7 @@ static int valid_full_path_file(const char *name) {
 
 static void report_duplication(const char *fname) {
         // report the file on all bin paths
-        int i = 0;      
+        int i = 0;
         while (paths[i]) {
                 char *p;
                 if (asprintf(&p, "%s/%s", paths[i], fname) == -1)
diff --git a/src/firejail/fs_dev.c b/src/firejail/fs_dev.c
index d839a0786..523f319ed 100644
--- a/src/firejail/fs_dev.c
+++ b/src/firejail/fs_dev.c
@@ -84,14 +84,14 @@ static void deventry_mount(void) {
         while (dev[i].dev_fname != NULL) {
                 struct stat s;
                 if (stat(dev[i].run_fname, &s) == 0) {
-                        
+
                         // check device type and subsystem configuration
                         if ((dev[i].type == DEV_SOUND && arg_nosound == 0) ||
                             (dev[i].type == DEV_3D && arg_no3d == 0) ||
                             (dev[i].type == DEV_VIDEO && arg_novideo == 0) ||
                             (dev[i].type == DEV_TV && arg_notv == 0) ||
                             (dev[i].type == DEV_DVD && arg_nodvd == 0)) {
-                        
+
                                 int dir = is_dir(dev[i].run_fname);
                                 if (arg_debug)
                                         printf("mounting %s %s\n", dev[i].run_fname, (dir)? "directory": "file");
@@ -113,7 +113,7 @@ static void deventry_mount(void) {
                                                 fclose(fp);
                                         }
                                 }
-        
+
                                 if (mount(dev[i].run_fname, dev[i].dev_fname, NULL, MS_BIND|MS_REC, NULL) < 0)
                                         errExit("mounting dev file");
                                 fs_logger2("whitelist", dev[i].dev_fname);
diff --git a/src/firejail/fs_lib.c b/src/firejail/fs_lib.c
index 46ee22bf3..4cb8ed1c2 100644
--- a/src/firejail/fs_lib.c
+++ b/src/firejail/fs_lib.c
@@ -46,7 +46,7 @@ static void report_duplication(const char *full_path) {
         char *fname = strrchr(full_path, '/');
         if (fname && *(++fname) != '\0') {
                 // report the file on all bin paths
-                int i = 0;      
+                int i = 0;
                 while (lib_paths[i]) {
                         char *p;
                         if (asprintf(&p, "%s/%s", lib_paths[i], fname) == -1)
@@ -91,7 +91,7 @@ void fslib_duplicate(const char *full_path) {
                 return;
         }
         free(name);
-        
+
         if (arg_debug || arg_debug_private_lib)
                 printf("copying %s to private %s\n", full_path, dest_dir);
 
diff --git a/src/firejail/fs_lib2.c b/src/firejail/fs_lib2.c
index e5c6bdaed..4e49730f4 100644
--- a/src/firejail/fs_lib2.c
+++ b/src/firejail/fs_lib2.c
@@ -88,7 +88,7 @@ static void stdc(const char *dirname) {
                                 continue;
                         if (strcmp(entry->d_name, "..") == 0)
                                 continue;
-                        
+
                         if (find_libc_list(entry->d_name)) {
                                 char *fname;
                                 if (asprintf(&fname, "%s/%s", dirname, entry->d_name) == -1)
@@ -105,7 +105,7 @@ void fslib_install_stdc(void) {
         // install standard C libraries
         struct stat s;
         char *stdclib = "/lib64";                 // CentOS, Fedora, Arch
-        
+
         if (stat("/lib/x86_64-linux-gnu", &s) == 0) {   // Debian & friends
                 mkdir_attr(RUN_LIB_DIR "/x86_64-linux-gnu", 0755, 0, 0);
                 stdclib = "/lib/x86_64-linux-gnu";
@@ -219,13 +219,13 @@ SysLib syslibs[] = {
                 ""      // message
         }
 };
-        
+
 void fslib_install_system(void) {
         // look for installed libraries
         DIR *dir = opendir(RUN_LIB_DIR "/x86_64-linux-gnu");
         if (!dir)
                 dir = opendir(RUN_LIB_DIR);
-        
+
         if (dir) {
                 struct dirent *entry;
                 while ((entry = readdir(dir)) != NULL) {
@@ -238,12 +238,12 @@ void fslib_install_system(void) {
                         while (ptr->library) {
                                 if (ptr->len == 0)
                                         ptr->len = strlen(ptr->library);
-                                
+
                                 if (strncmp(entry->d_name, ptr->library, ptr->len) == 0) {
                                         ptr->found = 1;
                                         break;
                                 }
-                                
+
                                 ptr++;
                         }
 
@@ -281,7 +281,7 @@ void fslib_install_system(void) {
                                 }
                         }
                         free(name);
-                        
+
                         if (*ptr->dir2 != '\0') {
                                 // Debian & friends
                                 if (asprintf(&name, "/usr/lib/x86_64-linux-gnu/%s", ptr->dir2) == -1)
@@ -302,7 +302,7 @@ void fslib_install_system(void) {
                                 }
                                 free(name);
                         }
-                        
+
                         if (!arg_quiet)
                                 fprintf(stderr, "%s installed in %0.2f ms\n", ptr->message, timetrace_end());
                 }
diff --git a/src/firejail/fs_whitelist.c b/src/firejail/fs_whitelist.c
index 7928aaf3d..da796f60f 100644
--- a/src/firejail/fs_whitelist.c
+++ b/src/firejail/fs_whitelist.c
@@ -275,7 +275,7 @@ static void whitelist_path(ProfileEntry *entry) {
         }
 
         // check if the file exists
-        assert(wfile);  
+        assert(wfile);
         struct stat s;
         if (stat(wfile, &s) == 0) {
                 if (arg_debug || arg_debug_whitelists)
diff --git a/src/firejail/join.c b/src/firejail/join.c
index 9f52d4565..4ce690737 100644
--- a/src/firejail/join.c
+++ b/src/firejail/join.c
@@ -279,7 +279,7 @@ void join(pid_t pid, int argc, char **argv, int index) {
         if (child == 0) {
                 // drop discretionary access control capabilities for root sandboxes
                 caps_drop_dac_override();
-                
+
                 // chroot into /proc/PID/root directory
                 char *rootdir;
                 if (asprintf(&rootdir, "/proc/%d/root", pid) == -1)
diff --git a/src/firejail/main.c b/src/firejail/main.c
index d6b0a230e..df758e11e 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -506,7 +506,7 @@ static void run_cmd_and_exit(int i, int argc, char **argv) {
                         printf("%s", buf);
                 fclose(fp);
                 exit(0);
-                
+
         }
         else if (strncmp(argv[i], "--cpu.print=", 12) == 0) {
                 // join sandbox by pid or by name
@@ -882,7 +882,7 @@ static void run_builder(int argc, char **argv) {
         if (setuid(getuid()) < 0)
                 errExit("setuid/getuid");
         assert(getenv("LD_PRELOAD") == NULL);
-        
+
         argv[0] = LIBDIR "/firejail/fbuilder";
         execvp(argv[0], argv);
 
@@ -950,7 +950,7 @@ int main(int argc, char **argv) {
         // profile builder
         if (check_arg(argc, argv, "--build", 0)) // supports both --build and --build=filename
                 run_builder(argc, argv); // this function will not return
-                
+
         // check argv[0] symlink wrapper if this is not a login shell
         if (*argv[0] != '-')
                 run_symlink(argc, argv); // if symlink detected, this function will not return
diff --git a/src/firejail/network_main.c b/src/firejail/network_main.c
index 91f1274bd..2719db958 100644
--- a/src/firejail/network_main.c
+++ b/src/firejail/network_main.c
@@ -262,14 +262,14 @@ void net_dns_print(pid_t pid) {
                 caps_drop_all();
                 if (chdir("/") < 0)
                         errExit("chdir");
-                
+
                 // access /etc/resolv.conf
                 FILE *fp = fopen("/etc/resolv.conf", "r");
                 if (!fp) {
                         fprintf(stderr, "Error: cannot access /etc/resolv.conf\n");
                         exit(1);
                 }
-        
+
                 char buf[MAXBUF];
                 while (fgets(buf, MAXBUF, fp))
                         printf("%s", buf);
diff --git a/src/firejail/output.c b/src/firejail/output.c
index 4f68b8ca3..7d73f1ef2 100644
--- a/src/firejail/output.c
+++ b/src/firejail/output.c
@@ -28,7 +28,7 @@ void check_output(int argc, char **argv) {
         int i;
         int outindex = 0;
         int enable_stderr = 0;
-        
+
         for (i = 1; i < argc; i++) {
                 if (strncmp(argv[i], "--output=", 9) == 0) {
                         outindex = i;
@@ -90,7 +90,7 @@ void check_output(int argc, char **argv) {
                         continue;
                 ptr += sprintf(ptr, "%s ", argv[i]);
         }
-        
+
         if (enable_stderr)
                 sprintf(ptr, "2>&1 | %s/firejail/ftee %s", LIBDIR, outfile);
         else
diff --git a/src/firejail/preproc.c b/src/firejail/preproc.c
index 5039c6238..6826d830f 100644
--- a/src/firejail/preproc.c
+++ b/src/firejail/preproc.c
@@ -146,7 +146,7 @@ void preproc_clean_run(void) {
                 pid %= max_pids;
                 if (end == entry->d_name || *end)
                         continue;
-        
+
                 if (pid < start_pid)
                         continue;
                 pidarr[pid] = 1;
@@ -169,7 +169,7 @@ void preproc_clean_run(void) {
                 pid %= max_pids;
                 if (end == entry->d_name || *end)
                         continue;
-        
+
                 if (pid < start_pid)
                         continue;
                 if (pidarr[pid] == 0)
diff --git a/src/firejail/profile.c b/src/firejail/profile.c
index c8bbff3fb..7d97842df 100644
--- a/src/firejail/profile.c
+++ b/src/firejail/profile.c
@@ -1062,12 +1062,12 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
 
                 return 0;
         }
-        
+
         if (strncmp(ptr, "timeout ", 8) == 0) {
                 cfg.timeout = extract_timeout(ptr +8);
                 return 0;
         }
-        
+
         if (strncmp(ptr, "join-or-start ", 14) == 0) {
                 // try to join by name only
                 pid_t pid;
diff --git a/src/firejail/sandbox.c b/src/firejail/sandbox.c
index b413407bd..8754f05bb 100644
--- a/src/firejail/sandbox.c
+++ b/src/firejail/sandbox.c
@@ -105,7 +105,7 @@ static void set_caps(void) {
                 caps_keep_list(arg_caps_list);
         else if (arg_caps_default_filter)
                 caps_default_filter();
-        
+
         // drop discretionary access control capabilities for root sandboxes
         // if caps.keep, the user has to set it manually in the list
         if (!arg_caps_keep)
diff --git a/src/firejail/util.c b/src/firejail/util.c
index fde180e49..0d703a1b6 100644
--- a/src/firejail/util.c
+++ b/src/firejail/util.c
@@ -763,7 +763,7 @@ void invalid_filename(const char *fname, int globbing) {
                 return;
 
         int len = strlen(ptr);
-        
+
         if (globbing) {
                 // file globbing ('*?[]') is allowed
                 if (strcspn(ptr, "\\&!\"'<>%^(){};,") != (size_t)len) {
diff --git a/src/firejail/x11.c b/src/firejail/x11.c
index d41f46d93..18617e75f 100644
--- a/src/firejail/x11.c
+++ b/src/firejail/x11.c
@@ -1043,7 +1043,7 @@ void x11_start_xpra(int argc, char **argv) {
         char *display_str;
         if (asprintf(&display_str, ":%d", display) == -1)
                 errExit("asprintf");
-        
+
         if (checkcfg(CFG_XPRA_ATTACH))
                 x11_start_xpra_new(argc, argv, display_str);
         else
diff --git a/src/firemon/firemon.c b/src/firemon/firemon.c
index 1f3fdd578..6f7356729 100644
--- a/src/firemon/firemon.c
+++ b/src/firemon/firemon.c
@@ -56,15 +56,15 @@ static void my_handler(int s){
 // return -1 if not found
 //
 // Example:
-//14776:netblue:/usr/bin/firejail /usr/bin/transmission-qt 
-//  14777:netblue:/usr/bin/firejail /usr/bin/transmission-qt 
-//    14792:netblue:/usr/bin/transmission-qt 
+//14776:netblue:/usr/bin/firejail /usr/bin/transmission-qt
+//  14777:netblue:/usr/bin/firejail /usr/bin/transmission-qt
+//    14792:netblue:/usr/bin/transmission-qt
 // We need 14792, the first real sandboxed process
 int find_child(int id) {
         int i;
         int first_child = -1;
 
-        // find the first child 
+        // find the first child
         for (i = 0; i < max_pids; i++) {
                 if (pids[i].level == 2 && pids[i].parent == id) {
                         first_child = i;
@@ -74,13 +74,13 @@ int find_child(int id) {
 
         if (first_child == -1)
                 return -1;
-        
+
         // find the second child
         for (i = 0; i < max_pids; i++) {
                 if (pids[i].level == 3 && pids[i].parent == first_child)
                         return i;
         }
-        
+
         return -1;
 }
 
diff --git a/src/fldd/main.c b/src/fldd/main.c
index 8e5b2bcb5..4439c6509 100644
--- a/src/fldd/main.c
+++ b/src/fldd/main.c
@@ -115,7 +115,7 @@ static void copy_libs_for_exe(const char *exe) {
                         fprintf(stderr, "Warning fldd: cannot open %s, skipping...\n", exe);
                 return;
         }
-        
+
         struct stat s;
         char *base = NULL, *end;
         if (fstat(f, &s) == -1)
@@ -217,7 +217,7 @@ static void copy_libs_for_exe(const char *exe) {
  close:
         if (base)
                 munmap(base, s.st_size);
-                        
+
         close(f);
 }
 
@@ -335,7 +335,7 @@ printf("\n");
                 usage();
                 return 0;
         }
-        
+
         int fd = STDOUT_FILENO;
         // attempt to open the file
         if (argc == 3) {
diff --git a/src/fnetfilter/main.c b/src/fnetfilter/main.c
index 723c1ac32..d6ed502b8 100644
--- a/src/fnetfilter/main.c
+++ b/src/fnetfilter/main.c
@@ -181,7 +181,7 @@ printf("\n");
         }
 
         char *destfile = (argc == 3)? argv[2]: argv[1];
-        char *command = (argc == 3)? argv[1]: NULL;     
+        char *command = (argc == 3)? argv[1]: NULL;
 //printf("command %s\n", command);
 //printf("destfile %s\n", destfile);
         // destfile is a real filename
@@ -208,6 +208,6 @@ printf("\n");
                 else
                         copy(command, destfile);
         }
-        
+
         return 0;
 }
diff --git a/src/fseccomp/seccomp.c b/src/fseccomp/seccomp.c
index ef7dd5c54..028cd76a9 100644
--- a/src/fseccomp/seccomp.c
+++ b/src/fseccomp/seccomp.c
@@ -165,7 +165,7 @@ void seccomp_default_drop(const char *fname1, const char *fname2, char *list, in
 
 void seccomp_keep(const char *fname1, const char *fname2, char *list) {
         (void) fname2;
-        
+
         // open file for pre-exec filter
         int fd = open(fname1, O_CREAT|O_WRONLY|O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
         if (fd < 0) {
diff --git a/src/fseccomp/seccomp_print.c b/src/fseccomp/seccomp_print.c
index e8df2bda5..ffc65e7c3 100644
--- a/src/fseccomp/seccomp_print.c
+++ b/src/fseccomp/seccomp_print.c
@@ -68,7 +68,7 @@ static int detect_filter_type(void) {
         assert(filter);
 
         printf("SECCOMP Filter\n");
-        
+
         // testing for main seccomp filter, protocol, mdwe - platform architecture
         const struct sock_filter start_main[] = {
                 VALIDATE_ARCHITECTURE,
@@ -79,7 +79,7 @@ static int detect_filter_type(void) {
                 EXAMINE_SYSCALL
 #endif
         };
-        
+
         if (memcmp(&start_main[0], filter, sizeof(start_main)) == 0) {
                 printf("  VALIDATE_ARCHITECTURE\n");
                 printf("  EXAMINE_SYSCALL\n");
@@ -88,26 +88,26 @@ static int detect_filter_type(void) {
 #endif
                 return sizeof(start_main) / sizeof(struct sock_filter);
         }
-        
-        
+
+
         // testing for secondary 64 bit filter
         const struct sock_filter start_secondary_64[] = {
                 VALIDATE_ARCHITECTURE_64,
                 EXAMINE_SYSCALL,
         };
-        
+
         if (memcmp(&start_secondary_64[0], filter, sizeof(start_secondary_64)) == 0) {
                 printf("  VALIDATE_ARCHITECTURE_64\n");
                 printf("  EXAMINE_SYSCALL\n");
                 return sizeof(start_secondary_64) / sizeof(struct sock_filter);
         }
-        
+
         // testing for secondary 32 bit filter
         const struct sock_filter start_secondary_32[] = {
                 VALIDATE_ARCHITECTURE_32,
                 EXAMINE_SYSCALL,
         };
-        
+
         if (memcmp(&start_secondary_32[0], filter, sizeof(start_secondary_32)) == 0) {
                 printf("  VALIDATE_ARCHITECTURE_32\n");
                 printf("  EXAMINE_SYSCALL\n");
@@ -132,7 +132,7 @@ static int detect_filter_type(void) {
 #endif
                 return sizeof(start_secondary_block) / sizeof(struct sock_filter);
         }
-        
+
         return 0; // filter unrecognized
 }
 
@@ -146,7 +146,7 @@ void filter_print(const char *fname) {
                 printf("Invalid seccomp filter %s\n", fname);
                 return;
         }
-        
+
         // loop trough the rest of commands
         while (i < filter_cnt) {
                 // minimal parsing!
diff --git a/src/man/firejail.txt b/src/man/firejail.txt
index d9000fd5e..927c5e309 100644
--- a/src/man/firejail.txt
+++ b/src/man/firejail.txt
@@ -859,7 +859,7 @@ be created and configured using "ip netns".
 .TP
 \fB\-\-netfilter
 Enable a default firewall if a new network namespace is created inside the sandbox.
-This option has no effect for sandboxes using the system network namespace. 
+This option has no effect for sandboxes using the system network namespace.
 .br
 
 .br
@@ -970,7 +970,7 @@ $ firejail --netfilter.print=browser
 \fB\-\-netfilter6=filename
 Enable the IPv6 firewall specified by filename if a new network namespace is created inside the sandbox.
 This option has no effect for sandboxes using the system network namespace.
-Please use the regular iptables-save/iptables-restore format for the filter file. 
+Please use the regular iptables-save/iptables-restore format for the filter file.
 
 .TP
 \fB\-\-netfilter6.print=name|pid