diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-03-09 21:33:28 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-03-09 21:33:28 +0000 |
| commit | 2ac6501698d5499967b33013d9f3fc8091fddc41 (patch) | |
| tree | e699425a8ea2296d96aa0cd953646188a81df955 /tmux.c | |
| parent | 06ac399ce6dc25201cfd1670b08ed8758034e2dc (diff) | |
| parent | dde5d49a5ed305cfa32f18c08d6f1b769d8ccef7 (diff) | |
| download | rtmux-2ac6501698d5499967b33013d9f3fc8091fddc41.tar.gz rtmux-2ac6501698d5499967b33013d9f3fc8091fddc41.tar.bz2 rtmux-2ac6501698d5499967b33013d9f3fc8091fddc41.zip | |
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Diffstat (limited to 'tmux.c')
| -rw-r--r-- | tmux.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -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 * |