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.

1 files changed, 44 insertions, 0 deletions

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);
+}