summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2016-12-22 11:05:32 -0500
committerLibravatar netblue30 <netblue30@yahoo.com>2016-12-22 11:05:32 -0500
commitde123793c3d2ded6d19c1cebd7bc085e26857ee6 (patch)
treef8033b9a395f0b831d14af6a68dbe8f63c56dc4e
parentMerge pull request #994 from valoq/master (diff)
downloadfirejail-de123793c3d2ded6d19c1cebd7bc085e26857ee6.tar.gz
firejail-de123793c3d2ded6d19c1cebd7bc085e26857ee6.tar.zst
firejail-de123793c3d2ded6d19c1cebd7bc085e26857ee6.zip
compile fixes
-rw-r--r--src/firejail/cmdline.c2
-rw-r--r--src/firejail/fs_whitelist.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/firejail/cmdline.c b/src/firejail/cmdline.c
index dcb0a5424..a17758f8b 100644
--- a/src/firejail/cmdline.c
+++ b/src/firejail/cmdline.c
@@ -163,7 +163,7 @@ void build_appimage_cmdline(char **command_line, char **window_title, int argc,
163 // the program should exit with an error before entering this function 163 // the program should exit with an error before entering this function
164 assert(index != -1); 164 assert(index != -1);
165 165
166 unsigned argcount = argc - index; 166// unsigned argcount = argc - index;
167 167
168 int len1 = cmdline_length(argc, argv, index); // length of argv w/o changes 168 int len1 = cmdline_length(argc, argv, index); // length of argv w/o changes
169 int len2 = cmdline_length(1, &argv[index], 0); // apptest.AppImage 169 int len2 = cmdline_length(1, &argv[index], 0); // apptest.AppImage
diff --git a/src/firejail/fs_whitelist.c b/src/firejail/fs_whitelist.c
index b10858411..0970642db 100644
--- a/src/firejail/fs_whitelist.c
+++ b/src/firejail/fs_whitelist.c
@@ -95,9 +95,10 @@ static char *resolve_downloads(void) {
95 if (asprintf(&fname, "%s/%s", cfg.homedir, ptr1) == -1) 95 if (asprintf(&fname, "%s/%s", cfg.homedir, ptr1) == -1)
96 errExit("asprintf"); 96 errExit("asprintf");
97 97
98 if (stat(fname, &s) == -1) 98 if (stat(fname, &s) == -1) {
99 free(fname); 99 free(fname);
100 goto errout; 100 goto errout;
101 }
101 102
102 char *rv; 103 char *rv;
103 if (asprintf(&rv, "whitelist ~/%s", ptr + 24) == -1) 104 if (asprintf(&rv, "whitelist ~/%s", ptr + 24) == -1)