diff options
author | Kelvin M. Klann <kmk3.code@protonmail.com> | 2023-02-17 18:25:34 -0300 |
---|---|---|
committer | Kelvin M. Klann <kmk3.code@protonmail.com> | 2023-02-19 20:57:12 -0300 |
commit | 3812c139a6580113572f68ea1a8fd277d410777c (patch) | |
tree | 52b196e95a9ef510a1dc4c3648610ecb07cbeadb /src | |
parent | RELNOTES: add build and docs items (diff) | |
download | firejail-3812c139a6580113572f68ea1a8fd277d410777c.tar.gz firejail-3812c139a6580113572f68ea1a8fd277d410777c.tar.zst firejail-3812c139a6580113572f68ea1a8fd277d410777c.zip |
Fix EOL at EOF
Commands used to search and replace:
$ git grep -Ilz '.' | xargs -0 -I '{}' sh -c \
"printf '%s\n' \"\$(cat '{}')\" >'{}'"
The above commands ensure that there is exaclty 1 line terminator at EOF
(rather than 0 or more than 1) on all non-empty text files.
This fixes all of the "new blank line at EOF" errors raised by git:
$ git diff --check 4b825dc642cb6eb9a060e54bf8d69288fbee4904..HEAD |
grep '^[^+]' | cut -f 3 -d : | LC_ALL=C sort | uniq -c
21 new blank line at EOF.
72 space before tab in indent.
4 trailing whitespace.
Diffstat (limited to 'src')
-rw-r--r-- | src/etc-cleanup/main.c | 2 | ||||
-rw-r--r-- | src/fids/config | 1 | ||||
-rw-r--r-- | src/fids/db.c | 1 | ||||
-rw-r--r-- | src/fids/db_exclude.c | 1 | ||||
-rw-r--r-- | src/firejail/fs_etc.c | 1 | ||||
-rw-r--r-- | src/firejail/oom.c | 1 | ||||
-rw-r--r-- | src/fnettrace-dns/fnettrace_dns.h | 2 | ||||
-rw-r--r-- | src/fnettrace-icmp/fnettrace_icmp.h | 2 | ||||
-rw-r--r-- | src/fnettrace-sni/fnettrace_sni.h | 2 | ||||
-rw-r--r-- | src/fnettrace/fnettrace.h | 2 | ||||
-rw-r--r-- | src/fnettrace/hostnames.c | 1 | ||||
-rw-r--r-- | src/fnettrace/radix.c | 1 | ||||
-rw-r--r-- | src/fnettrace/radix.h | 2 | ||||
-rw-r--r-- | src/jailcheck/apparmor.c | 1 | ||||
-rw-r--r-- | src/jailcheck/network.c | 3 | ||||
-rw-r--r-- | src/jailcheck/utils.c | 1 |
16 files changed, 6 insertions, 18 deletions
diff --git a/src/etc-cleanup/main.c b/src/etc-cleanup/main.c index a51043e66..1f1a61f88 100644 --- a/src/etc-cleanup/main.c +++ b/src/etc-cleanup/main.c | |||
@@ -252,4 +252,4 @@ int main(int argc, char **argv) { | |||
252 | process_file(argv[i]); | 252 | process_file(argv[i]); |
253 | 253 | ||
254 | return 0; | 254 | return 0; |
255 | } \ No newline at end of file | 255 | } |
diff --git a/src/fids/config b/src/fids/config index c18c97260..7828622e8 100644 --- a/src/fids/config +++ b/src/fids/config | |||
@@ -13,4 +13,3 @@ | |||
13 | /home/netblue/Desktop/*.desktop | 13 | /home/netblue/Desktop/*.desktop |
14 | /home/netblue/.ssh | 14 | /home/netblue/.ssh |
15 | /home/netblue/.gnupg | 15 | /home/netblue/.gnupg |
16 | |||
diff --git a/src/fids/db.c b/src/fids/db.c index 6a21a4e14..7cad11cca 100644 --- a/src/fids/db.c +++ b/src/fids/db.c | |||
@@ -155,4 +155,3 @@ errexit: | |||
155 | fprintf(stderr, "Error fids: database corrupted\n"); | 155 | fprintf(stderr, "Error fids: database corrupted\n"); |
156 | exit(1); | 156 | exit(1); |
157 | } | 157 | } |
158 | |||
diff --git a/src/fids/db_exclude.c b/src/fids/db_exclude.c index 18a05209a..aedb95e4f 100644 --- a/src/fids/db_exclude.c +++ b/src/fids/db_exclude.c | |||
@@ -53,4 +53,3 @@ int db_exclude_check(const char *fname) { | |||
53 | 53 | ||
54 | return 0; | 54 | return 0; |
55 | } | 55 | } |
56 | |||
diff --git a/src/firejail/fs_etc.c b/src/firejail/fs_etc.c index 6c4d4c0c6..3b7369ea8 100644 --- a/src/firejail/fs_etc.c +++ b/src/firejail/fs_etc.c | |||
@@ -402,4 +402,3 @@ void fs_private_dir_list(const char *private_dir, const char *private_run_dir, c | |||
402 | fs_private_dir_mount(private_dir, private_run_dir); | 402 | fs_private_dir_mount(private_dir, private_run_dir); |
403 | fmessage("Private %s installed in %0.2f ms\n", private_dir, timetrace_end()); | 403 | fmessage("Private %s installed in %0.2f ms\n", private_dir, timetrace_end()); |
404 | } | 404 | } |
405 | |||
diff --git a/src/firejail/oom.c b/src/firejail/oom.c index f4df3538c..482fc0ad0 100644 --- a/src/firejail/oom.c +++ b/src/firejail/oom.c | |||
@@ -84,4 +84,3 @@ void oom_set(const char *oom_string) { | |||
84 | if (waitpid(child, &status, 0) == -1 ) | 84 | if (waitpid(child, &status, 0) == -1 ) |
85 | errExit("waitpid"); | 85 | errExit("waitpid"); |
86 | } | 86 | } |
87 | |||
diff --git a/src/fnettrace-dns/fnettrace_dns.h b/src/fnettrace-dns/fnettrace_dns.h index 6d8a3c211..b8f69e9d7 100644 --- a/src/fnettrace-dns/fnettrace_dns.h +++ b/src/fnettrace-dns/fnettrace_dns.h | |||
@@ -31,4 +31,4 @@ | |||
31 | #include <fcntl.h> | 31 | #include <fcntl.h> |
32 | #include <sys/mman.h> | 32 | #include <sys/mman.h> |
33 | 33 | ||
34 | #endif \ No newline at end of file | 34 | #endif |
diff --git a/src/fnettrace-icmp/fnettrace_icmp.h b/src/fnettrace-icmp/fnettrace_icmp.h index f535106e1..04c449ff2 100644 --- a/src/fnettrace-icmp/fnettrace_icmp.h +++ b/src/fnettrace-icmp/fnettrace_icmp.h | |||
@@ -31,4 +31,4 @@ | |||
31 | #include <fcntl.h> | 31 | #include <fcntl.h> |
32 | #include <sys/mman.h> | 32 | #include <sys/mman.h> |
33 | 33 | ||
34 | #endif \ No newline at end of file | 34 | #endif |
diff --git a/src/fnettrace-sni/fnettrace_sni.h b/src/fnettrace-sni/fnettrace_sni.h index f535106e1..04c449ff2 100644 --- a/src/fnettrace-sni/fnettrace_sni.h +++ b/src/fnettrace-sni/fnettrace_sni.h | |||
@@ -31,4 +31,4 @@ | |||
31 | #include <fcntl.h> | 31 | #include <fcntl.h> |
32 | #include <sys/mman.h> | 32 | #include <sys/mman.h> |
33 | 33 | ||
34 | #endif \ No newline at end of file | 34 | #endif |
diff --git a/src/fnettrace/fnettrace.h b/src/fnettrace/fnettrace.h index d3bc6439e..629b8ce5b 100644 --- a/src/fnettrace/fnettrace.h +++ b/src/fnettrace/fnettrace.h | |||
@@ -70,4 +70,4 @@ char* retrieve_hostname(uint32_t ip); | |||
70 | // tail.c | 70 | // tail.c |
71 | void tail(const char *logfile); | 71 | void tail(const char *logfile); |
72 | 72 | ||
73 | #endif \ No newline at end of file | 73 | #endif |
diff --git a/src/fnettrace/hostnames.c b/src/fnettrace/hostnames.c index 4f5641dfb..878a67123 100644 --- a/src/fnettrace/hostnames.c +++ b/src/fnettrace/hostnames.c | |||
@@ -121,4 +121,3 @@ errexit: | |||
121 | fprintf(stderr, "Error: invalid line %d in file %s\n", line, fname); | 121 | fprintf(stderr, "Error: invalid line %d in file %s\n", line, fname); |
122 | exit(1); | 122 | exit(1); |
123 | } | 123 | } |
124 | |||
diff --git a/src/fnettrace/radix.c b/src/fnettrace/radix.c index 97e890bec..a1d510a61 100644 --- a/src/fnettrace/radix.c +++ b/src/fnettrace/radix.c | |||
@@ -152,4 +152,3 @@ char *radix_longest_prefix_match(uint32_t ip) { | |||
152 | 152 | ||
153 | return (rv)? rv->name: NULL; | 153 | return (rv)? rv->name: NULL; |
154 | } | 154 | } |
155 | |||
diff --git a/src/fnettrace/radix.h b/src/fnettrace/radix.h index 85a75d0d7..d75fe3999 100644 --- a/src/fnettrace/radix.h +++ b/src/fnettrace/radix.h | |||
@@ -24,4 +24,4 @@ extern int radix_nodes; | |||
24 | char *radix_longest_prefix_match(uint32_t ip); | 24 | char *radix_longest_prefix_match(uint32_t ip); |
25 | char *radix_add(uint32_t ip, uint32_t mask, char *name); | 25 | char *radix_add(uint32_t ip, uint32_t mask, char *name); |
26 | 26 | ||
27 | #endif \ No newline at end of file | 27 | #endif |
diff --git a/src/jailcheck/apparmor.c b/src/jailcheck/apparmor.c index 9b6b72fb7..658928ed5 100644 --- a/src/jailcheck/apparmor.c +++ b/src/jailcheck/apparmor.c | |||
@@ -37,4 +37,3 @@ void apparmor_test(pid_t pid) { | |||
37 | return; | 37 | return; |
38 | } | 38 | } |
39 | #endif | 39 | #endif |
40 | |||
diff --git a/src/jailcheck/network.c b/src/jailcheck/network.c index 961a66105..a4d5eeec1 100644 --- a/src/jailcheck/network.c +++ b/src/jailcheck/network.c | |||
@@ -52,6 +52,3 @@ void network_test(void) { | |||
52 | else | 52 | else |
53 | printf(" Networking: disabled\n"); | 53 | printf(" Networking: disabled\n"); |
54 | } | 54 | } |
55 | |||
56 | |||
57 | |||
diff --git a/src/jailcheck/utils.c b/src/jailcheck/utils.c index 8460c1bf7..97fe8833b 100644 --- a/src/jailcheck/utils.c +++ b/src/jailcheck/utils.c | |||
@@ -99,4 +99,3 @@ int find_child(int id) { | |||
99 | // this happens for processes sandboxed with --join | 99 | // this happens for processes sandboxed with --join |
100 | return first_child; | 100 | return first_child; |
101 | } | 101 | } |
102 | |||