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

Diff for /src/usr.bin/tmux/cmd.c between version 1.43 and 1.44

version 1.43, 2010/07/14 18:37:49 version 1.44, 2010/10/16 07:57:42
Line 340 
Line 340 
         }          }
   
         /* Use the session from the TMUX environment variable. */          /* Use the session from the TMUX environment variable. */
         if (data != NULL && data->pid != -1) {          if (data != NULL &&
                 if (data->pid != getpid())              data->pid == getpid() &&
                         return (NULL);              data->idx <= ARRAY_LENGTH(&sessions) &&
                 if (data->idx > ARRAY_LENGTH(&sessions))              (s = ARRAY_ITEM(&sessions, data->idx)) != NULL)
                         return (NULL);  
                 if ((s = ARRAY_ITEM(&sessions, data->idx)) == NULL)  
                         return (NULL);  
                 return (s);                  return (s);
         }  
   
         return (cmd_choose_session(&sessions));          return (cmd_choose_session(&sessions));
 }  }

Legend:
Removed from v.1.43  
changed lines
  Added in v.1.44