From 2f8688a17eb9f20d15b1ac53cb58c2759987ed71 Mon Sep 17 00:00:00 2001
From: netblue30 <netblue30@yahoo.com>
Date: Sun, 13 Nov 2016 20:35:12 -0500
Subject: testing

---
 src/firejail/fs_home.c    |  3 +++
 src/firejail/preproc.c    | 12 ++----------
 src/firejail/pulseaudio.c |  4 ++--
 3 files changed, 7 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/firejail/fs_home.c b/src/firejail/fs_home.c
index 91fbe592a..242482d26 100644
--- a/src/firejail/fs_home.c
+++ b/src/firejail/fs_home.c
@@ -626,6 +626,9 @@ void fs_private_home_list(void) {
 
 		fs_logger_print();	// save the current log
 		free(dlist);
+#ifdef HAVE_GCOV
+	__gcov_flush();
+#endif
 		_exit(0);
 	}
 	// wait for the child to finish
diff --git a/src/firejail/preproc.c b/src/firejail/preproc.c
index fe5f2eb44..ea4e6743f 100644
--- a/src/firejail/preproc.c
+++ b/src/firejail/preproc.c
@@ -104,16 +104,8 @@ void preproc_build_cp_command(void) {
 	preproc_mount_mnt_dir();
 	if (stat(RUN_CP_COMMAND, &s)) {
 		char* fname = realpath("/bin/cp", NULL);
-		if (fname == NULL) {
-			fprintf(stderr, "Error: /bin/cp not found\n");
-			exit(1);
-		}
-		if (stat(fname, &s)) {
-			fprintf(stderr, "Error: /bin/cp not found\n");
-			exit(1);
-		}
-		if (is_link(fname)) {
-			fprintf(stderr, "Error: invalid /bin/cp file\n");
+		if (fname == NULL || stat(fname, &s) || is_link(fname)) {
+			fprintf(stderr, "Error: invalid /bin/cp\n");
 			exit(1);
 		}
 		int rv = copy_file(fname, RUN_CP_COMMAND, 0, 0, 0755);
diff --git a/src/firejail/pulseaudio.c b/src/firejail/pulseaudio.c
index c76505591..6ec590eaa 100644
--- a/src/firejail/pulseaudio.c
+++ b/src/firejail/pulseaudio.c
@@ -130,7 +130,7 @@ void pulseaudio_init(void) {
 		int rv = mkdir(dir1, 0755);
 		if (rv == 0) {
 			if (set_perms(dir1, getuid(), getgid(), 0755))
-				; // do nothing
+				{;} // do nothing
 		}
 	}
 	free(dir1);
@@ -140,7 +140,7 @@ void pulseaudio_init(void) {
 		int rv = mkdir(dir1, 0700);
 		if (rv == 0) {
 			if (set_perms(dir1, getuid(), getgid(), 0700))
-				; // do nothing
+				{;} // do nothing
 		}
 	}
 	free(dir1);
-- 
cgit v1.2.3-54-g00ecf