[BACK]Return to spawn.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / tmux

Diff for /src/usr.bin/tmux/spawn.c between version 1.18 and 1.19

version 1.18, 2020/03/31 06:35:38 version 1.19, 2020/03/31 17:14:40
Line 303 
Line 303 
         child = environ_for_session(s, 0);          child = environ_for_session(s, 0);
         if (sc->environ != NULL)          if (sc->environ != NULL)
                 environ_copy(sc->environ, child);                  environ_copy(sc->environ, child);
         environ_set(child, "TMUX_PANE", "%%%u", new_wp->id);          environ_set(child, "TMUX_PANE", 0, "%%%u", new_wp->id);
   
         /*          /*
          * Then the PATH environment variable. The session one is replaced from           * Then the PATH environment variable. The session one is replaced from
Line 313 
Line 313 
         if (c != NULL && c->session == NULL) { /* only unattached clients */          if (c != NULL && c->session == NULL) { /* only unattached clients */
                 ee = environ_find(c->environ, "PATH");                  ee = environ_find(c->environ, "PATH");
                 if (ee != NULL)                  if (ee != NULL)
                         environ_set(child, "PATH", "%s", ee->value);                          environ_set(child, "PATH", 0, "%s", ee->value);
         }          }
         if (environ_find(child, "PATH") == NULL)          if (environ_find(child, "PATH") == NULL)
                 environ_set(child, "%s", _PATH_DEFPATH);                  environ_set(child, "PATH", 0, "%s", _PATH_DEFPATH);
   
         /* Then the shell. If respawning, use the old one. */          /* Then the shell. If respawning, use the old one. */
         if (~sc->flags & SPAWN_RESPAWN) {          if (~sc->flags & SPAWN_RESPAWN) {
Line 326 
Line 326 
                 free(new_wp->shell);                  free(new_wp->shell);
                 new_wp->shell = xstrdup(tmp);                  new_wp->shell = xstrdup(tmp);
         }          }
         environ_set(child, "SHELL", "%s", new_wp->shell);          environ_set(child, "SHELL", 0, "%s", new_wp->shell);
   
         /* Log the arguments we are going to use. */          /* Log the arguments we are going to use. */
         log_debug("%s: shell=%s", __func__, new_wp->shell);          log_debug("%s: shell=%s", __func__, new_wp->shell);

Legend:
Removed from v.1.18  
changed lines
  Added in v.1.19