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

Diff for /src/usr.bin/tmux/server-fn.c between version 1.71 and 1.72

version 1.71, 2013/10/10 11:46:28 version 1.72, 2013/10/10 12:13:29
Line 235 
Line 235 
 void  void
 server_lock_client(struct client *c)  server_lock_client(struct client *c)
 {  {
         const char              *cmd;          const char      *cmd;
         size_t                   cmdlen;          size_t           cmdlen;
         struct msg_lock_data     lockdata;  
   
         if (c->flags & CLIENT_CONTROL)          if (c->flags & CLIENT_CONTROL)
                 return;                  return;
Line 246 
Line 245 
                 return;                  return;
   
         cmd = options_get_string(&c->session->options, "lock-command");          cmd = options_get_string(&c->session->options, "lock-command");
         cmdlen = strlcpy(lockdata.cmd, cmd, sizeof lockdata.cmd);          if (strlen(cmd) + 1 > MAX_IMSGSIZE - IMSG_HEADER_SIZE)
         if (cmdlen >= sizeof lockdata.cmd)  
                 return;                  return;
   
         tty_stop_tty(&c->tty);          tty_stop_tty(&c->tty);
Line 256 
Line 254 
         tty_raw(&c->tty, tty_term_string(c->tty.term, TTYC_E3));          tty_raw(&c->tty, tty_term_string(c->tty.term, TTYC_E3));
   
         c->flags |= CLIENT_SUSPENDED;          c->flags |= CLIENT_SUSPENDED;
         server_write_client(c, MSG_LOCK, &lockdata, sizeof lockdata);          server_write_client(c, MSG_LOCK, cmd, strlen(cmd) + 1);
 }  }
   
 void  void
Legend:
Removed from v.1.71  
changed lines
  Added in v.1.72