diff options
author | 2019-02-06 16:13:28 +0100 | |
---|---|---|
committer | 2019-02-06 16:13:28 +0100 | |
commit | f77127f5b10f3b19c4c152b49018b24ff4d3590a (patch) | |
tree | e43681df9f06fdaac233265034cd30a70a375f40 /src/fldd/main.c | |
parent | strncmp byte count fixes (diff) | |
parent | fix small memleak (diff) | |
download | firejail-f77127f5b10f3b19c4c152b49018b24ff4d3590a.tar.gz firejail-f77127f5b10f3b19c4c152b49018b24ff4d3590a.tar.zst firejail-f77127f5b10f3b19c4c152b49018b24ff4d3590a.zip |
Merge branch 'master' of https://github.com/netblue30/firejail
Diffstat (limited to 'src/fldd/main.c')
-rw-r--r-- | src/fldd/main.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/fldd/main.c b/src/fldd/main.c index d9adcdcf6..566763ff4 100644 --- a/src/fldd/main.c +++ b/src/fldd/main.c | |||
@@ -297,7 +297,7 @@ printf("\n"); | |||
297 | } | 297 | } |
298 | 298 | ||
299 | 299 | ||
300 | if (strcmp(argv[1], "--help") == 0) { | 300 | if (strcmp(argv[1], "-h") == 0 || strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-?") == 0) { |
301 | usage(); | 301 | usage(); |
302 | return 0; | 302 | return 0; |
303 | } | 303 | } |
@@ -312,11 +312,6 @@ printf("\n"); | |||
312 | if (quiet && strcmp(quiet, "yes") == 0) | 312 | if (quiet && strcmp(quiet, "yes") == 0) |
313 | arg_quiet = 1; | 313 | arg_quiet = 1; |
314 | 314 | ||
315 | if (strcmp(argv[1], "-h") == 0 || strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-?") ==0) { | ||
316 | usage(); | ||
317 | return 0; | ||
318 | } | ||
319 | |||
320 | int fd = STDOUT_FILENO; | 315 | int fd = STDOUT_FILENO; |
321 | // attempt to open the file | 316 | // attempt to open the file |
322 | if (argc == 3) { | 317 | if (argc == 3) { |