aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar startx2017 <vradu.startx@yandex.com>2018-04-16 12:29:39 -0400
committerLibravatar startx2017 <vradu.startx@yandex.com>2018-04-16 12:29:39 -0400
commit2bfe60a7a53914edc048c7e3cd6a577277985e70 (patch)
tree6291e6cd6e829cbdd80f6bcb595bb2674b70c845
parent.gitignore update (diff)
downloadfirejail-2bfe60a7a53914edc048c7e3cd6a577277985e70.tar.gz
firejail-2bfe60a7a53914edc048c7e3cd6a577277985e70.tar.zst
firejail-2bfe60a7a53914edc048c7e3cd6a577277985e70.zip
minor cleanup
-rw-r--r--src/firejail/firejail.h10
-rw-r--r--src/firejail/usage.c6
2 files changed, 6 insertions, 10 deletions
diff --git a/src/firejail/firejail.h b/src/firejail/firejail.h
index 4fd11ab4f..718c0b328 100644
--- a/src/firejail/firejail.h
+++ b/src/firejail/firejail.h
@@ -647,12 +647,6 @@ void env_ibus_load(void);
647// fs_whitelist.c 647// fs_whitelist.c
648void fs_whitelist(void); 648void fs_whitelist(void);
649 649
650// errno.c
651int errno_highest_nr(void);
652int errno_find_name(const char *name);
653char *errno_find_nr(int nr);
654void errno_print(void);
655
656// pulseaudio.c 650// pulseaudio.c
657void pulseaudio_init(void); 651void pulseaudio_init(void);
658void pulseaudio_disable(void); 652void pulseaudio_disable(void);
@@ -795,10 +789,6 @@ void build_appimage_cmdline(char **command_line, char **window_title, int argc,
795// run sbox 789// run sbox
796int sbox_run(unsigned filter, int num, ...); 790int sbox_run(unsigned filter, int num, ...);
797 791
798// git.c
799void git_install();
800void git_uninstall();
801
802// run_files.c 792// run_files.c
803void delete_run_files(pid_t pid); 793void delete_run_files(pid_t pid);
804void delete_bandwidth_run_file(pid_t pid); 794void delete_bandwidth_run_file(pid_t pid);
diff --git a/src/firejail/usage.c b/src/firejail/usage.c
index effbf3751..a9dcc78e5 100644
--- a/src/firejail/usage.c
+++ b/src/firejail/usage.c
@@ -77,7 +77,9 @@ static char *usage_str =
77 " --dns.print=name|pid - print DNS configuration.\n" 77 " --dns.print=name|pid - print DNS configuration.\n"
78 " --env=name=value - set environment variable.\n" 78 " --env=name=value - set environment variable.\n"
79 " --fs.print=name|pid - print the filesystem log.\n" 79 " --fs.print=name|pid - print the filesystem log.\n"
80#ifdef HAVE_FILE_TRANSFER
80 " --get=name|pid filename - get a file from sandbox container.\n" 81 " --get=name|pid filename - get a file from sandbox container.\n"
82#endif
81 " --help, -? - this help screen.\n" 83 " --help, -? - this help screen.\n"
82 " --hostname=name - set sandbox hostname.\n" 84 " --hostname=name - set sandbox hostname.\n"
83 " --hosts-file=file - use file as /etc/hosts.\n" 85 " --hosts-file=file - use file as /etc/hosts.\n"
@@ -97,7 +99,9 @@ static char *usage_str =
97#endif 99#endif
98 " --join-or-start=name|pid - join the sandbox or start a new one.\n" 100 " --join-or-start=name|pid - join the sandbox or start a new one.\n"
99 " --list - list all sandboxes.\n" 101 " --list - list all sandboxes.\n"
102#ifdef HAVE_FILE_TRANSFER
100 " --ls=name|pid dir_or_filename - list files in sandbox container.\n" 103 " --ls=name|pid dir_or_filename - list files in sandbox container.\n"
104#endif
101#ifdef HAVE_NETWORK 105#ifdef HAVE_NETWORK
102 " --mac=xx:xx:xx:xx:xx:xx - set interface MAC address.\n" 106 " --mac=xx:xx:xx:xx:xx:xx - set interface MAC address.\n"
103#endif 107#endif
@@ -164,8 +168,10 @@ static char *usage_str =
164 " --profile-path=directory - use this directory to look for profile files.\n" 168 " --profile-path=directory - use this directory to look for profile files.\n"
165 " --protocol=protocol,protocol,protocol - enable protocol filter.\n" 169 " --protocol=protocol,protocol,protocol - enable protocol filter.\n"
166 " --protocol.print=name|pid - print the protocol filter.\n" 170 " --protocol.print=name|pid - print the protocol filter.\n"
171#ifdef HAVE_FILE_TRANSFER
167 " --put=name|pid src-filename dest-filename - put a file in sandbox\n" 172 " --put=name|pid src-filename dest-filename - put a file in sandbox\n"
168 "\tcontainer.\n" 173 "\tcontainer.\n"
174#endif
169 " --quiet - turn off Firejail's output.\n" 175 " --quiet - turn off Firejail's output.\n"
170 " --read-only=filename - set directory or file read-only..\n" 176 " --read-only=filename - set directory or file read-only..\n"
171 " --read-write=filename - set directory or file read-write.\n" 177 " --read-write=filename - set directory or file read-write.\n"