diff options
author | Fred-Barclay <Fred-Barclay@users.noreply.github.com> | 2019-02-17 17:04:02 -0600 |
---|---|---|
committer | Fred-Barclay <Fred-Barclay@users.noreply.github.com> | 2019-02-17 17:04:02 -0600 |
commit | 6181f75e3f1b73708eaef7e22364ed0e9a1c482e (patch) | |
tree | f888a4871612a8b9f0ef9b8f7ae916aaf105f2be /src | |
parent | merges (diff) | |
download | firejail-6181f75e3f1b73708eaef7e22364ed0e9a1c482e.tar.gz firejail-6181f75e3f1b73708eaef7e22364ed0e9a1c482e.tar.zst firejail-6181f75e3f1b73708eaef7e22364ed0e9a1c482e.zip |
Housekeeping
Make sure all files end with a newline
Strip extra newlines and trailing whitespace from files
Diffstat (limited to 'src')
-rw-r--r-- | src/common.mk.in | 1 | ||||
-rw-r--r-- | src/fbuilder/build_fs.c | 1 | ||||
-rw-r--r-- | src/fbuilder/build_seccomp.c | 1 | ||||
-rw-r--r-- | src/fbuilder/fbuilder.h | 2 | ||||
-rw-r--r-- | src/fbuilder/filedb.c | 1 | ||||
-rw-r--r-- | src/firecfg/desktop_files.c | 2 | ||||
-rw-r--r-- | src/firecfg/firecfg.h | 1 | ||||
-rw-r--r-- | src/firecfg/sound.c | 1 | ||||
-rw-r--r-- | src/firejail/fs_lib2.c | 5 | ||||
-rw-r--r-- | src/firejail/network_main.c | 2 | ||||
-rw-r--r-- | src/firejail/preproc.c | 1 | ||||
-rw-r--r-- | src/firejail/shutdown.c | 2 | ||||
-rw-r--r-- | src/fsec-optimize/fsec_optimize.h | 2 | ||||
-rw-r--r-- | src/fsec-optimize/optimizer.c | 1 | ||||
-rw-r--r-- | src/fsec-print/fsec_print.h | 2 | ||||
-rw-r--r-- | src/fsec-print/print.c | 1 | ||||
-rw-r--r-- | src/include/ldd_utils.h | 2 |
17 files changed, 6 insertions, 22 deletions
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 | |||
32 | LDFLAGS += -pie -Wl,-z,relro -Wl,-z,now -lpthread | 32 | LDFLAGS += -pie -Wl,-z,relro -Wl,-z,now -lpthread |
33 | EXTRA_LDFLAGS +=@EXTRA_LDFLAGS@ | 33 | EXTRA_LDFLAGS +=@EXTRA_LDFLAGS@ |
34 | EXTRA_CFLAGS +=@EXTRA_CFLAGS@ | 34 | EXTRA_CFLAGS +=@EXTRA_CFLAGS@ |
35 | |||
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) { | |||
314 | fprintf(fp, "\n"); | 314 | fprintf(fp, "\n"); |
315 | } | 315 | } |
316 | } | 316 | } |
317 | |||
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) { | |||
189 | fprintf(fp, "netfilter\n"); | 189 | fprintf(fp, "netfilter\n"); |
190 | } | 190 | } |
191 | } | 191 | } |
192 | |||
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); | |||
67 | FileDB *filedb_find(FileDB *head, const char *fname); | 67 | FileDB *filedb_find(FileDB *head, const char *fname); |
68 | void filedb_print(FileDB *head, const char *prefix, FILE *fp); | 68 | void filedb_print(FileDB *head, const char *prefix, FILE *fp); |
69 | 69 | ||
70 | #endif \ No newline at end of file | 70 | #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) { | |||
76 | ptr = ptr->next; | 76 | ptr = ptr->next; |
77 | } | 77 | } |
78 | } | 78 | } |
79 | |||
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) { | |||
322 | closedir(dir); | 322 | closedir(dir); |
323 | free(user_apps_dir); | 323 | free(user_apps_dir); |
324 | } | 324 | } |
325 | |||
326 | |||
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); | |||
48 | 48 | ||
49 | // desktop_files.c | 49 | // desktop_files.c |
50 | void fix_desktop_files(char *homedir); | 50 | void fix_desktop_files(char *homedir); |
51 | |||
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: | |||
65 | fprintf(stderr, "Error: cannot configure sound file\n"); | 65 | fprintf(stderr, "Error: cannot configure sound file\n"); |
66 | exit(1); | 66 | exit(1); |
67 | } | 67 | } |
68 | |||
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) { | |||
308 | ptr++; | 308 | ptr++; |
309 | } | 309 | } |
310 | } | 310 | } |
311 | |||
312 | |||
313 | |||
314 | |||
315 | |||
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) { | |||
378 | 378 | ||
379 | enter_network_namespace(pid); | 379 | enter_network_namespace(pid); |
380 | sbox_run(SBOX_ROOT | SBOX_CAPS_NETWORK | SBOX_SECCOMP, 2, PATH_FNET_MAIN, "printif"); | 380 | sbox_run(SBOX_ROOT | SBOX_CAPS_NETWORK | SBOX_SECCOMP, 2, PATH_FNET_MAIN, "printif"); |
381 | } \ No newline at end of file | 381 | } |
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) { | |||
189 | 189 | ||
190 | free(pidarr); | 190 | free(pidarr); |
191 | } | 191 | } |
192 | |||
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) { | |||
63 | while (monsec) { | 63 | while (monsec) { |
64 | sleep(1); | 64 | sleep(1); |
65 | monsec--; | 65 | monsec--; |
66 | 66 | ||
67 | FILE *fp = fopen(monfile, "r"); | 67 | FILE *fp = fopen(monfile, "r"); |
68 | if (!fp) { | 68 | if (!fp) { |
69 | killdone = 1; | 69 | 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 @@ | |||
27 | struct sock_filter *duplicate(struct sock_filter *filter, int entries); | 27 | struct sock_filter *duplicate(struct sock_filter *filter, int entries); |
28 | int optimize(struct sock_filter * filter, int entries); | 28 | int optimize(struct sock_filter * filter, int entries); |
29 | 29 | ||
30 | #endif \ No newline at end of file | 30 | #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) { | |||
133 | memcpy(rv, filter, len); | 133 | memcpy(rv, filter, len); |
134 | return rv; | 134 | return rv; |
135 | } | 135 | } |
136 | |||
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); | |||
29 | // syscall_list.c | 29 | // syscall_list.c |
30 | const char *syscall_find_nr(int nr); | 30 | const char *syscall_find_nr(int nr); |
31 | 31 | ||
32 | #endif \ No newline at end of file | 32 | #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) { | |||
330 | printf("\n"); | 330 | printf("\n"); |
331 | } | 331 | } |
332 | } | 332 | } |
333 | |||
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); | |||
43 | 43 | ||
44 | 44 | ||
45 | 45 | ||
46 | #endif \ No newline at end of file | 46 | #endif |