From 77783f1ec2cd91891161616c9cd0abaf60897cc0 Mon Sep 17 00:00:00 2001
From: thewisenerd <thewisenerd@protonmail.com>
Date: Mon, 19 Dec 2016 01:27:35 +0530
Subject: appimage: pass commandline arguments

commandline arguments are not being passed to appimage,
which hinders some functionality. This adds the function
build_appimage_cmdline based on build_cmdline which
works by calling quote_cmdline with passed argv, and
then replaces initial argument with AppRun path generated
in appimage_set.

TODO: deal with extra memory allocation. The 'quoted'
length of the first '*.AppImage' argument may or may not
be greater than the 'quoted' AppRun path.
---
 src/firejail/cmdline.c  | 44 ++++++++++++++++++++++++++++++++++++++++++++
 src/firejail/firejail.h |  1 +
 src/firejail/main.c     |  2 +-
 3 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/src/firejail/cmdline.c b/src/firejail/cmdline.c
index cadf4795d..dcb0a5424 100644
--- a/src/firejail/cmdline.c
+++ b/src/firejail/cmdline.c
@@ -157,3 +157,47 @@ void build_cmdline(char **command_line, char **window_title, int argc, char **ar
 	assert(*command_line);
 	assert(*window_title);
 }
+
+void build_appimage_cmdline(char **command_line, char **window_title, int argc, char **argv, int index, char *apprun_path) {
+	// index == -1 could happen if we have --shell=none and no program was specified
+	// the program should exit with an error before entering this function
+	assert(index != -1);
+
+	unsigned argcount = argc - index;
+
+	int len1 = cmdline_length(argc, argv, index);  // length of argv w/o changes
+	int len2 = cmdline_length(1, &argv[index], 0); // apptest.AppImage
+	int len3 = cmdline_length(1, &apprun_path, 0); // /run/firejail/appimage/.appimage-23304/AppRun
+	int len4 = (len1 - len2 + len3) + 1;           // apptest.AppImage is replaced by /path/to/AppRun
+
+	if (len4 > ARG_MAX) {
+		errno = E2BIG;
+		errExit("cmdline_length");
+	}
+
+	// save created apprun in cfg.command_line
+	char *tmp1 = strdup(*command_line);
+	if (!tmp1)
+		errExit("strdup");
+
+	// TODO: deal with extra allocated memory.
+	char *command_line_tmp = malloc(len1 + len3 + 1);
+	if (!command_line_tmp)
+			errExit("malloc");
+	*window_title = malloc(len1 + len3 + 1);
+	if (!*window_title)
+			errExit("malloc");
+
+	// run default quote_cmdline
+	quote_cmdline(command_line_tmp, *window_title, len1, argc, argv, index);
+
+	assert(command_line_tmp);
+	assert(*window_title);
+
+	// 'fix' command_line now
+	if (asprintf(command_line, "'%s' %s", tmp1, command_line_tmp + len2) == -1)
+		errExit("asprintf");
+
+	// free strdup
+	free(tmp1);
+}
diff --git a/src/firejail/firejail.h b/src/firejail/firejail.h
index 8fede5a69..de320ee2c 100644
--- a/src/firejail/firejail.h
+++ b/src/firejail/firejail.h
@@ -681,6 +681,7 @@ long unsigned int appimage2_size(const char *fname);
 
 // cmdline.c
 void build_cmdline(char **command_line, char **window_title, int argc, char **argv, int index);
+void build_appimage_cmdline(char **command_line, char **window_title, int argc, char **argv, int index, char *apprun_path);
 
 // sbox.c
 // programs
diff --git a/src/firejail/main.c b/src/firejail/main.c
index b25bad9f2..e087edb01 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -2156,7 +2156,7 @@ int main(int argc, char **argv) {
 		if (arg_debug)
 			printf("Configuring appimage environment\n");
 		appimage_set(cfg.command_name);
-		cfg.window_title = "appimage";
+		build_appimage_cmdline(&cfg.command_line, &cfg.window_title, argc, argv, prog_index, cfg.command_line);
 	}
 	else {
 		build_cmdline(&cfg.command_line, &cfg.window_title, argc, argv, prog_index);
-- 
cgit v1.2.3-54-g00ecf