Change server-info format.

1 files changed, 50 insertions, 21 deletions

diff --git a/cmd-server-info.c b/cmd-server-info.c
index e5c88f17..b0f505fe 100644
--- a/cmd-server-info.c
+++ b/cmd-server-info.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-server-info.c,v 1.5 2009-01-10 12:52:57 nicm Exp $ */
+/* $Id: cmd-server-info.c,v 1.6 2009-01-10 14:43:43 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -17,8 +17,10 @@
  */
 
 #include <sys/types.h>
+#include <sys/utsname.h>
 
 #include <stdlib.h>
+#include <string.h>
 #include <time.h>
 #include <unistd.h>
 #include <vis.h>
@@ -48,33 +50,60 @@ void
 cmd_server_info_exec(unused struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct tty_term			*term;
-	struct client			*cmdclient;
+	struct client			*c;
+	struct session			*s;
 	struct tty_code			*code;
 	struct tty_term_code_entry	*ent;
+	struct utsname			 un;
 	u_int		 		 i;
-	char				 s[BUFSIZ];
+	char				 out[BUFSIZ];
+	char				*tim;
+	time_t		 		 t;
 
-	ctx->print(ctx, "tmux " BUILD
-	    ", pid %ld, started %s", (long) getpid(), ctime(&start_time));
+	tim = ctime(&start_time);
+	*strchr(tim, '\n') = '\0';
+	ctx->print(ctx, 
+	    "tmux " BUILD ", pid %ld, started %s", (long) getpid(), tim);
 	ctx->print(ctx, "socket path %s, debug level %d%s",
 	    socket_path, debug_level, be_quiet ? ", quiet" : "");
+        if (uname(&un) == 0) {
+                ctx->print(ctx, "system is %s %s %s %s",
+		    un.sysname, un.release, un.version, un.machine);
+	}
 	if (cfg_file != NULL)
-		ctx->print(ctx, "configuration file %s", cfg_file);
+		ctx->print(ctx, "configuration file is %s", cfg_file);
 	else
 		ctx->print(ctx, "configuration file not specified");
 	ctx->print(ctx, "%u clients, %u sessions",
 	    ARRAY_LENGTH(&clients), ARRAY_LENGTH(&sessions));
 	ctx->print(ctx, "");
 
-	cmdclient = ctx->cmdclient;
-	ctx->cmdclient = NULL;
-
 	ctx->print(ctx, "Clients:");
-	cmd_list_clients_entry.exec(self, ctx);
+	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
+		c = ARRAY_ITEM(&clients, i);
+		if (c == NULL || c->session == NULL)
+			continue;
+
+		ctx->print(ctx, "  %2d: %s (%d, %d): %s [%ux%u %s] "
+		    "[flags=0x%x]", i, c->tty.path, c->fd, c->tty.fd, 
+		    c->session->name, c->sx, c->sy, c->tty.termname, c->flags);
+	}
 	ctx->print(ctx, "");
 
  	ctx->print(ctx, "Sessions:");
-	cmd_list_sessions_entry.exec(self, ctx);
+	for (i = 0; i < ARRAY_LENGTH(&sessions); i++) {
+		s = ARRAY_ITEM(&sessions, i);
+		if (s == NULL)
+			continue;
+
+		t = s->tv.tv_sec;
+		tim = ctime(&t);
+		*strchr(tim, '\n') = '\0';
+
+		ctx->print(ctx, "  %2d: %s: %u windows (created %s) [%ux%u] "
+		    "[flags=0x%x]", i, s->name, winlink_count(&s->windows),
+		    tim, s->sx, s->sy, s->flags);
+	}
 	ctx->print(ctx, "");
 
   	ctx->print(ctx, "Terminals:");
@@ -86,23 +115,23 @@ cmd_server_info_exec(unused struct cmd *self, struct cmd_ctx *ctx)
 			code = &term->codes[ent->code];
 			switch (code->type) {
 			case TTYCODE_NONE:
-				ctx->print(ctx, "  %2d,%s: [missing]",
+				ctx->print(ctx, "  %2d: %s: [missing]",
 				    ent->code, ent->name);
 				break;
 			case TTYCODE_STRING:
-				strnvis(s, code->value.string,
-				    sizeof s, VIS_OCTAL|VIS_WHITE);
-				s[(sizeof s) - 1] = '\0';
+				strnvis(out, code->value.string,
+				    sizeof out, VIS_OCTAL|VIS_WHITE);
+				out[(sizeof out) - 1] = '\0';
 
-				ctx->print(ctx, "  %2d,%s: (string) %s",
-				    ent->code, ent->name, s);
+				ctx->print(ctx, "  %2d: %s: (string) %s",
+				    ent->code, ent->name, out);
 				break;
 			case TTYCODE_NUMBER:
-				ctx->print(ctx, "  %2d,%s: (number) %d",
+				ctx->print(ctx, "  %2d: %s: (number) %d",
 				    ent->code, ent->name, code->value.number);
 				break;
 			case TTYCODE_FLAG:
-				ctx->print(ctx, "  %2d,%s: (flag) %s",
+				ctx->print(ctx, "  %2d: %s: (flag) %s",
 				    ent->code, ent->name,
 				    code->value.flag ? "true" : "false");
 				break;
@@ -111,6 +140,6 @@ cmd_server_info_exec(unused struct cmd *self, struct cmd_ctx *ctx)
 	}
 	ctx->print(ctx, "");
 
-	if (cmdclient != NULL)
-		server_write_client(cmdclient, MSG_EXIT, NULL, 0);
+	if (ctx->cmdclient != NULL)
+		server_write_client(ctx->cmdclient, MSG_EXIT, NULL, 0);
 }