circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-01-07 16:28:48 +00:00
Code Issues Projects Releases Wiki Activity

Restore list command.

Browse Source
This commit is contained in:
Nicholas Marriott 2007-09-26 18:32:17 +00:00
parent 2aacbe764c
commit 8d01984182
5 changed files with 106 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -1,4 +1,4 @@
# $Id: Makefile,v 1.5 2007-09-26 13:43:14 nicm Exp $ # $Id: Makefile,v 1.6 2007-09-26 18:32:16 nicm Exp $
.SUFFIXES: .c .o .y .h .SUFFIXES: .c .o .y .h
.PHONY: clean .PHONY: clean
@ -18,7 +18,7 @@ META?= \002 # C-b
SRCS= tmux.c server.c server-msg.c server-fn.c buffer.c buffer-poll.c \ SRCS= tmux.c server.c server-msg.c server-fn.c buffer.c buffer-poll.c \
xmalloc.c xmalloc-debug.c input.c screen.c window.c session.c local.c \ xmalloc.c xmalloc-debug.c input.c screen.c window.c session.c local.c \
log.c client.c client-msg.c client-cmd.c op.c log.c client.c client-msg.c client-cmd.c op.c op-list.c
YACC= yacc -d YACC= yacc -d

10
client.c
View File

@ -1,4 +1,4 @@
/* $Id: client.c,v 1.2 2007-09-26 18:12:19 nicm Exp $ */ /* $Id: client.c,v 1.3 2007-09-26 18:32:16 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -36,7 +36,7 @@ void client_handle_winch(struct client_ctx *);
int client_process_local(struct client_ctx *, const char **); int client_process_local(struct client_ctx *, const char **);
int int
client_init(char *path, struct client_ctx *cctx, int ws) client_init(char *path, struct client_ctx *cctx, int start_server)
{ {
struct sockaddr_un sa; struct sockaddr_un sa;
struct stat sb; struct stat sb;
@ -52,7 +52,7 @@ client_init(char *path, struct client_ctx *cctx, int ws)
retries = 0; retries = 0;
retry: retry:
if (stat(path, &sb) != 0) { if (stat(path, &sb) != 0) {
if (errno != ENOENT) { if (!start_server || errno != ENOENT) {
log_warn("%s", path); log_warn("%s", path);
return (-1); return (-1);
} }
@ -66,7 +66,7 @@ retry:
return (-1); return (-1);
} }
if (ws) { if (start_server) {
if (!isatty(STDIN_FILENO)) { if (!isatty(STDIN_FILENO)) {
log_warnx("stdin is not a tty"); log_warnx("stdin is not a tty");
return (-1); return (-1);
@ -96,7 +96,7 @@ retry:
} }
if (connect( if (connect(
cctx->srv_fd, (struct sockaddr *) &sa, SUN_LEN(&sa)) == -1) { cctx->srv_fd, (struct sockaddr *) &sa, SUN_LEN(&sa)) == -1) {
if (errno == ECONNREFUSED && retries < 5) { if (start_server && errno == ECONNREFUSED && retries < 5) {
if (unlink(path) != 0) { if (unlink(path) != 0) {
log_warn("%s: unlink", path); log_warn("%s: unlink", path);
return (-1); return (-1);

173
op-list.c
View File

@ -1,4 +1,4 @@
/* $Id: op-list.c,v 1.1 2007-09-26 13:43:15 nicm Exp $ */ /* $Id: op-list.c,v 1.2 2007-09-26 18:32:16 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -16,109 +16,122 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* List sessions or windows. */ #include <sys/types.h>
void
op_list(char *name)
{
struct sessions_data sd;
struct windows_data wd;
struct pollfd pfd;
struct hdr hdr;
/* Send query data. */ #include <errno.h>
if (*name == '\0') { #include <getopt.h>
hdr.type = MSG_SESSIONS; #include <string.h>
hdr.size = sizeof sd;
buffer_write(server_out, &hdr, sizeof hdr); #include "tmux.h"
buffer_write(server_out, &sd, hdr.size);
} else { int
hdr.type = MSG_WINDOWS; op_list(char *path, int argc, char **argv)
hdr.size = sizeof wd; {
buffer_write(server_out, &hdr, sizeof hdr); struct client_ctx cctx;
strlcpy(wd.name, name, sizeof wd.name); char name[MAXNAMELEN], *tim;
buffer_write(server_out, &wd, hdr.size); int opt;
struct sessions_data sdata;
struct sessions_entry sent;
struct windows_data wdata;
struct windows_entry went;
struct pollfd pfd;
struct hdr hdr;
*name = '\0';
optind = 1;
while ((opt = getopt(argc, argv, "n:?")) != EOF) {
switch (opt) {
case 'n':
if (strlcpy(name, optarg, sizeof name) >= sizeof name) {
log_warnx("%s: session name too long", optarg);
return (1);
}
break;
case '?':
default:
return (usage("list [-n session]"));
}
}
argc -= optind;
argv += optind;
if (argc != 0)
return (usage("list [-n session]"));
if (client_init(path, &cctx, 0) != 0)
return (1);
if (*name == '\0')
client_write_server(&cctx, MSG_SESSIONS, &sdata, sizeof sdata);
else {
strlcpy(wdata.name, name, sizeof wdata.name);
client_write_server(&cctx, MSG_WINDOWS, &wdata, sizeof wdata);
} }
/* Main loop. */
for (;;) { for (;;) {
/* Set up pollfd. */ pfd.fd = cctx.srv_fd;
pfd.fd = server_fd;
pfd.events = POLLIN; pfd.events = POLLIN;
if (BUFFER_USED(server_out) > 0) if (BUFFER_USED(cctx.srv_out) > 0)
pfd.events |= POLLOUT; pfd.events |= POLLOUT;
/* Do the poll. */
if (poll(&pfd, 1, INFTIM) == -1) { if (poll(&pfd, 1, INFTIM) == -1) {
if (errno == EAGAIN || errno == EINTR) if (errno == EAGAIN || errno == EINTR)
continue; continue;
err(1, "poll"); log_warn("poll");
return (-1);
} }
/* Read/write from sockets. */ if (buffer_poll(&pfd, cctx.srv_in, cctx.srv_out) != 0) {
if (buffer_poll(&pfd, server_in, server_out) != 0) log_warnx("lost server");
errx(1, "lost server"); return (-1);
}
/* Process data. */ if (BUFFER_USED(cctx.srv_in) < sizeof hdr)
process_list(name); continue;
} memcpy(&hdr, BUFFER_OUT(cctx.srv_in), sizeof hdr);
} if (BUFFER_USED(cctx.srv_in) < (sizeof hdr) + hdr.size)
continue;
void buffer_remove(cctx.srv_in, sizeof hdr);
op_list_process(const char *name)
{
struct sessions_data sd;
struct sessions_entry se;
struct windows_data wd;
struct windows_entry we;
struct hdr hdr;
char *tim;
for (;;) {
if (BUFFER_USED(server_in) < sizeof hdr)
break;
memcpy(&hdr, BUFFER_OUT(server_in), sizeof hdr);
if (BUFFER_USED(server_in) < (sizeof hdr) + hdr.size)
break;
buffer_remove(server_in, sizeof hdr);
switch (hdr.type) { switch (hdr.type) {
case MSG_SESSIONS: case MSG_SESSIONS:
if (hdr.size < sizeof sd) if (hdr.size < sizeof sdata)
errx(1, "bad MSG_SESSIONS size"); fatalx("bad MSG_SESSIONS size");
buffer_read(server_in, &sd, sizeof sd); buffer_read(cctx.srv_in, &sdata, sizeof sdata);
hdr.size -= sizeof sd; hdr.size -= sizeof sdata;
if (sd.sessions == 0 && hdr.size == 0) if (sdata.sessions == 0 && hdr.size == 0)
exit(0); return (0);
if (hdr.size < sd.sessions * sizeof se) if (hdr.size < sdata.sessions * sizeof sent)
errx(1, "bad MSG_SESSIONS size"); fatalx("bad MSG_SESSIONS size");
while (sd.sessions-- > 0) { while (sdata.sessions-- > 0) {
buffer_read(server_in, &se, sizeof se); buffer_read(cctx.srv_in, &sent, sizeof sent);
tim = ctime(&se.tim); tim = ctime(&sent.tim);
*strchr(tim, '\n') = '\0'; *strchr(tim, '\n') = '\0';
printf("%s: %u windows (created %s)\n", printf("%s: %u windows (created %s)\n",
se.name, se.windows, tim); sent.name, sent.windows, tim);
} }
exit(0); return (0);
case MSG_WINDOWS: case MSG_WINDOWS:
if (hdr.size < sizeof wd) if (hdr.size < sizeof wdata)
errx(1, "bad MSG_WINDOWS size"); fatalx("bad MSG_WINDOWS size");
buffer_read(server_in, &wd, sizeof wd); buffer_read(cctx.srv_in, &wdata, sizeof wdata);
hdr.size -= sizeof wd; hdr.size -= sizeof wdata;
if (wd.windows == 0 && hdr.size == 0) if (wdata.windows == 0 && hdr.size == 0) {
errx(1, "session not found: %s", name); log_warnx("session not found: %s", name);
if (hdr.size < wd.windows * sizeof we) return (1);
errx(1, "bad MSG_WINDOWS size"); }
while (wd.windows-- > 0) { if (hdr.size < wdata.windows * sizeof went)
buffer_read(server_in, &we, sizeof we); fatalx("bad MSG_WINDOWS size");
if (*we.title != '\0') { while (wdata.windows-- > 0) {
printf("%u: %s \"%s\" (%s)\n", buffer_read(cctx.srv_in, &went, sizeof went);
we.idx, we.name, we.title, we.tty); if (*went.title != '\0') {
printf("%u: %s \"%s\" (%s)\n", went.idx,
went.name, went.title, went.tty);
} else { } else {
printf("%u: %s (%s)\n", printf("%u: %s (%s)\n",
we.idx, we.name, we.tty); went.idx, went.name, went.tty);
} }
} }
exit(0); return (0);
default: default:
fatalx("unexpected message"); fatalx("unexpected message");
} }

4
tmux.c
View File

@ -1,4 +1,4 @@
/* $Id: tmux.c,v 1.10 2007-09-26 14:08:16 nicm Exp $ */ /* $Id: tmux.c,v 1.11 2007-09-26 18:32:16 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -43,7 +43,7 @@ struct op {
int (*fn)(char *, int, char **); int (*fn)(char *, int, char **);
}; };
struct op op_table[] = { struct op op_table[] = {
// { "list", op_list }, { "list", op_list },
{ "new", op_new }, { "new", op_new },
{ "attach", op_attach } { "attach", op_attach }
}; };

5
tmux.h
View File

@ -1,4 +1,4 @@
/* $Id: tmux.h,v 1.13 2007-09-26 18:09:23 nicm Exp $ */ /* $Id: tmux.h,v 1.14 2007-09-26 18:32:17 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -442,6 +442,9 @@ void sigreset(void);
int op_new(char *, int, char **); int op_new(char *, int, char **);
int op_attach(char *, int, char **); int op_attach(char *, int, char **);
/* op-list.c */
int op_list(char *, int, char **);
/* client.c */ /* client.c */
int client_init(char *, struct client_ctx *, int); int client_init(char *, struct client_ctx *, int);
int client_main(struct client_ctx *); int client_main(struct client_ctx *);