summaryrefslogtreecommitdiffstats
path: root/cmd-show-buffer.c
authortcunha <tcunha>2009-08-20 11:30:24 (GMT)
committer tcunha <tcunha>2009-08-20 11:30:24 (GMT)
commit8e8d2fe3bd10b35f1d3eddb07b8221b5bd5d2063 (patch) (side-by-side diff)
treefe9d38a88418d04358f751b875713873046b2a94 /cmd-show-buffer.c
parentecfd77c02da32a18640afa6a5e08f8311d9d37e4 (diff)
downloadtmux-old-8e8d2fe3bd10b35f1d3eddb07b8221b5bd5d2063.zip
tmux-old-8e8d2fe3bd10b35f1d3eddb07b8221b5bd5d2063.tar.gz
tmux-old-8e8d2fe3bd10b35f1d3eddb07b8221b5bd5d2063.tar.bz2
Sync OpenBSD patchset 269:
Pass show-buffer output through vis(3) as well, and wrap it to the edge of the terminal when used from the command line.
Diffstat (limited to 'cmd-show-buffer.c') (more/less context) (ignore whitespace changes)
-rw-r--r--cmd-show-buffer.c63
1 files changed, 40 insertions, 23 deletions
diff --git a/cmd-show-buffer.c b/cmd-show-buffer.c
index 4467513..6decbd4 100644
--- a/cmd-show-buffer.c
+++ b/cmd-show-buffer.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: cmd-show-buffer.c,v 1.7 2009/08/20 11:30:24 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <[email protected]>
@@ -18,7 +18,8 @@
#include <sys/types.h>
-#include <stdlib.h>
+#include <string.h>
+#include <vis.h>
#include "tmux.h"
@@ -45,9 +46,9 @@ cmd_show_buffer_exec(struct cmd *self, struct cmd_ctx *ctx)
struct cmd_buffer_data *data = self->data;
struct session *s;
struct paste_buffer *pb;
- u_int size;
- char *buf, *ptr;
- size_t len;
+ char *in, *buf, *ptr;
+ size_t size, len;
+ u_int width;
if ((s = cmd_find_session(ctx, data->target)) == NULL)
return (-1);
@@ -61,27 +62,43 @@ cmd_show_buffer_exec(struct cmd *self, struct cmd_ctx *ctx)
ctx->error(ctx, "no buffer %d", data->buffer);
return (-1);
}
-
- if (pb != NULL) {
- size = s->sx;
-
- buf = xmalloc(size + 1);
- len = 0;
-
- ptr = pb->data;
- do {
- buf[len++] = *ptr++;
-
- if (len == size) {
- buf[len] = '\0';
- ctx->print(ctx, buf);
-
- len = 0;
- }
- } while (*ptr != '\0');
+ if (pb == NULL)
+ return (0);
+
+ size = strlen(pb->data);
+ if (size > SIZE_MAX / 4 - 1)
+ size = SIZE_MAX / 4 - 1;
+ in = xmalloc(size * 4 + 1);
+ strvisx(in, pb->data, size, VIS_OCTAL|VIS_TAB);
+
+ width = s->sx;
+ if (ctx->cmdclient != NULL)
+ width = ctx->cmdclient->tty.sx;
+
+ buf = xmalloc(width + 1);
+ len = 0;
+
+ ptr = in;
+ do {
+ buf[len++] = *ptr++;
+
+ if (len == width || buf[len - 1] == '\n') {
+ if (buf[len - 1] == '\n')
+ len--;
+ buf[len] = '\0';
+
+ ctx->print(ctx, "%s", buf);
+ len = 0;
+ }
+ } while (*ptr != '\0');
+
+ if (len != 0) {
buf[len] = '\0';
ctx->print(ctx, buf);
}
+ xfree(buf);
+
+ xfree(in);
return (0);
}