extern/tmate
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate.git synced 2025-08-23 19:36:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source 
Conflicts:
	tmux.1
	tmux.c
This commit is contained in:
Thomas Adam
2014-02-16 23:02:07 +00:00
parent 8edbbb9865 81db6bab91
commit b3de4a3dec
14 changed files with 90 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
cmd-show-messages.c
View File

@@ -48,12 +48,12 @@ const struct cmd_entry cmd_server_info_entry = {
cmd_show_messages_exec
};
void cmd_show_messages_server (struct cmd_q *);
void cmd_show_messages_terminals (struct cmd_q *);
void cmd_show_messages_jobs (struct cmd_q *);
void cmd_show_messages_server(struct cmd_q *);
void cmd_show_messages_terminals(struct cmd_q *);
void cmd_show_messages_jobs(struct cmd_q *);
void
cmd_show_messages_server (struct cmd_q *cmdq)
cmd_show_messages_server(struct cmd_q *cmdq)
{
char *tim;
@@ -67,7 +67,7 @@ cmd_show_messages_server (struct cmd_q *cmdq)
}
void
cmd_show_messages_terminals (struct cmd_q *cmdq)
cmd_show_messages_terminals(struct cmd_q *cmdq)
{
struct tty_term *term;
const struct tty_term_code_entry *ent;
@@ -110,7 +110,7 @@ cmd_show_messages_terminals (struct cmd_q *cmdq)
}
void
cmd_show_messages_jobs (struct cmd_q *cmdq)
cmd_show_messages_jobs(struct cmd_q *cmdq)
{
struct job *job;
u_int n;
@@ -135,20 +135,20 @@ cmd_show_messages_exec(struct cmd *self, struct cmd_q *cmdq)
int done;
done = 0;
if (args_has (args, 'I') || self->entry == &cmd_server_info_entry) {
cmd_show_messages_server (cmdq);
if (args_has(args, 'I') || self->entry == &cmd_server_info_entry) {
cmd_show_messages_server(cmdq);
done = 1;
}
if (args_has (args, 'T') || self->entry == &cmd_server_info_entry) {
if (args_has(args, 'T') || self->entry == &cmd_server_info_entry) {
if (done)
cmdq_print (cmdq, "%s", "");
cmd_show_messages_terminals (cmdq);
cmdq_print(cmdq, "%s", "");
cmd_show_messages_terminals(cmdq);
done = 1;
}
if (args_has (args, 'J') || self->entry == &cmd_server_info_entry) {
if (args_has(args, 'J') || self->entry == &cmd_server_info_entry) {
if (done)
cmdq_print (cmdq, "%s", "");
cmd_show_messages_jobs (cmdq);
cmdq_print(cmdq, "%s", "");
cmd_show_messages_jobs(cmdq);
done = 1;
}
if (done)