From 3812c139a6580113572f68ea1a8fd277d410777c Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Fri, 17 Feb 2023 18:25:34 -0300 Subject: 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. --- README.md | 2 -- etc/profile-a-l/bibtex.profile | 1 - etc/profile-a-l/latex.profile | 1 - etc/profile-m-z/pdflatex.profile | 1 - etc/profile-m-z/presentations18.profile | 1 - etc/profile-m-z/tex.profile | 1 - etc/profile-m-z/textmaker18.profile | 1 - etc/profile-m-z/textmaker18free.profile | 1 - src/etc-cleanup/main.c | 2 +- src/fids/config | 1 - src/fids/db.c | 1 - src/fids/db_exclude.c | 1 - src/firejail/fs_etc.c | 1 - src/firejail/oom.c | 1 - src/fnettrace-dns/fnettrace_dns.h | 2 +- src/fnettrace-icmp/fnettrace_icmp.h | 2 +- src/fnettrace-sni/fnettrace_sni.h | 2 +- src/fnettrace/fnettrace.h | 2 +- src/fnettrace/hostnames.c | 1 - src/fnettrace/radix.c | 1 - src/fnettrace/radix.h | 2 +- src/jailcheck/apparmor.c | 1 - src/jailcheck/network.c | 3 --- src/jailcheck/utils.c | 1 - test/private-etc/private-etc.sh | 1 - test/private-lib/private-lib.sh | 1 - test/sysutils/sysutils.sh | 1 - 27 files changed, 6 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index 0f6ca9b08..22e2fa291 100644 --- a/README.md +++ b/README.md @@ -268,5 +268,3 @@ Stats: dbus-system filter 12 ``` - - diff --git a/etc/profile-a-l/bibtex.profile b/etc/profile-a-l/bibtex.profile index e868dcbab..5f12d61f1 100644 --- a/etc/profile-a-l/bibtex.profile +++ b/etc/profile-a-l/bibtex.profile @@ -9,4 +9,3 @@ private-bin bibtex # Redirect include latex-common.profile - diff --git a/etc/profile-a-l/latex.profile b/etc/profile-a-l/latex.profile index 2230dd570..f6e625d35 100644 --- a/etc/profile-a-l/latex.profile +++ b/etc/profile-a-l/latex.profile @@ -9,4 +9,3 @@ private-bin latex # Redirect include latex-common.profile - diff --git a/etc/profile-m-z/pdflatex.profile b/etc/profile-m-z/pdflatex.profile index caf980d4d..ddf6d0990 100644 --- a/etc/profile-m-z/pdflatex.profile +++ b/etc/profile-m-z/pdflatex.profile @@ -9,4 +9,3 @@ private-bin pdflatex # Redirect include latex-common.profile - diff --git a/etc/profile-m-z/presentations18.profile b/etc/profile-m-z/presentations18.profile index 65d684c40..ac844d1af 100644 --- a/etc/profile-m-z/presentations18.profile +++ b/etc/profile-m-z/presentations18.profile @@ -8,4 +8,3 @@ include globals.local # Redirect include softmaker-common.profile - diff --git a/etc/profile-m-z/tex.profile b/etc/profile-m-z/tex.profile index f56c3038e..c850cf5c3 100644 --- a/etc/profile-m-z/tex.profile +++ b/etc/profile-m-z/tex.profile @@ -9,4 +9,3 @@ private-bin tex # Redirect include latex-common.profile - diff --git a/etc/profile-m-z/textmaker18.profile b/etc/profile-m-z/textmaker18.profile index e5a4b6454..8284df791 100644 --- a/etc/profile-m-z/textmaker18.profile +++ b/etc/profile-m-z/textmaker18.profile @@ -8,4 +8,3 @@ include globals.local # Redirect include softmaker-common.profile - diff --git a/etc/profile-m-z/textmaker18free.profile b/etc/profile-m-z/textmaker18free.profile index 0e918bf0a..ad945ca55 100644 --- a/etc/profile-m-z/textmaker18free.profile +++ b/etc/profile-m-z/textmaker18free.profile @@ -8,4 +8,3 @@ include globals.local # Redirect include softmaker-common.profile - 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) { process_file(argv[i]); return 0; -} \ No newline at end of file +} 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 @@ /home/netblue/Desktop/*.desktop /home/netblue/.ssh /home/netblue/.gnupg - 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: fprintf(stderr, "Error fids: database corrupted\n"); exit(1); } - 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) { return 0; } - 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 fs_private_dir_mount(private_dir, private_run_dir); fmessage("Private %s installed in %0.2f ms\n", private_dir, timetrace_end()); } - 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) { if (waitpid(child, &status, 0) == -1 ) errExit("waitpid"); } - 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 @@ #include #include -#endif \ No newline at end of file +#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 @@ #include #include -#endif \ No newline at end of file +#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 @@ #include #include -#endif \ No newline at end of file +#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); // tail.c void tail(const char *logfile); -#endif \ No newline at end of file +#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: fprintf(stderr, "Error: invalid line %d in file %s\n", line, fname); exit(1); } - 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) { return (rv)? rv->name: NULL; } - 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; char *radix_longest_prefix_match(uint32_t ip); char *radix_add(uint32_t ip, uint32_t mask, char *name); -#endif \ No newline at end of file +#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) { return; } #endif - 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) { else printf(" Networking: disabled\n"); } - - - 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) { // this happens for processes sandboxed with --join return first_child; } - diff --git a/test/private-etc/private-etc.sh b/test/private-etc/private-etc.sh index 8488611b9..c46b684af 100755 --- a/test/private-etc/private-etc.sh +++ b/test/private-etc/private-etc.sh @@ -18,4 +18,3 @@ echo "TESTING: groups (test/private-etc/groups.exp)" echo "TESTING: etc-cleanup (test/private-etc/etc-cleanup.exp)" ./etc-cleanup.exp - diff --git a/test/private-lib/private-lib.sh b/test/private-lib/private-lib.sh index 0ef18b79d..5c67b16c5 100755 --- a/test/private-lib/private-lib.sh +++ b/test/private-lib/private-lib.sh @@ -29,4 +29,3 @@ if [[ $(uname -m) == "x86_64" ]]; then else echo "TESTING SKIP: private-lib test implemented only for x86_64." fi - diff --git a/test/sysutils/sysutils.sh b/test/sysutils/sysutils.sh index 34acca07d..94f0b1f76 100755 --- a/test/sysutils/sysutils.sh +++ b/test/sysutils/sysutils.sh @@ -158,4 +158,3 @@ then else echo "TESTING SKIP: whois not found" fi - -- cgit v1.2.3-54-g00ecf