summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2016-09-06 10:13:11 -0400
committerLibravatar netblue30 <netblue30@yahoo.com>2016-09-06 10:13:11 -0400
commitfa424ad84d1bcabdc35611fac4b3ca1ebe51e1e1 (patch)
tree4823ec63e95671de9f60ea2b8dbfad401f0158de /src
parenttodo (diff)
downloadfirejail-fa424ad84d1bcabdc35611fac4b3ca1ebe51e1e1.tar.gz
firejail-fa424ad84d1bcabdc35611fac4b3ca1ebe51e1e1.tar.zst
firejail-fa424ad84d1bcabdc35611fac4b3ca1ebe51e1e1.zip
compile cleanup
Diffstat (limited to 'src')
-rw-r--r--src/firecfg/main.c2
-rw-r--r--src/firejail/firejail.h4
-rw-r--r--src/firejail/fs_home.c2
3 files changed, 7 insertions, 1 deletions
diff --git a/src/firecfg/main.c b/src/firecfg/main.c
index 3f9285776..d2566ce22 100644
--- a/src/firecfg/main.c
+++ b/src/firecfg/main.c
@@ -387,7 +387,7 @@ static void fix_desktop_files(void) {
387 387
388 // put '\0' at end of filename 388 // put '\0' at end of filename
389 char *tail = NULL; 389 char *tail = NULL;
390 char endchar; 390 char endchar = ' ';
391 if (execname[0] == '/') { 391 if (execname[0] == '/') {
392 char *ptr2 = index(execname, ' '); 392 char *ptr2 = index(execname, ' ');
393 char *ptr3 = index(execname, '\n'); 393 char *ptr3 = index(execname, '\n');
diff --git a/src/firejail/firejail.h b/src/firejail/firejail.h
index 9b60d40c2..cb8070ae6 100644
--- a/src/firejail/firejail.h
+++ b/src/firejail/firejail.h
@@ -478,6 +478,10 @@ void fs_private_template(void);
478void fs_check_private_dir(void); 478void fs_check_private_dir(void);
479// check new private template home directory (--private-template= option) exit if it fails 479// check new private template home directory (--private-template= option) exit if it fails
480void fs_check_private_template(void); 480void fs_check_private_template(void);
481// check directory list specified by user (--private-home option) - exit if it fails
482void fs_check_home_list(void);
483void fs_private_home_list(void);
484
481 485
482// seccomp.c 486// seccomp.c
483int seccomp_filter_drop(int enforce_seccomp); 487int seccomp_filter_drop(int enforce_seccomp);
diff --git a/src/firejail/fs_home.c b/src/firejail/fs_home.c
index a4b2ec046..064340613 100644
--- a/src/firejail/fs_home.c
+++ b/src/firejail/fs_home.c
@@ -361,6 +361,8 @@ static unsigned size_cnt = 0;
361static char *check_dir_or_file(const char *name); 361static char *check_dir_or_file(const char *name);
362 362
363int fs_copydir(const char *path, const struct stat *st, int ftype, struct FTW *sftw) { 363int fs_copydir(const char *path, const struct stat *st, int ftype, struct FTW *sftw) {
364 (void) st;
365 (void) sftw;
364 if (size_limit_reached) 366 if (size_limit_reached)
365 return 0; 367 return 0;
366 368