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

Diff for /src/usr.bin/tmux/client.c between version 1.88 and 1.89

version 1.88, 2015/04/24 20:58:44 version 1.89, 2015/06/04 23:27:51
Line 222 
Line 222 
                 cmdflags = CMD_STARTSERVER;                  cmdflags = CMD_STARTSERVER;
         } else if (argc == 0) {          } else if (argc == 0) {
                 msg = MSG_COMMAND;                  msg = MSG_COMMAND;
                 cmdflags = CMD_STARTSERVER|CMD_CANTNEST;                  cmdflags = CMD_STARTSERVER;
         } else {          } else {
                 msg = MSG_COMMAND;                  msg = MSG_COMMAND;
   
Line 240 
Line 240 
                 TAILQ_FOREACH(cmd, &cmdlist->list, qentry) {                  TAILQ_FOREACH(cmd, &cmdlist->list, qentry) {
                         if (cmd->entry->flags & CMD_STARTSERVER)                          if (cmd->entry->flags & CMD_STARTSERVER)
                                 cmdflags |= CMD_STARTSERVER;                                  cmdflags |= CMD_STARTSERVER;
                         if (cmd->entry->flags & CMD_CANTNEST)  
                                 cmdflags |= CMD_CANTNEST;  
                 }                  }
                 cmd_list_free(cmdlist);                  cmd_list_free(cmdlist);
         }  
   
         /*  
          * Check if this could be a nested session, if the command can't nest:  
          * if the socket path matches $TMUX, this is probably the same server.  
          */  
         if (shell_cmd == NULL && environ_path != NULL &&  
             (cmdflags & CMD_CANTNEST) &&  
             strcmp(socket_path, environ_path) == 0) {  
                 fprintf(stderr, "sessions should be nested with care, "  
                     "unset $TMUX to force\n");  
                 return (1);  
         }          }
   
         /* Set process title, log and signals now this is the client. */          /* Set process title, log and signals now this is the client. */

Legend:
Removed from v.1.88  
changed lines
  Added in v.1.89