circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-02 13:37:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source 
Conflicts:
	log.c
	proc.c
	tmux.c
This commit is contained in:
Thomas Adam
2015-11-25 16:37:30 +00:00
parent 0a2ef2b932 ac8678aefe
commit 890d8da2e3
15 changed files with 222 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server-fn.c
View File

@ -32,20 +32,19 @@ void server_callback_identify(int, short, void *);
void
server_fill_environ(struct session *s, struct environ *env)
{
char var[PATH_MAX], *term;
u_int idx;
long pid;
char *term;
u_int idx;
long pid;
if (s != NULL) {
term = options_get_string(global_options, "default-terminal");
environ_set(env, "TERM", term);
environ_set(env, "TERM", "%s", term);
idx = s->id;
} else
idx = (u_int)-1;
pid = getpid();
xsnprintf(var, sizeof var, "%s,%ld,%u", socket_path, pid, idx);
environ_set(env, "TMUX", var);
environ_set(env, "TMUX", "%s,%ld,%u", socket_path, pid, idx);
}
void