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

8
proc.c
View File

@ -18,6 +18,7 @@
#include <sys/types.h>
#include <sys/uio.h>
#include <sys/utsname.h>
#include <errno.h>
#include <event.h>
@ -168,6 +169,7 @@ proc_start(const char *name, struct event_base *base, int forkflag,
void (*signalcb)(int))
{
struct tmuxproc *tp;
struct utsname u;
if (forkflag) {
switch (fork()) {
@ -189,11 +191,17 @@ proc_start(const char *name, struct event_base *base, int forkflag,
logfile(name);
#ifdef HAVE_SETPROCTITLE
log_open(name);
setproctitle("%s (%s)", name, socket_path);
#endif
if (uname(&u) < 0)
memset(&u, 0, sizeof u);
log_debug("%s started (%ld): socket %s, protocol %d", name,
(long)getpid(), socket_path, PROTOCOL_VERSION);
log_debug("on %s %s %s; libevent %s (%s)", u.sysname, u.release,
u.version, event_get_version(), event_get_method());
tp = xcalloc(1, sizeof *tp);
tp->name = xstrdup(name);