From 248ec402aa287dd5289b33ff646f22544cf0d4ac Mon Sep 17 00:00:00 2001 From: Fred Barclay Date: Sat, 1 Feb 2020 11:08:48 -0600 Subject: housekeeping: strip unneeded whitespace --- contrib/syscalls.sh | 2 +- etc/barrier.profile | 2 +- src/firejail/fs_etc.c | 2 +- src/firejail/macros.c | 2 +- src/firejail/sbox.c | 2 +- src/firejail/x11.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/syscalls.sh b/contrib/syscalls.sh index c9cbad4a6..c9b5a245a 100755 --- a/contrib/syscalls.sh +++ b/contrib/syscalls.sh @@ -10,7 +10,7 @@ if [ $# -eq 0 ] then echo echo " *** No program specified!!! ***" -echo +echo echo -e "Make this file executable and execute it as:\\n" echo -e "\\e[96m syscalls.sh /full/path/to/program\\n" echo -e "\\e[39mif you saved this script in a directory in your PATH (e.g., in ${HOME}/bin), otherwise as:\\n" diff --git a/etc/barrier.profile b/etc/barrier.profile index a35bb1e09..f5da3782e 100644 --- a/etc/barrier.profile +++ b/etc/barrier.profile @@ -4,7 +4,7 @@ # Persistent local customizations include barrier.local # Persistent global definitions -include globals.local +include globals.local noblacklist ${HOME}/.config/Debauchee/Barrier.conf noblacklist ${HOME}/.local/share/barrier diff --git a/src/firejail/fs_etc.c b/src/firejail/fs_etc.c index 26e010d0d..7b7813926 100644 --- a/src/firejail/fs_etc.c +++ b/src/firejail/fs_etc.c @@ -141,7 +141,7 @@ void fs_private_dir_list(const char *private_dir, const char *private_run_dir, c assert(private_dir); assert(private_run_dir); assert(private_list); - + // nothing to do if directory does not exist struct stat s; if (stat(private_dir, &s) == -1) { diff --git a/src/firejail/macros.c b/src/firejail/macros.c index 6901b7d44..724411e13 100644 --- a/src/firejail/macros.c +++ b/src/firejail/macros.c @@ -306,7 +306,7 @@ void invalid_filename(const char *fname, int globbing) { } i++; } - + char *reject; if (globbing) reject = "\\&!\"'<>%^{};,"; // file globbing ('*?[]') is allowed diff --git a/src/firejail/sbox.c b/src/firejail/sbox.c index 203c0fc03..77ca07a81 100644 --- a/src/firejail/sbox.c +++ b/src/firejail/sbox.c @@ -116,7 +116,7 @@ int sbox_run(unsigned filtermask, int num, ...) { arg[i] = NULL; va_end(valist); - int status = sbox_run_v(filtermask, arg); + int status = sbox_run_v(filtermask, arg); free(arg); diff --git a/src/firejail/x11.c b/src/firejail/x11.c index 9a50532c2..6395903f9 100644 --- a/src/firejail/x11.c +++ b/src/firejail/x11.c @@ -1238,7 +1238,7 @@ void x11_xorg(void) { errLogExit("invalid .Xauthority mount"); ASSERT_PERMS(dest, getuid(), getgid(), 0600); - + // blacklist .Xauthority file if it is not masked already char *envar = getenv("XAUTHORITY"); if (envar) { -- cgit v1.2.3-54-g00ecf