set window title

3 files changed, 24 insertions, 7 deletions

diff --git a/src/firejail/env.c b/src/firejail/env.c
index 213bd01d5..cccab966d 100644
--- a/src/firejail/env.c
+++ b/src/firejail/env.c
@@ -114,9 +114,13 @@ void env_defaults(void) {
         //export PS1='\[\e[1;32m\][\u@\h \W]\$\[\e[0m\] '
         if (setenv("PROMPT_COMMAND", "export PS1=\"\\[\\e[1;32m\\][\\u@\\h \\W]\\$\\[\\e[0m\\] \"", 1) < 0)
                 errExit("setenv");
-        
-        // if this is a terminal, set window title
-        printf("\033]0;Firejail\007\n");
+
+        // build the window title and set it
+        char *title;
+        if (asprintf(&title, "\033]0;firejail %s\007\n", cfg.window_title) == -1)
+                errExit("asprintf");
+        printf("%s", title);
+        free(title);
 }
 
 // parse and store the environment setting 
diff --git a/src/firejail/firejail.h b/src/firejail/firejail.h
index 39bc2beeb..90c3589d9 100644
--- a/src/firejail/firejail.h
+++ b/src/firejail/firejail.h
@@ -164,6 +164,7 @@ typedef struct config_t {
 
         // command line
         char *command_line;
+        char *window_title;
         char *command_name;
         char *shell;
         char **original_argv;
diff --git a/src/firejail/main.c b/src/firejail/main.c
index bcddaf7ab..5b88481d1 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -1315,18 +1315,22 @@ int main(int argc, char **argv) {
         // build the sandbox command
         if (prog_index == -1 && arg_zsh) {
                 cfg.command_line = "/usr/bin/zsh";
+                cfg.window_title = "/usr/bin/zsh";
                 cfg.command_name = "zsh";
         }
         else if (prog_index == -1 && arg_csh) {
                 cfg.command_line = "/bin/csh";
+                cfg.window_title = "/bin/csh";
                 cfg.command_name = "csh";
         }
         else if (prog_index == -1 && cfg.shell) {
                 cfg.command_line = cfg.shell;
+                cfg.window_title = cfg.shell;
                 cfg.command_name = cfg.shell;
         }
         else if (prog_index == -1) {
                 cfg.command_line = "/bin/bash";
+                cfg.window_title = "/bin/bash";
                 cfg.command_name = "bash";
         }
         else {
@@ -1341,16 +1345,24 @@ int main(int argc, char **argv) {
                 cfg.command_line = malloc(len + 1); // + '\0'
                 if (!cfg.command_line)
                         errExit("malloc");
-                char *ptr = cfg.command_line;
+                cfg.window_title = malloc(len + 1); // + '\0'
+                if (!cfg.window_title)
+                        errExit("malloc");
+
+                char *ptr1 = cfg.command_line;
+                char *ptr2 = cfg.window_title;
                 for (i = 0; i < argcnt; i++) {
                         // detect bash commands
                         if (strstr(argv[i + prog_index], "&&") || strstr(argv[i + prog_index], "||")) {
-                                sprintf(ptr, "%s ", argv[i + prog_index]);
+                                sprintf(ptr1, "%s ", argv[i + prog_index]);
                         }
                         else {
-                                sprintf(ptr, "\"%s\" ", argv[i + prog_index]);
+                                sprintf(ptr1, "\"%s\" ", argv[i + prog_index]);
                         }
-                        ptr += strlen(ptr);
+                        sprintf(ptr2, "%s ", argv[i + prog_index]);
+
+                        ptr1 += strlen(ptr1);
+                        ptr2 += strlen(ptr2);
                 }
         }