[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.82 and 1.83

version 1.82, 2013/03/25 10:09:05 version 1.83, 2013/03/25 10:11:45
Line 123 
Line 123 
 struct client   *cmd_choose_client(struct clients *);  struct client   *cmd_choose_client(struct clients *);
 struct client   *cmd_lookup_client(const char *);  struct client   *cmd_lookup_client(const char *);
 struct session  *cmd_lookup_session(const char *, int *);  struct session  *cmd_lookup_session(const char *, int *);
   struct session  *cmd_lookup_session_id(const char *);
 struct winlink  *cmd_lookup_window(struct session *, const char *, int *);  struct winlink  *cmd_lookup_window(struct session *, const char *, int *);
 int              cmd_lookup_index(struct session *, const char *, int *);  int              cmd_lookup_index(struct session *, const char *, int *);
 struct window_pane *cmd_lookup_paneid(const char *);  struct window_pane *cmd_lookup_paneid(const char *);
Line 358 
Line 359 
         }          }
   
         /* Use the session from the TMUX environment variable. */          /* Use the session from the TMUX environment variable. */
         if (data != NULL && data->pid == getpid() && data->idx != -1) {          if (data != NULL && data->pid == getpid() && data->session_id != -1) {
                 s = session_find_by_index(data->idx);                  s = session_find_by_id(data->session_id);
                 if (s != NULL)                  if (s != NULL)
                         return (s);                          return (s);
         }          }
Line 551 
Line 552 
         return (NULL);          return (NULL);
 }  }
   
   /* Find the target session or report an error and return NULL. */
   struct session *
   cmd_lookup_session_id(const char *arg)
   {
           char    *endptr;
           long     id;
   
           if (arg[0] != '$')
                   return (NULL);
           id = strtol(arg + 1, &endptr, 10);
           if (arg[1] != '\0' && *endptr == '\0')
                   return (session_find_by_id(id));
           return (NULL);
   }
   
 /* Lookup a session by name. If no session is found, NULL is returned. */  /* Lookup a session by name. If no session is found, NULL is returned. */
 struct session *  struct session *
 cmd_lookup_session(const char *name, int *ambiguous)  cmd_lookup_session(const char *name, int *ambiguous)
Line 558 
Line 574 
         struct session  *s, *sfound;          struct session  *s, *sfound;
   
         *ambiguous = 0;          *ambiguous = 0;
   
           /* Look for $id first. */
           if ((s = cmd_lookup_session_id(name)) != NULL)
                   return (s);
   
         /*          /*
          * Look for matches. First look for exact matches - session names must           * Look for matches. First look for exact matches - session names must
Legend:
Removed from v.1.82  
changed lines
  Added in v.1.83