circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-01 20:57:00 +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

25
cmd-show-messages.c
View File

@ -32,8 +32,8 @@ enum cmd_retval cmd_show_messages_exec(struct cmd *, struct cmd_q *);
const struct cmd_entry cmd_show_messages_entry = {
"show-messages", "showmsgs",
"IJTt:", 0, 0,
"[-IJT] " CMD_TARGET_CLIENT_USAGE,
"JTt:", 0, 0,
"[-JT] " CMD_TARGET_CLIENT_USAGE,
0,
cmd_show_messages_exec
};
@ -46,26 +46,9 @@ const struct cmd_entry cmd_server_info_entry = {
cmd_show_messages_exec
};
int cmd_show_messages_server(struct cmd_q *);
int cmd_show_messages_terminals(struct cmd_q *, int);
int cmd_show_messages_jobs(struct cmd_q *, int);
int
cmd_show_messages_server(struct cmd_q *cmdq)
{
char *tim;
tim = ctime(&start_time);
*strchr(tim, '\n') = '\0';
cmdq_print(cmdq, "started %s", tim);
cmdq_print(cmdq, "socket path %s", socket_path);
cmdq_print(cmdq, "debug level %d", debug_level);
cmdq_print(cmdq, "protocol version %d", PROTOCOL_VERSION);
return (1);
}
int
cmd_show_messages_terminals(struct cmd_q *cmdq, int blank)
{
@ -116,10 +99,6 @@ cmd_show_messages_exec(struct cmd *self, struct cmd_q *cmdq)
int done, blank;
done = blank = 0;
if (args_has(args, 'I') || self->entry == &cmd_server_info_entry) {
blank = cmd_show_messages_server(cmdq);
done = 1;
}
if (args_has(args, 'T') || self->entry == &cmd_server_info_entry) {
blank = cmd_show_messages_terminals(cmdq, blank);
done = 1;