diff options
author | netblue30 <netblue30@yahoo.com> | 2016-03-03 08:56:14 -0500 |
---|---|---|
committer | netblue30 <netblue30@yahoo.com> | 2016-03-03 08:56:14 -0500 |
commit | 8d1c0e07fcf67271b01f9541ed2c3f894354e82e (patch) | |
tree | 846b77c72781408cecd45116c7dcd2010396aa92 /src | |
parent | Merge pull request #346 from vn971/master (diff) | |
download | firejail-8d1c0e07fcf67271b01f9541ed2c3f894354e82e.tar.gz firejail-8d1c0e07fcf67271b01f9541ed2c3f894354e82e.tar.zst firejail-8d1c0e07fcf67271b01f9541ed2c3f894354e82e.zip |
cleanup
Diffstat (limited to 'src')
-rw-r--r-- | src/firejail/firejail.h | 4 | ||||
-rw-r--r-- | src/firejail/join.c | 7 | ||||
-rw-r--r-- | src/firejail/main.c | 12 |
3 files changed, 12 insertions, 11 deletions
diff --git a/src/firejail/firejail.h b/src/firejail/firejail.h index 3097a7a0e..87db4d08e 100644 --- a/src/firejail/firejail.h +++ b/src/firejail/firejail.h | |||
@@ -324,8 +324,8 @@ void netstats(void); | |||
324 | void usage(void); | 324 | void usage(void); |
325 | 325 | ||
326 | // join.c | 326 | // join.c |
327 | void join(pid_t pid, const char *homedir, int argc, char **argv, int index); | 327 | void join(pid_t pid, int argc, char **argv, int index); |
328 | void join_name(const char *name, const char *homedir, int argc, char **argv, int index); | 328 | void join_name(const char *name, int argc, char **argv, int index); |
329 | void shut(pid_t pid); | 329 | void shut(pid_t pid); |
330 | void shut_name(const char *name); | 330 | void shut_name(const char *name); |
331 | 331 | ||
diff --git a/src/firejail/join.c b/src/firejail/join.c index 21bb56e9d..251260091 100644 --- a/src/firejail/join.c +++ b/src/firejail/join.c | |||
@@ -179,7 +179,7 @@ static void extract_user_namespace(pid_t pid) { | |||
179 | free(uidmap); | 179 | free(uidmap); |
180 | } | 180 | } |
181 | 181 | ||
182 | void join_name(const char *name, const char *homedir, int argc, char **argv, int index) { | 182 | void join_name(const char *name, int argc, char **argv, int index) { |
183 | EUID_ASSERT(); | 183 | EUID_ASSERT(); |
184 | if (!name || strlen(name) == 0) { | 184 | if (!name || strlen(name) == 0) { |
185 | fprintf(stderr, "Error: invalid sandbox name\n"); | 185 | fprintf(stderr, "Error: invalid sandbox name\n"); |
@@ -191,11 +191,12 @@ void join_name(const char *name, const char *homedir, int argc, char **argv, int | |||
191 | fprintf(stderr, "Error: cannot find sandbox %s\n", name); | 191 | fprintf(stderr, "Error: cannot find sandbox %s\n", name); |
192 | exit(1); | 192 | exit(1); |
193 | } | 193 | } |
194 | join(pid, homedir, argc, argv, index); | 194 | join(pid, argc, argv, index); |
195 | } | 195 | } |
196 | 196 | ||
197 | void join(pid_t pid, const char *homedir, int argc, char **argv, int index) { | 197 | void join(pid_t pid, int argc, char **argv, int index) { |
198 | EUID_ASSERT(); | 198 | EUID_ASSERT(); |
199 | char *homedir = cfg.homedir; | ||
199 | 200 | ||
200 | extract_command(argc, argv, index); | 201 | extract_command(argc, argv, index); |
201 | 202 | ||
diff --git a/src/firejail/main.c b/src/firejail/main.c index a9fe13c78..925cd3022 100644 --- a/src/firejail/main.c +++ b/src/firejail/main.c | |||
@@ -432,9 +432,9 @@ static void run_cmd_and_exit(int i, int argc, char **argv) { | |||
432 | // join sandbox by pid or by name | 432 | // join sandbox by pid or by name |
433 | pid_t pid; | 433 | pid_t pid; |
434 | if (read_pid(argv[i] + 7, &pid) == 0) | 434 | if (read_pid(argv[i] + 7, &pid) == 0) |
435 | join(pid, cfg.homedir, argc, argv, i + 1); | 435 | join(pid, argc, argv, i + 1); |
436 | else | 436 | else |
437 | join_name(argv[i] + 7, cfg.homedir, argc, argv, i + 1); | 437 | join_name(argv[i] + 7, argc, argv, i + 1); |
438 | exit(0); | 438 | exit(0); |
439 | } | 439 | } |
440 | #ifdef HAVE_NETWORK | 440 | #ifdef HAVE_NETWORK |
@@ -449,9 +449,9 @@ static void run_cmd_and_exit(int i, int argc, char **argv) { | |||
449 | // join sandbox by pid or by name | 449 | // join sandbox by pid or by name |
450 | pid_t pid; | 450 | pid_t pid; |
451 | if (read_pid(argv[i] + 15, &pid) == 0) | 451 | if (read_pid(argv[i] + 15, &pid) == 0) |
452 | join(pid, cfg.homedir, argc, argv, i + 1); | 452 | join(pid, argc, argv, i + 1); |
453 | else | 453 | else |
454 | join_name(argv[i] + 15, cfg.homedir, argc, argv, i + 1); | 454 | join_name(argv[i] + 15, argc, argv, i + 1); |
455 | exit(0); | 455 | exit(0); |
456 | } | 456 | } |
457 | #endif | 457 | #endif |
@@ -466,9 +466,9 @@ static void run_cmd_and_exit(int i, int argc, char **argv) { | |||
466 | // join sandbox by pid or by name | 466 | // join sandbox by pid or by name |
467 | pid_t pid; | 467 | pid_t pid; |
468 | if (read_pid(argv[i] + 18, &pid) == 0) | 468 | if (read_pid(argv[i] + 18, &pid) == 0) |
469 | join(pid, cfg.homedir, argc, argv, i + 1); | 469 | join(pid, argc, argv, i + 1); |
470 | else | 470 | else |
471 | join_name(argv[i] + 18, cfg.homedir, argc, argv, i + 1); | 471 | join_name(argv[i] + 18, argc, argv, i + 1); |
472 | exit(0); | 472 | exit(0); |
473 | } | 473 | } |
474 | else if (strncmp(argv[i], "--shutdown=", 11) == 0) { | 474 | else if (strncmp(argv[i], "--shutdown=", 11) == 0) { |