Tidy blank lines when outputting server info.

diff --git a/usr.bin/tmux/cmd-show-messages.c b/usr.bin/tmux/cmd-show-messages.c
index e71aa43..3b51dee 100644 (file)
--- a/usr.bin/tmux/cmd-show-messages.c
+++ b/usr.bin/tmux/cmd-show-messages.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-show-messages.c,v 1.11 2015/04/25 18:33:59 nicm Exp $ */
+/* $OpenBSD: cmd-show-messages.c,v 1.12 2015/05/12 19:36:08 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -47,11 +47,11 @@ 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 *);
+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);
 
-void
+int
 cmd_show_messages_server(struct cmd_q *cmdq)
 {
        char    *tim;
@@ -63,10 +63,12 @@ cmd_show_messages_server(struct cmd_q *cmdq)
        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);
 }
 
-void
-cmd_show_messages_terminals(struct cmd_q *cmdq)
+int
+cmd_show_messages_terminals(struct cmd_q *cmdq, int blank)
 {
        struct tty_term                         *term;
        const struct tty_term_code_entry        *ent;
@@ -76,8 +78,11 @@ cmd_show_messages_terminals(struct cmd_q *cmdq)
 
        n = 0;
        LIST_FOREACH(term, &tty_terms, entry) {
-               cmdq_print(cmdq,
-                   "Terminal %u: %s [references=%u, flags=0x%x]:",
+               if (blank) {
+                       cmdq_print(cmdq, "%s", "");
+                       blank = 0;
+               }
+               cmdq_print(cmdq, "Terminal %u: %s [references=%u, flags=0x%x]:",
                    n, term->name, term->references, term->flags);
                n++;
                for (i = 0; i < NTTYCODE; i++) {
@@ -106,21 +111,26 @@ cmd_show_messages_terminals(struct cmd_q *cmdq)
                        }
                }
        }
+       return (n != 0);
 }
 
-void
-cmd_show_messages_jobs(struct cmd_q *cmdq)
+int
+cmd_show_messages_jobs(struct cmd_q *cmdq, int blank)
 {
        struct job      *job;
        u_int            n;
 
        n = 0;
        LIST_FOREACH(job, &all_jobs, lentry) {
-               cmdq_print(cmdq,
-                   "Job %u: %s [fd=%d, pid=%d, status=%d]",
+               if (blank) {
+                       cmdq_print(cmdq, "%s", "");
+                       blank = 0;
+               }
+               cmdq_print(cmdq, "Job %u: %s [fd=%d, pid=%d, status=%d]",
                    n, job->cmd, job->fd, job->pid, job->status);
                n++;
        }
+       return (n != 0);
 }
 
 enum cmd_retval
@@ -130,23 +140,19 @@ cmd_show_messages_exec(struct cmd *self, struct cmd_q *cmdq)
        struct client           *c;
        struct message_entry    *msg;
        char                    *tim;
-       int                      done;
+       int                      done, blank;
 
-       done = 0;
+       done = blank = 0;
        if (args_has(args, 'I') || self->entry == &cmd_server_info_entry) {
-               cmd_show_messages_server(cmdq);
+               blank = cmd_show_messages_server(cmdq);
                done = 1;
        }
        if (args_has(args, 'T') || self->entry == &cmd_server_info_entry) {
-               if (done)
-                       cmdq_print(cmdq, "%s", "");
-               cmd_show_messages_terminals(cmdq);
+               blank = cmd_show_messages_terminals(cmdq, blank);
                done = 1;
        }
        if (args_has(args, 'J') || self->entry == &cmd_server_info_entry) {
-               if (done)
-                       cmdq_print(cmdq, "%s", "");
-               cmd_show_messages_jobs(cmdq);
+               cmd_show_messages_jobs(cmdq, blank);
                done = 1;
        }
        if (done)