private-lib fixes

3 files changed, 13 insertions, 15 deletions

diff --git a/src/firejail/fs_bin.c b/src/firejail/fs_bin.c
index d4cdbbe0a..b0ad35299 100644
--- a/src/firejail/fs_bin.c
+++ b/src/firejail/fs_bin.c
@@ -25,6 +25,8 @@
 #include <unistd.h>
 #include <glob.h>
 
+static int prog_cnt = 0;
+
 static char *paths[] = {
         "/usr/local/bin",
         "/usr/bin",
@@ -191,6 +193,7 @@ static void duplicate(char *fname, FILE *fplist) {
                                 // solving problems such as /bin/sh -> /bin/dash
                                 // copy the real file pointed by symlink
                                 sbox_run(SBOX_ROOT| SBOX_SECCOMP, 3, PATH_FCOPY, actual_path, RUN_BIN_DIR);
+                                prog_cnt++;
                                 char *f = strrchr(actual_path, '/');
                                 if (f && *(++f) !='\0')
                                         report_duplication(f);
@@ -201,6 +204,7 @@ static void duplicate(char *fname, FILE *fplist) {
 
         // copy a file or a symlink
         sbox_run(SBOX_ROOT| SBOX_SECCOMP, 3, PATH_FCOPY, full_path, RUN_BIN_DIR);
+        prog_cnt++;
         free(full_path);
         report_duplication(fname);
 }
@@ -256,6 +260,9 @@ void fs_private_bin_list(void) {
         char *private_list = cfg.bin_private_keep;
         assert(private_list);
 
+        // start timetrace
+        timetrace_start();
+
         // create /run/firejail/mnt/bin directory
         mkdir_attr(RUN_BIN_DIR, 0755, 0, 0);
 
@@ -298,4 +305,5 @@ void fs_private_bin_list(void) {
                 }
                 i++;
         }
+        fmessage("%d %s installed in %0.2f ms\n", prog_cnt, (prog_cnt == 1)? "program": "programs", timetrace_end());
 }
diff --git a/src/firejail/fs_lib.c b/src/firejail/fs_lib.c
index 8a105be97..7892ab491 100644
--- a/src/firejail/fs_lib.c
+++ b/src/firejail/fs_lib.c
@@ -377,20 +377,12 @@ void fs_private_lib(void) {
                 printf("*** Installing system libraries\n");
         fslib_install_system();
 
-        fmessage("Installed %d libraries and %d directories\n", lib_cnt, dir_cnt);
+        fmessage("Installed %d %s and %d %s\n", lib_cnt, (lib_cnt == 1)? "library": "libraries",
+                dir_cnt, (dir_cnt == 1)? "directory": "directories");
 
-        // bring in firejail directory for --trace options
+        // bring in firejail directory for --trace and seccomp post exec
         fslib_copy_dir(LIBDIR "/firejail");
 
-        // ... and for sandbox in sandbox functionality
-        fslib_copy_libs(LIBDIR "/firejail/faudit");
-        fslib_copy_libs(LIBDIR "/firejail/fbuilder");
-        fslib_copy_libs(LIBDIR "/firejail/fcopy");
-        fslib_copy_libs(LIBDIR "/firejail/fldd");
-        fslib_copy_libs(LIBDIR "/firejail/fnet");
-        fslib_copy_libs(LIBDIR "/firejail/fnetfilter");
-        fslib_copy_libs(LIBDIR "/firejail/fseccomp");
-        fslib_copy_libs(LIBDIR "/firejail/ftee");
         // mount lib filesystem
         mount_directories();
 }
diff --git a/src/fldd/main.c b/src/fldd/main.c
index be4500d2a..4658e82fb 100644
--- a/src/fldd/main.c
+++ b/src/fldd/main.c
@@ -340,10 +340,8 @@ printf("\n");
         else {
                 if (is_lib_64(argv[1]))
                         parse_elf(argv[1]);
-                else {
-                        fprintf(stderr, "Error fldd: %s is not a 64bit program/library\n", argv[1]);
-                        exit(1);
-                }
+                else
+                        fprintf(stderr, "Warning fldd: %s is not a 64bit program/library\n", argv[1]);
         }