Merge branch 'obsd-master'

Conflicts:
	Makefile
	cmd-server-info.c
	cmd-start-server.c
This commit is contained in:
Thomas Adam
2014-01-31 21:39:56 +00:00
35 changed files with 1414 additions and 699 deletions

View File

@@ -111,12 +111,8 @@ screen_set_cursor_colour(struct screen *s, const char *colour_string)
void
screen_set_title(struct screen *s, const char *title)
{
char tmp[BUFSIZ];
strlcpy(tmp, title, sizeof tmp);
free(s->title);
s->title = xstrdup(tmp);
s->title = xstrdup(title);
}
/* Resize screen. */