diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/firejail/fs.c | 1 | ||||
-rw-r--r-- | src/firejail/main.c | 1 | ||||
-rw-r--r-- | src/firemon/netstats.c | 2 | ||||
-rw-r--r-- | src/libtrace/libtrace.c | 2 |
4 files changed, 2 insertions, 4 deletions
diff --git a/src/firejail/fs.c b/src/firejail/fs.c index 6572f657b..e93db9cff 100644 --- a/src/firejail/fs.c +++ b/src/firejail/fs.c | |||
@@ -385,7 +385,6 @@ void fs_blacklist(void) { | |||
385 | ptr = new_name; | 385 | ptr = new_name; |
386 | 386 | ||
387 | // expand path macro - look for the file in /bin, /usr/bin, /sbin and /usr/sbin directories | 387 | // expand path macro - look for the file in /bin, /usr/bin, /sbin and /usr/sbin directories |
388 | // TODO: should we look for more bin paths? | ||
389 | if (ptr) { | 388 | if (ptr) { |
390 | if (strncmp(ptr, "${PATH}", 7) == 0) { | 389 | if (strncmp(ptr, "${PATH}", 7) == 0) { |
391 | char *fname = ptr + 7; | 390 | char *fname = ptr + 7; |
diff --git a/src/firejail/main.c b/src/firejail/main.c index 0e0d685c4..41517877b 100644 --- a/src/firejail/main.c +++ b/src/firejail/main.c | |||
@@ -1201,7 +1201,6 @@ int main(int argc, char **argv) { | |||
1201 | } | 1201 | } |
1202 | else { | 1202 | else { |
1203 | // calculate the length of the command | 1203 | // calculate the length of the command |
1204 | // TODO: escape the '"' characters, and possibly others like '\' and '!' if they can cause problems | ||
1205 | int i; | 1204 | int i; |
1206 | int len = 0; | 1205 | int len = 0; |
1207 | int argcnt = argc - prog_index; | 1206 | int argcnt = argc - prog_index; |
diff --git a/src/firemon/netstats.c b/src/firemon/netstats.c index 3f1e00ee9..9a1487c62 100644 --- a/src/firemon/netstats.c +++ b/src/firemon/netstats.c | |||
@@ -172,7 +172,7 @@ void netstats(void) { | |||
172 | // set pid table | 172 | // set pid table |
173 | int i; | 173 | int i; |
174 | int itv = 5; // 5 second interval | 174 | int itv = 5; // 5 second interval |
175 | pid_read(0); // todo: preserve the last calculation if any, so we don't have to do get_stats() | 175 | pid_read(0); |
176 | 176 | ||
177 | // start rx/tx measurements | 177 | // start rx/tx measurements |
178 | for (i = 0; i < max_pids; i++) { | 178 | for (i = 0; i < max_pids; i++) { |
diff --git a/src/libtrace/libtrace.c b/src/libtrace/libtrace.c index 12a8c7f4a..b763213f6 100644 --- a/src/libtrace/libtrace.c +++ b/src/libtrace/libtrace.c | |||
@@ -511,7 +511,7 @@ int bind(int sockfd, const struct sockaddr *addr, socklen_t addrlen) { | |||
511 | return rv; | 511 | return rv; |
512 | } | 512 | } |
513 | 513 | ||
514 | #if 0 //todo: fix compilation problems | 514 | #if 0 |
515 | typedef int (*orig_accept_t)(int sockfd, const struct sockaddr *addr, socklen_t addrlen); | 515 | typedef int (*orig_accept_t)(int sockfd, const struct sockaddr *addr, socklen_t addrlen); |
516 | static orig_accept_t orig_accept = NULL; | 516 | static orig_accept_t orig_accept = NULL; |
517 | int accept(int sockfd, struct sockaddr *addr, socklen_t addrlen) { | 517 | int accept(int sockfd, struct sockaddr *addr, socklen_t addrlen) { |