aboutsummaryrefslogtreecommitdiffstats
path: root/src/firejail/ls.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/firejail/ls.c')
-rw-r--r--src/firejail/ls.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/src/firejail/ls.c b/src/firejail/ls.c
index 6ee557648..70985ba9e 100644
--- a/src/firejail/ls.c
+++ b/src/firejail/ls.c
@@ -19,6 +19,7 @@
19*/ 19*/
20 20
21#include "firejail.h" 21#include "firejail.h"
22#include "../include/gcov_wrapper.h"
22#include <sys/types.h> 23#include <sys/types.h>
23#include <sys/stat.h> 24#include <sys/stat.h>
24#include <sys/wait.h> 25#include <sys/wait.h>
@@ -31,10 +32,6 @@
31//#include <stdio.h> 32//#include <stdio.h>
32//#include <stdlib.h> 33//#include <stdlib.h>
33 34
34#ifdef HAVE_GCOV
35#include <gcov.h>
36#endif
37
38// uid/gid cache 35// uid/gid cache
39static uid_t c_uid = 0; 36static uid_t c_uid = 0;
40static char *c_uid_name = NULL; 37static char *c_uid_name = NULL;
@@ -353,9 +350,8 @@ void sandboxfs(int op, pid_t pid, const char *path1, const char *path2) {
353 ls(fname1); 350 ls(fname1);
354 else 351 else
355 cat(fname1); 352 cat(fname1);
356#ifdef HAVE_GCOV 353
357 __gcov_flush(); 354 __gcov_flush();
358#endif
359 } 355 }
360 // get file from host and store it in the sandbox 356 // get file from host and store it in the sandbox
361 else if (op == SANDBOX_FS_PUT && path2) { 357 else if (op == SANDBOX_FS_PUT && path2) {
@@ -387,9 +383,9 @@ void sandboxfs(int op, pid_t pid, const char *path1, const char *path2) {
387 // copy the file 383 // copy the file
388 if (copy_file(src_fname, tmp_fname, getuid(), getgid(), 0600)) // already a regular user 384 if (copy_file(src_fname, tmp_fname, getuid(), getgid(), 0600)) // already a regular user
389 _exit(1); 385 _exit(1);
390#ifdef HAVE_GCOV 386
391 __gcov_flush(); 387 __gcov_flush();
392#endif 388
393 _exit(0); 389 _exit(0);
394 } 390 }
395 391
@@ -419,9 +415,9 @@ void sandboxfs(int op, pid_t pid, const char *path1, const char *path2) {
419 // copy the file 415 // copy the file
420 if (copy_file(tmp_fname, dest_fname, getuid(), getgid(), 0600)) // already a regular user 416 if (copy_file(tmp_fname, dest_fname, getuid(), getgid(), 0600)) // already a regular user
421 _exit(1); 417 _exit(1);
422#ifdef HAVE_GCOV 418
423 __gcov_flush(); 419 __gcov_flush();
424#endif 420
425 _exit(0); 421 _exit(0);
426 } 422 }
427 423