diff options
Diffstat (limited to 'src/firecfg')
-rw-r--r-- | src/firecfg/desktop_files.c | 10 | ||||
-rw-r--r-- | src/firecfg/main.c | 63 |
2 files changed, 35 insertions, 38 deletions
diff --git a/src/firecfg/desktop_files.c b/src/firecfg/desktop_files.c index 0a6a0bbf0..49e58528c 100644 --- a/src/firecfg/desktop_files.c +++ b/src/firecfg/desktop_files.c | |||
@@ -136,15 +136,9 @@ void fix_desktop_files(char *homedir) { | |||
136 | 136 | ||
137 | // source | 137 | // source |
138 | DIR *dir = opendir("/usr/share/applications"); | 138 | DIR *dir = opendir("/usr/share/applications"); |
139 | if (!dir) { | 139 | if (!dir || chdir("/usr/share/applications")) { |
140 | perror("opendir"); | 140 | perror("opendir"); |
141 | fprintf(stderr, "Warning: cannot open /usr/share/applications directory, desktop files fixing skipped...\n"); | 141 | fprintf(stderr, "Warning: cannot access /usr/share/applications directory, desktop files fixing skipped...\n"); |
142 | free(user_apps_dir); | ||
143 | return; | ||
144 | } | ||
145 | if (chdir("/usr/share/applications")) { | ||
146 | perror("chdir"); | ||
147 | fprintf(stderr, "Warning: cannot chdir to /usr/share/applications, desktop files fixing skipped...\n"); | ||
148 | free(user_apps_dir); | 142 | free(user_apps_dir); |
149 | return; | 143 | return; |
150 | } | 144 | } |
diff --git a/src/firecfg/main.c b/src/firecfg/main.c index ab0fd53e3..e636dc385 100644 --- a/src/firecfg/main.c +++ b/src/firecfg/main.c | |||
@@ -21,38 +21,41 @@ | |||
21 | #include "firecfg.h" | 21 | #include "firecfg.h" |
22 | int arg_debug = 0; | 22 | int arg_debug = 0; |
23 | 23 | ||
24 | static char *usage_str = | ||
25 | "Firecfg is the desktop configuration utility for Firejail software. The utility\n" | ||
26 | "creates several symbolic links to firejail executable. This allows the user to\n" | ||
27 | "sandbox applications automatically, just by clicking on a regular desktop\n" | ||
28 | "menus and icons.\n\n" | ||
29 | "The symbolic links are placed in /usr/local/bin. For more information, see\n" | ||
30 | "DESKTOP INTEGRATION section in man 1 firejail.\n\n" | ||
31 | "Usage: firecfg [OPTIONS]\n\n" | ||
32 | " --clean - remove all firejail symbolic links.\n\n" | ||
33 | " --debug - print debug messages.\n\n" | ||
34 | " --fix - fix .desktop files.\n\n" | ||
35 | " --fix-sound - create ~/.config/pulse/client.conf file.\n\n" | ||
36 | " --help, -? - this help screen.\n\n" | ||
37 | " --list - list all firejail symbolic links.\n\n" | ||
38 | " --version - print program version and exit.\n\n" | ||
39 | "Example:\n\n" | ||
40 | " $ sudo firecfg\n" | ||
41 | " /usr/local/bin/firefox created\n" | ||
42 | " /usr/local/bin/vlc created\n" | ||
43 | " [...]\n" | ||
44 | " $ firecfg --list\n" | ||
45 | " /usr/local/bin/firefox\n" | ||
46 | " /usr/local/bin/vlc\n" | ||
47 | " [...]\n" | ||
48 | " $ sudo firecfg --clean\n" | ||
49 | " /usr/local/bin/firefox removed\n" | ||
50 | " /usr/local/bin/vlc removed\n" | ||
51 | " [...]\n" | ||
52 | "\n" | ||
53 | "License GPL version 2 or later\n" | ||
54 | "Homepage: http://firejail.wordpress.com\n\n"; | ||
55 | |||
24 | static void usage(void) { | 56 | static void usage(void) { |
25 | printf("firecfg - version %s\n\n", VERSION); | 57 | printf("firecfg - version %s\n\n", VERSION); |
26 | printf("Firecfg is the desktop configuration utility for Firejail software. The utility\n"); | 58 | puts(usage_str); |
27 | printf("creates several symbolic links to firejail executable. This allows the user to\n"); | ||
28 | printf("sandbox applications automatically, just by clicking on a regular desktop\n"); | ||
29 | printf("menus and icons.\n\n"); | ||
30 | printf("The symbolic links are placed in /usr/local/bin. For more information, see\n"); | ||
31 | printf("DESKTOP INTEGRATION section in man 1 firejail.\n\n"); | ||
32 | printf("Usage: firecfg [OPTIONS]\n\n"); | ||
33 | printf(" --clean - remove all firejail symbolic links.\n\n"); | ||
34 | printf(" --debug - print debug messages.\n\n"); | ||
35 | printf(" --fix - fix .desktop files.\n\n"); | ||
36 | printf(" --fix-sound - create ~/.config/pulse/client.conf file.\n\n"); | ||
37 | printf(" --help, -? - this help screen.\n\n"); | ||
38 | printf(" --list - list all firejail symbolic links.\n\n"); | ||
39 | printf(" --version - print program version and exit.\n\n"); | ||
40 | printf("Example:\n\n"); | ||
41 | printf(" $ sudo firecfg\n"); | ||
42 | printf(" /usr/local/bin/firefox created\n"); | ||
43 | printf(" /usr/local/bin/vlc created\n"); | ||
44 | printf(" [...]\n"); | ||
45 | printf(" $ firecfg --list\n"); | ||
46 | printf(" /usr/local/bin/firefox\n"); | ||
47 | printf(" /usr/local/bin/vlc\n"); | ||
48 | printf(" [...]\n"); | ||
49 | printf(" $ sudo firecfg --clean\n"); | ||
50 | printf(" /usr/local/bin/firefox removed\n"); | ||
51 | printf(" /usr/local/bin/vlc removed\n"); | ||
52 | printf(" [...]\n"); | ||
53 | printf("\n"); | ||
54 | printf("License GPL version 2 or later\n"); | ||
55 | printf("Homepage: http://firejail.wordpress.com\n\n"); | ||
56 | } | 59 | } |
57 | 60 | ||
58 | 61 | ||