circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master' 

Conflicts:
	cmd.c
	format.c
	osdep-openbsd.c
	tmux.h
This commit is contained in:
Thomas Adam 2012-09-24 17:55:06 +01:00
parent d785c37ee2 84612a8196
commit e342304134
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
control.c
View File

@ -79,6 +79,15 @@ control_write(struct client *c, const char *fmt, ...)
server_push_stdout(c);
}
/* Write a buffer, adding a terminal newline. Empties buffer. */
void
control_write_buffer(struct client *c, struct evbuffer *buffer)
{
evbuffer_add_buffer(c->stdout_data, buffer);
evbuffer_add(c->stdout_data, "\n", 1);
server_push_stdout(c);
}
/* Control input callback. Read lines and fire commands. */
void
control_callback(struct client *c, int closed, unused void *data)

4
osdep-openbsd.c
View File

@ -137,10 +137,12 @@ error:
char*
osdep_get_cwd(pid_t pid)
{
int name[] = { CTL_KERN, KERN_PROC_CWD, (int)pid };
int name[] = { CTL_KERN, KERN_PROC_CWD, 0 };
static char path[MAXPATHLEN];
size_t pathlen = sizeof path;
if ((name[2] = tcgetpgrp(fd)) == -1)
return (NULL);
if (sysctl(name, 3, path, &pathlen, NULL, 0) != 0)
return (NULL);
return (path);

1
tmux.h
View File

@ -2217,6 +2217,7 @@ void clear_signals(int);
/* control.c */
void control_callback(struct client *, int, void*);
void printflike2 control_write(struct client *, const char *, ...);
void control_write_buffer(struct client *, struct evbuffer *);
/* control-notify.c */
void control_notify_window_layout_changed(struct window *);