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

Diff for /src/usr.bin/tmux/server-client.c between version 1.307 and 1.308

version 1.307, 2020/03/16 06:12:42 version 1.308, 2020/03/17 11:10:12
Line 400 
Line 400 
                 shell = options_get_string(s->options, "default-shell");                  shell = options_get_string(s->options, "default-shell");
         else          else
                 shell = options_get_string(global_s_options, "default-shell");                  shell = options_get_string(global_s_options, "default-shell");
           if (!checkshell(shell))
                   shell = _PATH_BSHELL;
         shellsize = strlen(shell) + 1;          shellsize = strlen(shell) + 1;
   
         msg = xmalloc(cmdsize + shellsize);          msg = xmalloc(cmdsize + shellsize);
Line 2009 
Line 2011 
         const char      *shell;          const char      *shell;
   
         shell = options_get_string(global_s_options, "default-shell");          shell = options_get_string(global_s_options, "default-shell");
         if (*shell == '\0' || areshell(shell))          if (!checkshell(shell))
                 shell = _PATH_BSHELL;                  shell = _PATH_BSHELL;
         proc_send(c->peer, MSG_SHELL, -1, shell, strlen(shell) + 1);          proc_send(c->peer, MSG_SHELL, -1, shell, strlen(shell) + 1);
   
Legend:
Removed from v.1.307  
changed lines
  Added in v.1.308