===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/Attic/cmd-server-info.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -c -r1.31 -r1.32
*** src/usr.bin/tmux/Attic/cmd-server-info.c	2013/03/22 10:31:22	1.31
--- src/usr.bin/tmux/Attic/cmd-server-info.c	2013/03/24 09:54:10	1.32
***************
*** 1,4 ****
! /* $OpenBSD: cmd-server-info.c,v 1.31 2013/03/22 10:31:22 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-server-info.c,v 1.32 2013/03/24 09:54:10 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 31,37 ****
   * Show various information about server.
   */
  
! enum cmd_retval	 cmd_server_info_exec(struct cmd *, struct cmd_ctx *);
  
  const struct cmd_entry cmd_server_info_entry = {
  	"server-info", "info",
--- 31,37 ----
   * Show various information about server.
   */
  
! enum cmd_retval	 cmd_server_info_exec(struct cmd *, struct cmd_q *);
  
  const struct cmd_entry cmd_server_info_entry = {
  	"server-info", "info",
***************
*** 44,50 ****
  };
  
  enum cmd_retval
! cmd_server_info_exec(unused struct cmd *self, struct cmd_ctx *ctx)
  {
  	struct tty_term				*term;
  	struct client				*c;
--- 44,50 ----
  };
  
  enum cmd_retval
! cmd_server_info_exec(unused struct cmd *self, struct cmd_q *cmdq)
  {
  	struct tty_term				*term;
  	struct client				*c;
***************
*** 66,112 ****
  
  	tim = ctime(&start_time);
  	*strchr(tim, '\n') = '\0';
! 	ctx->print(ctx, "pid %ld, started %s", (long) getpid(), tim);
! 	ctx->print(
! 	    ctx, "socket path %s, debug level %d", socket_path, debug_level);
  	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 is %s", cfg_file);
  	else
! 		ctx->print(ctx, "configuration file not specified");
! 	ctx->print(ctx, "protocol version is %d", PROTOCOL_VERSION);
! 	ctx->print(ctx, "%s", "");
  
! 	ctx->print(ctx, "Clients:");
  	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 bs=%hho "
  		    "class=%u] [flags=0x%x/0x%x, references=%u]", i,
  		    c->tty.path, c->ibuf.fd, c->tty.fd, c->session->name,
  		    c->tty.sx, c->tty.sy, c->tty.termname,
  		    c->tty.tio.c_cc[VERASE], c->tty.class,
  		    c->flags, c->tty.flags, c->references);
  	}
! 	ctx->print(ctx, "%s", "");
  
! 	ctx->print(ctx, "Sessions: [%zu]", sizeof (struct grid_cell));
  	RB_FOREACH(s, sessions, &sessions) {
  		t = s->creation_time.tv_sec;
  		tim = ctime(&t);
  		*strchr(tim, '\n') = '\0';
  
! 		ctx->print(ctx, "%2u: %s: %u windows (created %s) [%ux%u] "
  		    "[flags=0x%x]", s->idx, s->name,
  		    winlink_count(&s->windows), tim, s->sx, s->sy, s->flags);
  		RB_FOREACH(wl, winlinks, &s->windows) {
  			w = wl->window;
! 			ctx->print(ctx, "%4u: %s [%ux%u] [flags=0x%x, "
  			    "references=%u, last layout=%d]", wl->idx, w->name,
  			    w->sx, w->sy, w->flags, w->references,
  			    w->lastlayout);
--- 66,112 ----
  
  	tim = ctime(&start_time);
  	*strchr(tim, '\n') = '\0';
! 	cmdq_print(cmdq, "pid %ld, started %s", (long) getpid(), tim);
! 	cmdq_print(cmdq, "socket path %s, debug level %d", socket_path,
! 	    debug_level);
  	if (uname(&un) >= 0) {
! 		cmdq_print(cmdq, "system is %s %s %s %s",
  		    un.sysname, un.release, un.version, un.machine);
  	}
  	if (cfg_file != NULL)
! 		cmdq_print(cmdq, "configuration file is %s", cfg_file);
  	else
! 		cmdq_print(cmdq, "configuration file not specified");
! 	cmdq_print(cmdq, "protocol version is %d", PROTOCOL_VERSION);
! 	cmdq_print(cmdq, "%s", "");
  
! 	cmdq_print(cmdq, "Clients:");
  	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
  		c = ARRAY_ITEM(&clients, i);
  		if (c == NULL || c->session == NULL)
  			continue;
  
! 		cmdq_print(cmdq,"%2d: %s (%d, %d): %s [%ux%u %s bs=%hho "
  		    "class=%u] [flags=0x%x/0x%x, references=%u]", i,
  		    c->tty.path, c->ibuf.fd, c->tty.fd, c->session->name,
  		    c->tty.sx, c->tty.sy, c->tty.termname,
  		    c->tty.tio.c_cc[VERASE], c->tty.class,
  		    c->flags, c->tty.flags, c->references);
  	}
! 	cmdq_print(cmdq, "%s", "");
  
! 	cmdq_print(cmdq, "Sessions: [%zu]", sizeof (struct grid_cell));
  	RB_FOREACH(s, sessions, &sessions) {
  		t = s->creation_time.tv_sec;
  		tim = ctime(&t);
  		*strchr(tim, '\n') = '\0';
  
! 		cmdq_print(cmdq, "%2u: %s: %u windows (created %s) [%ux%u] "
  		    "[flags=0x%x]", s->idx, s->name,
  		    winlink_count(&s->windows), tim, s->sx, s->sy, s->flags);
  		RB_FOREACH(wl, winlinks, &s->windows) {
  			w = wl->window;
! 			cmdq_print(cmdq, "%4u: %s [%ux%u] [flags=0x%x, "
  			    "references=%u, last layout=%d]", wl->idx, w->name,
  			    w->sx, w->sy, w->flags, w->references,
  			    w->lastlayout);
***************
*** 122,128 ****
  					size += gl->cellsize *
  					    sizeof *gl->celldata;
  				}
! 				ctx->print(ctx,
  				    "%6u: %s %lu %d %u/%u, %zu bytes", j,
  				    wp->tty, (u_long) wp->pid, wp->fd, lines,
  				    gd->hsize + gd->sy, size);
--- 122,128 ----
  					size += gl->cellsize *
  					    sizeof *gl->celldata;
  				}
! 				cmdq_print(cmdq,
  				    "%6u: %s %lu %d %u/%u, %zu bytes", j,
  				    wp->tty, (u_long) wp->pid, wp->fd, lines,
  				    gd->hsize + gd->sy, size);
***************
*** 130,172 ****
  			}
  		}
  	}
! 	ctx->print(ctx, "%s", "");
  
! 	ctx->print(ctx, "Terminals:");
  	LIST_FOREACH(term, &tty_terms, entry) {
! 		ctx->print(ctx, "%s [references=%u, flags=0x%x]:",
  		    term->name, term->references, term->flags);
  		for (i = 0; i < NTTYCODE; i++) {
  			ent = &tty_term_codes[i];
  			code = &term->codes[ent->code];
  			switch (code->type) {
  			case TTYCODE_NONE:
! 				ctx->print(ctx, "%2u: %s: [missing]",
  				    ent->code, ent->name);
  				break;
  			case TTYCODE_STRING:
  				strnvis(out, code->value.string, sizeof out,
  				    VIS_OCTAL|VIS_TAB|VIS_NL);
! 				ctx->print(ctx, "%2u: %s: (string) %s",
  				    ent->code, ent->name, out);
  				break;
  			case TTYCODE_NUMBER:
! 				ctx->print(ctx, "%2u: %s: (number) %d",
  				    ent->code, ent->name, code->value.number);
  				break;
  			case TTYCODE_FLAG:
! 				ctx->print(ctx, "%2u: %s: (flag) %s",
  				    ent->code, ent->name,
  				    code->value.flag ? "true" : "false");
  				break;
  			}
  		}
  	}
! 	ctx->print(ctx, "%s", "");
  
! 	ctx->print(ctx, "Jobs:");
  	LIST_FOREACH(job, &all_jobs, lentry) {
! 		ctx->print(ctx, "%s [fd=%d, pid=%d, status=%d]",
  		    job->cmd, job->fd, job->pid, job->status);
  	}
  
--- 130,172 ----
  			}
  		}
  	}
! 	cmdq_print(cmdq, "%s", "");
  
! 	cmdq_print(cmdq, "Terminals:");
  	LIST_FOREACH(term, &tty_terms, entry) {
! 		cmdq_print(cmdq, "%s [references=%u, flags=0x%x]:",
  		    term->name, term->references, term->flags);
  		for (i = 0; i < NTTYCODE; i++) {
  			ent = &tty_term_codes[i];
  			code = &term->codes[ent->code];
  			switch (code->type) {
  			case TTYCODE_NONE:
! 				cmdq_print(cmdq, "%2u: %s: [missing]",
  				    ent->code, ent->name);
  				break;
  			case TTYCODE_STRING:
  				strnvis(out, code->value.string, sizeof out,
  				    VIS_OCTAL|VIS_TAB|VIS_NL);
! 				cmdq_print(cmdq, "%2u: %s: (string) %s",
  				    ent->code, ent->name, out);
  				break;
  			case TTYCODE_NUMBER:
! 				cmdq_print(cmdq, "%2u: %s: (number) %d",
  				    ent->code, ent->name, code->value.number);
  				break;
  			case TTYCODE_FLAG:
! 				cmdq_print(cmdq, "%2u: %s: (flag) %s",
  				    ent->code, ent->name,
  				    code->value.flag ? "true" : "false");
  				break;
  			}
  		}
  	}
! 	cmdq_print(cmdq, "%s", "");
  
! 	cmdq_print(cmdq, "Jobs:");
  	LIST_FOREACH(job, &all_jobs, lentry) {
! 		cmdq_print(cmdq, "%s [fd=%d, pid=%d, status=%d]",
  		    job->cmd, job->fd, job->pid, job->status);
  	}