Rename session idx to session id throughout and add $ prefix to targets to use

it, extended from a diff from George Nachman.
This commit is contained in:
Nicholas Marriott
2013-03-07 10:07:22 +00:00
parent bc3580fa06
commit f47a063841
11 changed files with 47 additions and 25 deletions

8
tmux.c
View File

@ -48,7 +48,7 @@ char socket_path[MAXPATHLEN];
int login_shell;
char *environ_path;
pid_t environ_pid = -1;
int environ_idx = -1;
int environ_session_id = -1;
__dead void usage(void);
void parseenvironment(void);
@ -147,16 +147,16 @@ parseenvironment(void)
{
char *env, path[256];
long pid;
int idx;
int id;
if ((env = getenv("TMUX")) == NULL)
return;
if (sscanf(env, "%255[^,],%ld,%d", path, &pid, &idx) != 3)
if (sscanf(env, "%255[^,],%ld,%d", path, &pid, &id) != 3)
return;
environ_path = xstrdup(path);
environ_pid = pid;
environ_idx = idx;
environ_session_id = id;
}
char *