1 files changed, 55 insertions, 28 deletions

diff --git a/src/firejail/env.c b/src/firejail/env.c
index 54a6b0036..a02c67ae1 100644
--- a/src/firejail/env.c
+++ b/src/firejail/env.c
@@ -27,12 +27,27 @@ typedef struct env_t {
         struct env_t *next;
         char *name;
         char *value;
+        ENV_OP op;
 } Env;
 static Env *envlist = NULL;
 
 static void env_add(Env *env) {
-        env->next = envlist;
-        envlist = env;
+        env->next = NULL;
+        
+        // add the new entry at the end of the list
+        if (envlist == NULL) {
+                envlist = env;
+                return;
+        }
+        
+        Env *ptr = envlist;
+        while (1) {
+                if (ptr->next == NULL) {
+                        ptr->next = env;
+                        break;
+                }
+                ptr = ptr->next;
+        }
 }
 
 // load IBUS env variables
@@ -87,7 +102,7 @@ void env_ibus_load(void) {
                         if (arg_debug)
                                 printf("%s\n", buf);
                         EUID_USER();
-                        env_store(buf);
+                        env_store(buf, SETENV);
                         EUID_ROOT();
                 }
 
@@ -104,29 +119,31 @@ void env_defaults(void) {
         // fix qt 4.8
         if (setenv("QT_X11_NO_MITSHM", "1", 1) < 0)
                 errExit("setenv");
+//      if (setenv("MOZ_NO_REMOTE, "1", 1) < 0)
+//              errExit("setenv");
         if (setenv("container", "firejail", 1) < 0) // LXC sets container=lxc,
                 errExit("setenv");
-        if (arg_zsh && setenv("SHELL", "/usr/bin/zsh", 1) < 0)
-                errExit("setenv");
-        if (arg_csh && setenv("SHELL", "/bin/csh", 1) < 0)
-                errExit("setenv");
+        if (!cfg.shell)
+                cfg.shell = guess_shell();
         if (cfg.shell && setenv("SHELL", cfg.shell, 1) < 0)
                 errExit("setenv");
+
         // set prompt color to green
-        //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");
+        char *prompt = getenv("FIREJAIL_PROMPT");
+        if (prompt && strcmp(prompt, "yes") == 0) {
+                //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");
+        }
 
-        // 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);
+        // set the window title
+        if (!arg_quiet)
+                printf("\033]0;firejail %s\007", cfg.window_title);
+        fflush(0);
 }
 
 // parse and store the environment setting 
-void env_store(const char *str) {
+void env_store(const char *str, ENV_OP op) {
         EUID_ASSERT();
         assert(str);
         
@@ -134,11 +151,13 @@ void env_store(const char *str) {
         if (*str == '\0')
                 goto errexit;
         char *ptr = strchr(str, '=');
-        if (!ptr)
-                goto errexit;
-        ptr++;
-        if (*ptr == '\0')
-                goto errexit;
+        if (op == SETENV) {
+                if (!ptr)
+                        goto errexit;
+                ptr++;
+                if (*ptr == '\0')
+                        goto errexit;
+        }
 
         // build list entry
         Env *env = malloc(sizeof(Env));
@@ -148,10 +167,13 @@ void env_store(const char *str) {
         env->name = strdup(str);
         if (env->name == NULL)
                 errExit("strdup");
-        char *ptr2 = strchr(env->name, '=');
-        assert(ptr2);
-        *ptr2 = '\0';
-        env->value = ptr2 + 1;
+        if (op == SETENV) {
+                char *ptr2 = strchr(env->name, '=');
+                assert(ptr2);
+                *ptr2 = '\0';
+                env->value = ptr2 + 1;
+        }
+        env->op = op;
         
         // add entry to the list
         env_add(env);
@@ -167,8 +189,13 @@ void env_apply(void) {
         Env *env = envlist;
         
         while (env) {
-                if (setenv(env->name, env->value, 1) < 0)
-                        errExit("setenv");
+                if (env->op == SETENV) {
+                        if (setenv(env->name, env->value, 1) < 0)
+                                errExit("setenv");
+                }
+                else if (env->op == RMENV) {
+                        unsetenv(env->name);
+                }
                 env = env->next;
         }
 }