From 6181f75e3f1b73708eaef7e22364ed0e9a1c482e Mon Sep 17 00:00:00 2001 From: Fred-Barclay Date: Sun, 17 Feb 2019 17:04:02 -0600 Subject: [PATCH] Housekeeping Make sure all files end with a newline Strip extra newlines and trailing whitespace from files --- .gitignore | 1 - src/common.mk.in | 1 - src/fbuilder/build_fs.c | 1 - src/fbuilder/build_seccomp.c | 1 - src/fbuilder/fbuilder.h | 2 +- src/fbuilder/filedb.c | 1 - src/firecfg/desktop_files.c | 2 -- src/firecfg/firecfg.h | 1 - src/firecfg/sound.c | 1 - src/firejail/fs_lib2.c | 5 ----- src/firejail/network_main.c | 2 +- src/firejail/preproc.c | 1 - src/firejail/shutdown.c | 2 +- src/fsec-optimize/fsec_optimize.h | 2 +- src/fsec-optimize/optimizer.c | 1 - src/fsec-print/fsec_print.h | 2 +- src/fsec-print/print.c | 1 - src/include/ldd_utils.h | 2 +- test/apps/apps.sh | 1 - test/filters/memwrexe.c | 13 ++++++------- test/fnetfilter/test1.net | 1 - test/fnetfilter/test2.net | 3 +-- test/hidepid-howto | 2 -- test/network/tcpserver.c | 6 +++--- test/profiles/profiles.sh | 1 - test/profiles/test3.profile | 2 +- test/root/option_tmpfs.exp | 1 - test/utils/caps2.profile | 2 +- 28 files changed, 18 insertions(+), 43 deletions(-) diff --git a/.gitignore b/.gitignore index 5e26f1711..7f5913727 100644 --- a/.gitignore +++ b/.gitignore @@ -40,4 +40,3 @@ seccomp.64 seccomp.block_secondary seccomp.mdwx src/common.mk - diff --git a/src/common.mk.in b/src/common.mk.in index 7a2056e7b..b9af977ae 100644 --- a/src/common.mk.in +++ b/src/common.mk.in @@ -32,4 +32,3 @@ CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' $(HAVE_GCOV LDFLAGS += -pie -Wl,-z,relro -Wl,-z,now -lpthread EXTRA_LDFLAGS +=@EXTRA_LDFLAGS@ EXTRA_CFLAGS +=@EXTRA_CFLAGS@ - diff --git a/src/fbuilder/build_fs.c b/src/fbuilder/build_fs.c index c865ee929..4feb8d9bc 100644 --- a/src/fbuilder/build_fs.c +++ b/src/fbuilder/build_fs.c @@ -314,4 +314,3 @@ void build_dev(const char *fname, FILE *fp) { fprintf(fp, "\n"); } } - diff --git a/src/fbuilder/build_seccomp.c b/src/fbuilder/build_seccomp.c index 8a2268b3b..6fe4c56d8 100644 --- a/src/fbuilder/build_seccomp.c +++ b/src/fbuilder/build_seccomp.c @@ -189,4 +189,3 @@ void build_protocol(const char *fname, FILE *fp) { fprintf(fp, "netfilter\n"); } } - diff --git a/src/fbuilder/fbuilder.h b/src/fbuilder/fbuilder.h index 811750bd0..66bf8c544 100644 --- a/src/fbuilder/fbuilder.h +++ b/src/fbuilder/fbuilder.h @@ -67,4 +67,4 @@ FileDB *filedb_add(FileDB *head, const char *fname); FileDB *filedb_find(FileDB *head, const char *fname); void filedb_print(FileDB *head, const char *prefix, FILE *fp); -#endif \ No newline at end of file +#endif diff --git a/src/fbuilder/filedb.c b/src/fbuilder/filedb.c index ac2837373..89fe72c29 100644 --- a/src/fbuilder/filedb.c +++ b/src/fbuilder/filedb.c @@ -76,4 +76,3 @@ void filedb_print(FileDB *head, const char *prefix, FILE *fp) { ptr = ptr->next; } } - diff --git a/src/firecfg/desktop_files.c b/src/firecfg/desktop_files.c index 7a4df83dd..525d9b6f9 100644 --- a/src/firecfg/desktop_files.c +++ b/src/firecfg/desktop_files.c @@ -322,5 +322,3 @@ void fix_desktop_files(char *homedir) { closedir(dir); free(user_apps_dir); } - - diff --git a/src/firecfg/firecfg.h b/src/firecfg/firecfg.h index 2b1c45d40..e847719cf 100644 --- a/src/firecfg/firecfg.h +++ b/src/firecfg/firecfg.h @@ -48,4 +48,3 @@ void sound(void); // desktop_files.c void fix_desktop_files(char *homedir); - diff --git a/src/firecfg/sound.c b/src/firecfg/sound.c index c54394c22..2d38e4cfb 100644 --- a/src/firecfg/sound.c +++ b/src/firecfg/sound.c @@ -65,4 +65,3 @@ errexit: fprintf(stderr, "Error: cannot configure sound file\n"); exit(1); } - diff --git a/src/firejail/fs_lib2.c b/src/firejail/fs_lib2.c index 7c50dd5e2..9923190b5 100644 --- a/src/firejail/fs_lib2.c +++ b/src/firejail/fs_lib2.c @@ -308,8 +308,3 @@ void fslib_install_system(void) { ptr++; } } - - - - - diff --git a/src/firejail/network_main.c b/src/firejail/network_main.c index 4867e6e54..6a199469a 100644 --- a/src/firejail/network_main.c +++ b/src/firejail/network_main.c @@ -378,4 +378,4 @@ void net_print(pid_t pid) { enter_network_namespace(pid); sbox_run(SBOX_ROOT | SBOX_CAPS_NETWORK | SBOX_SECCOMP, 2, PATH_FNET_MAIN, "printif"); -} \ No newline at end of file +} diff --git a/src/firejail/preproc.c b/src/firejail/preproc.c index 160d6245f..905cc0f15 100644 --- a/src/firejail/preproc.c +++ b/src/firejail/preproc.c @@ -189,4 +189,3 @@ void preproc_clean_run(void) { free(pidarr); } - diff --git a/src/firejail/shutdown.c b/src/firejail/shutdown.c index f734fab7c..05cfdc89e 100644 --- a/src/firejail/shutdown.c +++ b/src/firejail/shutdown.c @@ -63,7 +63,7 @@ void shut(pid_t pid) { while (monsec) { sleep(1); monsec--; - + FILE *fp = fopen(monfile, "r"); if (!fp) { killdone = 1; diff --git a/src/fsec-optimize/fsec_optimize.h b/src/fsec-optimize/fsec_optimize.h index 76126d734..279118bee 100644 --- a/src/fsec-optimize/fsec_optimize.h +++ b/src/fsec-optimize/fsec_optimize.h @@ -27,4 +27,4 @@ struct sock_filter *duplicate(struct sock_filter *filter, int entries); int optimize(struct sock_filter * filter, int entries); -#endif \ No newline at end of file +#endif diff --git a/src/fsec-optimize/optimizer.c b/src/fsec-optimize/optimizer.c index f9e4b6a6c..69b99f595 100644 --- a/src/fsec-optimize/optimizer.c +++ b/src/fsec-optimize/optimizer.c @@ -133,4 +133,3 @@ struct sock_filter *duplicate(struct sock_filter *filter, int entries) { memcpy(rv, filter, len); return rv; } - diff --git a/src/fsec-print/fsec_print.h b/src/fsec-print/fsec_print.h index 0a40c09ed..777bc609a 100644 --- a/src/fsec-print/fsec_print.h +++ b/src/fsec-print/fsec_print.h @@ -29,4 +29,4 @@ void print(struct sock_filter *filter, int entries); // syscall_list.c const char *syscall_find_nr(int nr); -#endif \ No newline at end of file +#endif diff --git a/src/fsec-print/print.c b/src/fsec-print/print.c index d58ce2df9..8a5d69120 100644 --- a/src/fsec-print/print.c +++ b/src/fsec-print/print.c @@ -330,4 +330,3 @@ void print(struct sock_filter *filter, int entries) { printf("\n"); } } - diff --git a/src/include/ldd_utils.h b/src/include/ldd_utils.h index e5ec67171..c9e8b4098 100644 --- a/src/include/ldd_utils.h +++ b/src/include/ldd_utils.h @@ -43,4 +43,4 @@ int is_lib_64(const char *exe); -#endif \ No newline at end of file +#endif diff --git a/test/apps/apps.sh b/test/apps/apps.sh index 01546d104..c239ed8b8 100755 --- a/test/apps/apps.sh +++ b/test/apps/apps.sh @@ -19,4 +19,3 @@ for app in $LIST; do echo "TESTING SKIP: $app not found" fi done - diff --git a/test/filters/memwrexe.c b/test/filters/memwrexe.c index 7e14aa23d..b43b232d1 100644 --- a/test/filters/memwrexe.c +++ b/test/filters/memwrexe.c @@ -20,7 +20,7 @@ int main(int argc, char **argv) { usage(); return 1; } - + if (strcmp(argv[1], "mmap") == 0) { // open some file int fd = open("memwrexe.c", O_RDONLY); @@ -28,13 +28,13 @@ int main(int argc, char **argv) { fprintf(stderr, "TESTING ERROR: file not found, cannot run mmap test\n"); return 1; } - + int size = lseek(fd, 0, SEEK_END); if (size == -1) { fprintf(stderr, "TESTING ERROR: file not found, cannot run mmap test\n"); return 1; } - + void *p = mmap (0, size, PROT_WRITE|PROT_READ|PROT_EXEC, MAP_SHARED, fd, 0); printf("mmap successful\n"); @@ -51,19 +51,19 @@ int main(int argc, char **argv) { fprintf(stderr, "TESTING ERROR: file not found, cannot run mmap test\n"); return 1; } - + int size = lseek(fd, 0, SEEK_END); if (size == -1) { fprintf(stderr, "TESTING ERROR: file not found, cannot run mmap test\n"); return 1; } - + void *p = mmap (0, size, PROT_READ, MAP_SHARED, fd, 0); if (!p) { fprintf(stderr, "TESTING ERROR: cannot map file for mprotect test\n"); return 1; } - + mprotect(p, size, PROT_READ|PROT_WRITE|PROT_EXEC); printf("mprotect successful\n"); @@ -73,4 +73,3 @@ int main(int argc, char **argv) { return 0; } } - \ No newline at end of file diff --git a/test/fnetfilter/test1.net b/test/fnetfilter/test1.net index e60127373..ce21f20c2 100644 --- a/test/fnetfilter/test1.net +++ b/test/fnetfilter/test1.net @@ -16,4 +16,3 @@ -A OUTPUT -p tcp --dport 3478 -j DROP -A OUTPUT -p tcp --dport 3479 -j DROP COMMIT - diff --git a/test/fnetfilter/test2.net b/test/fnetfilter/test2.net index a02785413..f389cd16d 100644 --- a/test/fnetfilter/test2.net +++ b/test/fnetfilter/test2.net @@ -9,11 +9,10 @@ #-A INPUT -p icmp --$ARG1 echo-reply -j ACCEPT -A INPUT -p icmp --$ARG1 $ARG2 -j ACCEPT -A INPUT -p icmp --$ARG1 $ARG3 -j ACCEPT --A INPUT -p icmp --$ARG1 $ARG4 -j ACCEPT +-A INPUT -p icmp --$ARG1 $ARG4 -j ACCEPT # disable STUN -A OUTPUT -p udp --dport $ARG5 -j DROP -A OUTPUT -p udp --dport $ARG6 -j DROP -A OUTPUT -p tcp --dport $ARG5 -j DROP -A OUTPUT -p tcp --dport $ARG6 -j DROP COMMIT - diff --git a/test/hidepid-howto b/test/hidepid-howto index f207c9109..0fa1e5d86 100644 --- a/test/hidepid-howto +++ b/test/hidepid-howto @@ -23,5 +23,3 @@ $ cat /proc/mounts | grep proc proc /proc proc rw,nosuid,nodev,noexec,relatime,gid=618,hidepid=2 0 0 3. Test "firejail --list", "firejail --top", "firejail --tree", "firejail --netstats" - - diff --git a/test/network/tcpserver.c b/test/network/tcpserver.c index e8f89b097..9de965858 100644 --- a/test/network/tcpserver.c +++ b/test/network/tcpserver.c @@ -35,7 +35,7 @@ int main(int argc, char **argv) { return 1; } int portno = atoi(argv[1]); - + // init socket fd = socket(AF_INET, SOCK_STREAM, 0); if (fd < 0) { @@ -82,7 +82,7 @@ int main(int argc, char **argv) { if (pid == 0) { // child close(fd); -#define MAXBUF 4096 +#define MAXBUF 4096 char buf[MAXBUF]; memset(buf, 0, MAXBUF); @@ -103,6 +103,6 @@ int main(int argc, char **argv) { else close(newfd); } - + return 0; } diff --git a/test/profiles/profiles.sh b/test/profiles/profiles.sh index 46662cef5..85e5c1c13 100755 --- a/test/profiles/profiles.sh +++ b/test/profiles/profiles.sh @@ -43,4 +43,3 @@ do echo "TESTING: $PROFILE" ./test-profile.exp $PROFILE done - diff --git a/test/profiles/test3.profile b/test/profiles/test3.profile index c28ddadb5..5a70bd829 100644 --- a/test/profiles/test3.profile +++ b/test/profiles/test3.profile @@ -1 +1 @@ -include test3.profile \ No newline at end of file +include test3.profile diff --git a/test/root/option_tmpfs.exp b/test/root/option_tmpfs.exp index 3d492dfdb..cac692cb2 100755 --- a/test/root/option_tmpfs.exp +++ b/test/root/option_tmpfs.exp @@ -37,4 +37,3 @@ after 100 puts "\nall done\n" - diff --git a/test/utils/caps2.profile b/test/utils/caps2.profile index cb2258c52..e760d4cb5 100644 --- a/test/utils/caps2.profile +++ b/test/utils/caps2.profile @@ -1 +1 @@ -caps.keep chown,kill \ No newline at end of file +caps.keep chown,kill