From 8d1c0e07fcf67271b01f9541ed2c3f894354e82e Mon Sep 17 00:00:00 2001
From: netblue30 <netblue30@yahoo.com>
Date: Thu, 3 Mar 2016 08:56:14 -0500
Subject: cleanup

---
 src/firejail/firejail.h |  4 ++--
 src/firejail/join.c     |  7 ++++---
 src/firejail/main.c     | 12 ++++++------
 3 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'src')

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);
 void usage(void);
 
 // join.c
-void join(pid_t pid, const char *homedir, int argc, char **argv, int index);
-void join_name(const char *name, const char *homedir, int argc, char **argv, int index);
+void join(pid_t pid, int argc, char **argv, int index);
+void join_name(const char *name, int argc, char **argv, int index);
 void shut(pid_t pid);
 void shut_name(const char *name);
 
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) {
 	free(uidmap);
 }
 
-void join_name(const char *name, const char *homedir, int argc, char **argv, int index) {
+void join_name(const char *name, int argc, char **argv, int index) {
 	EUID_ASSERT();
 	if (!name || strlen(name) == 0) {
 		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
 		fprintf(stderr, "Error: cannot find sandbox %s\n", name);
 		exit(1);
 	}
-	join(pid, homedir, argc, argv, index);
+	join(pid, argc, argv, index);
 }
 
-void join(pid_t pid, const char *homedir, int argc, char **argv, int index) {
+void join(pid_t pid, int argc, char **argv, int index) {
 	EUID_ASSERT();
+	char *homedir = cfg.homedir;
 	
 	extract_command(argc, argv, index);
 
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) {
 		// join sandbox by pid or by name
 		pid_t pid;
 		if (read_pid(argv[i] + 7, &pid) == 0)		
-			join(pid, cfg.homedir, argc, argv, i + 1);
+			join(pid, argc, argv, i + 1);
 		else
-			join_name(argv[i] + 7, cfg.homedir, argc, argv, i + 1);
+			join_name(argv[i] + 7, argc, argv, i + 1);
 		exit(0);
 	}
 #ifdef HAVE_NETWORK	
@@ -449,9 +449,9 @@ static void run_cmd_and_exit(int i, int argc, char **argv) {
 		// join sandbox by pid or by name
 		pid_t pid;
 		if (read_pid(argv[i] + 15, &pid) == 0)		
-			join(pid, cfg.homedir, argc, argv, i + 1);
+			join(pid, argc, argv, i + 1);
 		else
-			join_name(argv[i] + 15, cfg.homedir, argc, argv, i + 1);
+			join_name(argv[i] + 15, argc, argv, i + 1);
 		exit(0);
 	}
 #endif
@@ -466,9 +466,9 @@ static void run_cmd_and_exit(int i, int argc, char **argv) {
 		// join sandbox by pid or by name
 		pid_t pid;
 		if (read_pid(argv[i] + 18, &pid) == 0)		
-			join(pid, cfg.homedir, argc, argv, i + 1);
+			join(pid, argc, argv, i + 1);
 		else
-			join_name(argv[i] + 18, cfg.homedir, argc, argv, i + 1);
+			join_name(argv[i] + 18, argc, argv, i + 1);
 		exit(0);
 	}
 	else if (strncmp(argv[i], "--shutdown=", 11) == 0) {
-- 
cgit v1.2.3-70-g09d2