Module Name: src
Committed By: christos
Date: Sat Mar 12 03:02:59 UTC 2011
Modified Files:
src/external/bsd/tmux/dist: cmd-copy-buffer.c cmd-paste-buffer.c
cmd-server-info.c cmd-string.c environ.c input.c job.c options.c
screen-write.c screen.c server-fn.c session.c tty-acs.c tty-keys.c
tty-term.c window.c
src/external/bsd/tmux/usr.bin/tmux: Makefile config.h
Log Message:
- use our vis (maybe I'll implement strnvis soon, but not now)
- WARNS=4
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/tmux/dist/cmd-copy-buffer.c \
src/external/bsd/tmux/dist/cmd-paste-buffer.c \
src/external/bsd/tmux/dist/cmd-server-info.c \
src/external/bsd/tmux/dist/cmd-string.c \
src/external/bsd/tmux/dist/environ.c src/external/bsd/tmux/dist/input.c \
src/external/bsd/tmux/dist/job.c src/external/bsd/tmux/dist/options.c \
src/external/bsd/tmux/dist/screen-write.c \
src/external/bsd/tmux/dist/screen.c \
src/external/bsd/tmux/dist/server-fn.c \
src/external/bsd/tmux/dist/session.c src/external/bsd/tmux/dist/tty-acs.c \
src/external/bsd/tmux/dist/tty-keys.c \
src/external/bsd/tmux/dist/tty-term.c src/external/bsd/tmux/dist/window.c
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/tmux/usr.bin/tmux/Makefile \
src/external/bsd/tmux/usr.bin/tmux/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/tmux/dist/cmd-copy-buffer.c
diff -u src/external/bsd/tmux/dist/cmd-copy-buffer.c:1.1.1.1 src/external/bsd/tmux/dist/cmd-copy-buffer.c:1.2
--- src/external/bsd/tmux/dist/cmd-copy-buffer.c:1.1.1.1 Thu Mar 10 04:15:36 2011
+++ src/external/bsd/tmux/dist/cmd-copy-buffer.c Fri Mar 11 22:02:58 2011
@@ -1,4 +1,4 @@
-/* $Id: cmd-copy-buffer.c,v 1.1.1.1 2011/03/10 09:15:36 jmmv Exp $ */
+/* $Id: cmd-copy-buffer.c,v 1.2 2011/03/12 03:02:58 christos Exp $ */
/*
* Copyright (c) 2009 Tiago Cunha <[email protected]>
@@ -127,7 +127,7 @@
struct cmd_copy_buffer_data *data = self->data;
struct paste_buffer *pb;
struct paste_stack *dst_ps, *src_ps;
- u_char *pdata;
+ char *pdata;
struct session *dst_session, *src_session;
u_int limit;
Index: src/external/bsd/tmux/dist/cmd-paste-buffer.c
diff -u src/external/bsd/tmux/dist/cmd-paste-buffer.c:1.1.1.1 src/external/bsd/tmux/dist/cmd-paste-buffer.c:1.2
--- src/external/bsd/tmux/dist/cmd-paste-buffer.c:1.1.1.1 Thu Mar 10 04:15:37 2011
+++ src/external/bsd/tmux/dist/cmd-paste-buffer.c Fri Mar 11 22:02:58 2011
@@ -1,4 +1,4 @@
-/* $Id: cmd-paste-buffer.c,v 1.1.1.1 2011/03/10 09:15:37 jmmv Exp $ */
+/* $Id: cmd-paste-buffer.c,v 1.2 2011/03/12 03:02:58 christos Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <[email protected]>
@@ -195,7 +195,6 @@
{
struct cmd_paste_buffer_data *data = self->data;
size_t off = 0;
- char tmp[BUFSIZ];
int r_flag;
r_flag = 0;
@@ -212,8 +211,9 @@
if (off < len && data->buffer != -1)
off += xsnprintf(buf + off, len - off, " -b %d", data->buffer);
if (off < len && data->sepstr != NULL && !r_flag) {
- strnvis(
- tmp, data->sepstr, sizeof tmp, VIS_OCTAL|VIS_TAB|VIS_NL);
+ size_t slen = strlen(data->sepstr);
+ char tmp[slen * 4 + 1];
+ strvisx(tmp, data->sepstr, slen, VIS_OCTAL|VIS_TAB|VIS_NL);
off += cmd_prarg(buf + off, len - off, " -s ", tmp);
}
if (off < len && data->target != NULL)
Index: src/external/bsd/tmux/dist/cmd-server-info.c
diff -u src/external/bsd/tmux/dist/cmd-server-info.c:1.1.1.1 src/external/bsd/tmux/dist/cmd-server-info.c:1.2
--- src/external/bsd/tmux/dist/cmd-server-info.c:1.1.1.1 Thu Mar 10 04:15:37 2011
+++ src/external/bsd/tmux/dist/cmd-server-info.c Fri Mar 11 22:02:58 2011
@@ -1,4 +1,4 @@
-/* $Id: cmd-server-info.c,v 1.1.1.1 2011/03/10 09:15:37 jmmv Exp $ */
+/* $Id: cmd-server-info.c,v 1.2 2011/03/12 03:02:58 christos Exp $ */
/*
* Copyright (c) 2008 Nicholas Marriott <[email protected]>
@@ -60,7 +60,6 @@
struct grid *gd;
struct grid_line *gl;
u_int i, j, k;
- char out[80];
char *tim;
time_t t;
u_int lines, ulines;
@@ -153,12 +152,15 @@
ctx->print(ctx, "%2u: %s: [missing]",
ent->code, ent->name);
break;
- case TTYCODE_STRING:
- strnvis(out, code->value.string, sizeof out,
+ case TTYCODE_STRING: {
+ size_t slen = strlen(code->value.string);
+ char out[slen * 4 + 1];
+ strvisx(out, code->value.string, slen,
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);
Index: src/external/bsd/tmux/dist/cmd-string.c
diff -u src/external/bsd/tmux/dist/cmd-string.c:1.1.1.1 src/external/bsd/tmux/dist/cmd-string.c:1.2
--- src/external/bsd/tmux/dist/cmd-string.c:1.1.1.1 Thu Mar 10 04:15:37 2011
+++ src/external/bsd/tmux/dist/cmd-string.c Fri Mar 11 22:02:58 2011
@@ -1,4 +1,4 @@
-/* $Id: cmd-string.c,v 1.1.1.1 2011/03/10 09:15:37 jmmv Exp $ */
+/* $Id: cmd-string.c,v 1.2 2011/03/12 03:02:58 christos Exp $ */
/*
* Copyright (c) 2008 Nicholas Marriott <[email protected]>
@@ -40,11 +40,11 @@
int
cmd_string_getc(const char *s, size_t *p)
{
- const u_char *ucs = s;
+ const char *ucs = s;
if (ucs[*p] == '\0')
return (EOF);
- return (ucs[(*p)++]);
+ return (u_char)(ucs[(*p)++]);
}
void
Index: src/external/bsd/tmux/dist/environ.c
diff -u src/external/bsd/tmux/dist/environ.c:1.1.1.1 src/external/bsd/tmux/dist/environ.c:1.2
--- src/external/bsd/tmux/dist/environ.c:1.1.1.1 Thu Mar 10 04:15:38 2011
+++ src/external/bsd/tmux/dist/environ.c Fri Mar 11 22:02:59 2011
@@ -1,4 +1,4 @@
-/* $Id: environ.c,v 1.1.1.1 2011/03/10 09:15:38 jmmv Exp $ */
+/* $Id: environ.c,v 1.2 2011/03/12 03:02:59 christos Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <[email protected]>
@@ -74,7 +74,7 @@
{
struct environ_entry envent;
- envent.name = (char *) name;
+ envent.name = __UNCONST(name);
return (RB_FIND(environ, env, &envent));
}
Index: src/external/bsd/tmux/dist/input.c
diff -u src/external/bsd/tmux/dist/input.c:1.1.1.1 src/external/bsd/tmux/dist/input.c:1.2
--- src/external/bsd/tmux/dist/input.c:1.1.1.1 Thu Mar 10 04:15:38 2011
+++ src/external/bsd/tmux/dist/input.c Fri Mar 11 22:02:59 2011
@@ -1,4 +1,4 @@
-/* $Id: input.c,v 1.1.1.1 2011/03/10 09:15:38 jmmv Exp $ */
+/* $Id: input.c,v 1.2 2011/03/12 03:02:59 christos Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <[email protected]>
@@ -638,7 +638,7 @@
if (ictx->ch != entry->ch)
return (ictx->ch - entry->ch);
- return (strcmp(ictx->interm_buf, entry->interm));
+ return (strcmp((const char *)ictx->interm_buf, entry->interm));
}
/* Initialise input parser. */
@@ -752,7 +752,7 @@
if (ictx->param_len == 0)
return (0);
- ptr = ictx->param_buf;
+ ptr = (char *)ictx->param_buf;
while ((out = strsep(&ptr, ";")) != NULL) {
if (*out == '\0')
n = -1;
@@ -1409,7 +1409,7 @@
if (ictx->input_buf[0] != '0' && ictx->input_buf[0] != '2')
return;
- screen_set_title(ictx->ctx.s, ictx->input_buf + 2);
+ screen_set_title(ictx->ctx.s, (const char *)ictx->input_buf + 2);
server_status_window(ictx->wp->window);
}
@@ -1430,7 +1430,7 @@
return;
log_debug("%s: \"%s\"", __func__, ictx->input_buf);
- screen_set_title(ictx->ctx.s, ictx->input_buf);
+ screen_set_title(ictx->ctx.s, (const char *)ictx->input_buf);
server_status_window(ictx->wp->window);
}
@@ -1452,7 +1452,7 @@
log_debug("%s: \"%s\"", __func__, ictx->input_buf);
xfree(ictx->wp->window->name);
- ictx->wp->window->name = xstrdup(ictx->input_buf);
+ ictx->wp->window->name = xstrdup((const char *)ictx->input_buf);
options_set_number(&ictx->wp->window->options, "automatic-rename", 0);
server_status_window(ictx->wp->window);
Index: src/external/bsd/tmux/dist/job.c
diff -u src/external/bsd/tmux/dist/job.c:1.1.1.1 src/external/bsd/tmux/dist/job.c:1.2
--- src/external/bsd/tmux/dist/job.c:1.1.1.1 Thu Mar 10 04:15:38 2011
+++ src/external/bsd/tmux/dist/job.c Fri Mar 11 22:02:59 2011
@@ -1,4 +1,4 @@
-/* $Id: job.c,v 1.1.1.1 2011/03/10 09:15:38 jmmv Exp $ */
+/* $Id: job.c,v 1.2 2011/03/12 03:02:59 christos Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <[email protected]>
@@ -69,7 +69,7 @@
{
struct job job;
- job.cmd = (char *) cmd;
+ job.cmd = __UNCONST(cmd);
return (RB_FIND(jobs, jobs, &job));
}
Index: src/external/bsd/tmux/dist/options.c
diff -u src/external/bsd/tmux/dist/options.c:1.1.1.1 src/external/bsd/tmux/dist/options.c:1.2
--- src/external/bsd/tmux/dist/options.c:1.1.1.1 Thu Mar 10 04:15:38 2011
+++ src/external/bsd/tmux/dist/options.c Fri Mar 11 22:02:59 2011
@@ -1,4 +1,4 @@
-/* $Id: options.c,v 1.1.1.1 2011/03/10 09:15:38 jmmv Exp $ */
+/* $Id: options.c,v 1.2 2011/03/12 03:02:59 christos Exp $ */
/*
* Copyright (c) 2008 Nicholas Marriott <[email protected]>
@@ -65,7 +65,7 @@
{
struct options_entry p;
- p.name = (char *) name;
+ p.name = __UNCONST(name);
return (SPLAY_FIND(options_tree, &oo->tree, &p));
}
@@ -74,7 +74,7 @@
{
struct options_entry *o, p;
- p.name = (char *) name;
+ p.name = __UNCONST(name);
o = SPLAY_FIND(options_tree, &oo->tree, &p);
while (o == NULL) {
oo = oo->parent;
Index: src/external/bsd/tmux/dist/screen-write.c
diff -u src/external/bsd/tmux/dist/screen-write.c:1.1.1.1 src/external/bsd/tmux/dist/screen-write.c:1.2
--- src/external/bsd/tmux/dist/screen-write.c:1.1.1.1 Thu Mar 10 04:15:39 2011
+++ src/external/bsd/tmux/dist/screen-write.c Fri Mar 11 22:02:59 2011
@@ -1,4 +1,4 @@
-/* $Id: screen-write.c,v 1.1.1.1 2011/03/10 09:15:39 jmmv Exp $ */
+/* $Id: screen-write.c,v 1.2 2011/03/12 03:02:59 christos Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <[email protected]>
@@ -97,7 +97,7 @@
va_list ap;
char *msg;
struct utf8_data utf8data;
- u_char *ptr;
+ char *ptr;
size_t left, size = 0;
va_start(ap, fmt);
@@ -106,13 +106,13 @@
ptr = msg;
while (*ptr != '\0') {
- if (utf8flag && *ptr > 0x7f && utf8_open(&utf8data, *ptr)) {
+ if (utf8flag && *ptr & 0x80 && utf8_open(&utf8data, (u_char)*ptr)) {
ptr++;
left = strlen(ptr);
if (left < utf8data.size - 1)
break;
- while (utf8_append(&utf8data, *ptr))
+ while (utf8_append(&utf8data, (u_char)*ptr))
ptr++;
ptr++;
@@ -157,20 +157,20 @@
{
char *msg;
struct utf8_data utf8data;
- u_char *ptr;
+ char *ptr;
size_t left, size = 0;
xvasprintf(&msg, fmt, ap);
ptr = msg;
while (*ptr != '\0') {
- if (utf8flag && *ptr > 0x7f && utf8_open(&utf8data, *ptr)) {
+ if (utf8flag && *ptr & 0x80 && utf8_open(&utf8data, (u_char)*ptr)) {
ptr++;
left = strlen(ptr);
if (left < utf8data.size - 1)
break;
- while (utf8_append(&utf8data, *ptr))
+ while (utf8_append(&utf8data, (u_char)*ptr))
ptr++;
ptr++;
@@ -192,7 +192,7 @@
break;
size++;
- screen_write_putc(ctx, gc, *ptr);
+ screen_write_putc(ctx, gc, (u_char)*ptr);
ptr++;
}
}
@@ -209,7 +209,7 @@
struct utf8_data utf8data;
va_list ap;
char *msg;
- u_char *ptr, *last;
+ char *ptr, *last;
size_t left, size = 0;
va_start(ap, fmt);
@@ -234,13 +234,13 @@
continue;
}
- if (utf8flag && *ptr > 0x7f && utf8_open(&utf8data, *ptr)) {
+ if (utf8flag && *ptr & 0x80 && utf8_open(&utf8data, (u_char)*ptr)) {
ptr++;
left = strlen(ptr);
if (left < utf8data.size - 1)
break;
- while (utf8_append(&utf8data, *ptr))
+ while (utf8_append(&utf8data, (u_char)*ptr))
ptr++;
ptr++;
@@ -262,7 +262,7 @@
break;
size++;
- screen_write_putc(ctx, &lgc, *ptr);
+ screen_write_putc(ctx, &lgc, (u_char)*ptr);
ptr++;
}
}
@@ -388,8 +388,9 @@
}
/* Reinject the UTF-8 sequence. */
gu = &gl->utf8data[xx];
- utf8data.size = grid_utf8_copy(
- gu, utf8data.data, sizeof utf8data.data);
+ utf8data.size = grid_utf8_copy(gu,
+ (char *)utf8data.data,
+ sizeof utf8data.data);
utf8data.width = gu->width;
screen_write_cell(ctx, gc, &utf8data);
}
Index: src/external/bsd/tmux/dist/screen.c
diff -u src/external/bsd/tmux/dist/screen.c:1.1.1.1 src/external/bsd/tmux/dist/screen.c:1.2
--- src/external/bsd/tmux/dist/screen.c:1.1.1.1 Thu Mar 10 04:15:39 2011
+++ src/external/bsd/tmux/dist/screen.c Fri Mar 11 22:02:59 2011
@@ -1,4 +1,4 @@
-/* $Id: screen.c,v 1.1.1.1 2011/03/10 09:15:39 jmmv Exp $ */
+/* $Id: screen.c,v 1.2 2011/03/12 03:02:59 christos Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <[email protected]>
@@ -94,9 +94,10 @@
void
screen_set_title(struct screen *s, const char *title)
{
- char tmp[BUFSIZ];
+ size_t slen = strlen(title);
+ char tmp[slen * 4 + 1];
- strnvis(tmp, title, sizeof tmp, VIS_OCTAL|VIS_TAB|VIS_NL);
+ strvisx(tmp, title, slen, VIS_OCTAL|VIS_TAB|VIS_NL);
xfree(s->title);
s->title = xstrdup(tmp);
Index: src/external/bsd/tmux/dist/server-fn.c
diff -u src/external/bsd/tmux/dist/server-fn.c:1.1.1.1 src/external/bsd/tmux/dist/server-fn.c:1.2
--- src/external/bsd/tmux/dist/server-fn.c:1.1.1.1 Thu Mar 10 04:15:39 2011
+++ src/external/bsd/tmux/dist/server-fn.c Fri Mar 11 22:02:59 2011
@@ -1,4 +1,4 @@
-/* $Id: server-fn.c,v 1.1.1.1 2011/03/10 09:15:39 jmmv Exp $ */
+/* $Id: server-fn.c,v 1.2 2011/03/12 03:02:59 christos Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <[email protected]>
@@ -49,7 +49,7 @@
if (c->flags & CLIENT_BAD)
return;
log_debug("writing %d to client %d", type, c->ibuf.fd);
- imsg_compose(ibuf, type, PROTOCOL_VERSION, -1, -1, (void *) buf, len);
+ imsg_compose(ibuf, type, PROTOCOL_VERSION, -1, -1, __UNCONST(buf), len);
server_update_event(c);
}
Index: src/external/bsd/tmux/dist/session.c
diff -u src/external/bsd/tmux/dist/session.c:1.1.1.1 src/external/bsd/tmux/dist/session.c:1.2
--- src/external/bsd/tmux/dist/session.c:1.1.1.1 Thu Mar 10 04:15:39 2011
+++ src/external/bsd/tmux/dist/session.c Fri Mar 11 22:02:59 2011
@@ -1,4 +1,4 @@
-/* $Id: session.c,v 1.1.1.1 2011/03/10 09:15:39 jmmv Exp $ */
+/* $Id: session.c,v 1.2 2011/03/12 03:02:59 christos Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <[email protected]>
@@ -65,7 +65,7 @@
{
struct session s;
- s.name = (char *) name;
+ s.name = __UNCONST(name);
return (RB_FIND(sessions, &sessions, &s));
}
Index: src/external/bsd/tmux/dist/tty-acs.c
diff -u src/external/bsd/tmux/dist/tty-acs.c:1.1.1.1 src/external/bsd/tmux/dist/tty-acs.c:1.2
--- src/external/bsd/tmux/dist/tty-acs.c:1.1.1.1 Thu Mar 10 04:15:39 2011
+++ src/external/bsd/tmux/dist/tty-acs.c Fri Mar 11 22:02:59 2011
@@ -1,4 +1,4 @@
-/* $Id: tty-acs.c,v 1.1.1.1 2011/03/10 09:15:39 jmmv Exp $ */
+/* $Id: tty-acs.c,v 1.2 2011/03/12 03:02:59 christos Exp $ */
/*
* Copyright (c) 2010 Nicholas Marriott <[email protected]>
@@ -70,7 +70,7 @@
const struct tty_acs_entry *entry = value;
u_char ch;
- ch = *(u_char *) key;
+ ch = *(const u_char *) key;
return (ch - entry->key);
}
Index: src/external/bsd/tmux/dist/tty-keys.c
diff -u src/external/bsd/tmux/dist/tty-keys.c:1.1.1.1 src/external/bsd/tmux/dist/tty-keys.c:1.2
--- src/external/bsd/tmux/dist/tty-keys.c:1.1.1.1 Thu Mar 10 04:15:39 2011
+++ src/external/bsd/tmux/dist/tty-keys.c Fri Mar 11 22:02:59 2011
@@ -1,4 +1,4 @@
-/* $Id: tty-keys.c,v 1.1.1.1 2011/03/10 09:15:39 jmmv Exp $ */
+/* $Id: tty-keys.c,v 1.2 2011/03/12 03:02:59 christos Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <[email protected]>
@@ -434,7 +434,7 @@
struct tty_key *tk;
struct timeval tv;
struct mouse_event mouse;
- const char *buf;
+ const u_char *buf;
size_t len, size;
cc_t bspace;
int key, delay;
@@ -447,7 +447,7 @@
/* If a normal key, return it. */
if (*buf != '\033') {
- key = (u_char) *buf;
+ key = *buf;
evbuffer_drain(tty->event->input, 1);
/*
@@ -462,7 +462,7 @@
}
/* Is this a mouse key press? */
- switch (tty_keys_mouse(buf, len, &size, &mouse)) {
+ switch (tty_keys_mouse((const char *)buf, len, &size, &mouse)) {
case 0: /* yes */
evbuffer_drain(tty->event->input, size);
key = KEYC_MOUSE;
@@ -474,7 +474,7 @@
}
/* Try to parse a key with an xterm-style modifier. */
- switch (xterm_keys_find(buf, len, &size, &key)) {
+ switch (xterm_keys_find((const char *)buf, len, &size, &key)) {
case 0: /* found */
evbuffer_drain(tty->event->input, size);
goto handle_key;
@@ -485,7 +485,7 @@
}
/* Look for matching key string and return if found. */
- tk = tty_keys_find(tty, buf + 1, len - 1, &size);
+ tk = tty_keys_find(tty, (const char *)buf + 1, len - 1, &size);
if (tk != NULL) {
key = tk->key;
goto found_key;
@@ -504,7 +504,7 @@
/* Or a key string? */
if (len > 1) {
- tk = tty_keys_find(tty, buf + 1, len - 1, &size);
+ tk = tty_keys_find(tty, (const char *)buf + 1, len - 1, &size);
if (tk != NULL) {
key = tk->key | KEYC_ESCAPE;
size++; /* include escape */
Index: src/external/bsd/tmux/dist/tty-term.c
diff -u src/external/bsd/tmux/dist/tty-term.c:1.1.1.1 src/external/bsd/tmux/dist/tty-term.c:1.2
--- src/external/bsd/tmux/dist/tty-term.c:1.1.1.1 Thu Mar 10 04:15:40 2011
+++ src/external/bsd/tmux/dist/tty-term.c Fri Mar 11 22:02:59 2011
@@ -1,4 +1,4 @@
-/* $Id: tty-term.c,v 1.1.1.1 2011/03/10 09:15:40 jmmv Exp $ */
+/* $Id: tty-term.c,v 1.2 2011/03/12 03:02:59 christos Exp $ */
/*
* Copyright (c) 2008 Nicholas Marriott <[email protected]>
@@ -353,21 +353,21 @@
case TTYCODE_NONE:
break;
case TTYCODE_STRING:
- s = tigetstr((char *) ent->name);
+ s = tigetstr(ent->name);
if (s == NULL || s == (char *) -1)
break;
code->type = TTYCODE_STRING;
code->value.string = tty_term_strip(s);
break;
case TTYCODE_NUMBER:
- n = tigetnum((char *) ent->name);
+ n = tigetnum(ent->name);
if (n == -1 || n == -2)
break;
code->type = TTYCODE_NUMBER;
code->value.number = n;
break;
case TTYCODE_FLAG:
- n = tigetflag((char *) ent->name);
+ n = tigetflag(ent->name);
if (n == -1)
break;
code->type = TTYCODE_FLAG;
@@ -471,13 +471,13 @@
const char *
tty_term_string1(struct tty_term *term, enum tty_code_code code, int a)
{
- return (tparm((char *) tty_term_string(term, code), a, 0, 0, 0, 0, 0, 0, 0, 0));
+ return (tparm(tty_term_string(term, code), a, 0, 0, 0, 0, 0, 0, 0, 0));
}
const char *
tty_term_string2(struct tty_term *term, enum tty_code_code code, int a, int b)
{
- return (tparm((char *) tty_term_string(term, code), a, b, 0, 0, 0, 0, 0, 0, 0));
+ return (tparm(tty_term_string(term, code), a, b, 0, 0, 0, 0, 0, 0, 0));
}
int
Index: src/external/bsd/tmux/dist/window.c
diff -u src/external/bsd/tmux/dist/window.c:1.1.1.1 src/external/bsd/tmux/dist/window.c:1.2
--- src/external/bsd/tmux/dist/window.c:1.1.1.1 Thu Mar 10 04:15:40 2011
+++ src/external/bsd/tmux/dist/window.c Fri Mar 11 22:02:59 2011
@@ -1,4 +1,4 @@
-/* $Id: window.c,v 1.1.1.1 2011/03/10 09:15:40 jmmv Exp $ */
+/* $Id: window.c,v 1.2 2011/03/12 03:02:59 christos Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <[email protected]>
@@ -629,7 +629,7 @@
new_size = EVBUFFER_LENGTH(wp->event->input) - wp->pipe_off;
if (wp->pipe_fd != -1 && new_size > 0) {
- new_data = EVBUFFER_DATA(wp->event->input);
+ new_data = (char *)EVBUFFER_DATA(wp->event->input);
bufferevent_write(wp->pipe_event, new_data, new_size);
}
Index: src/external/bsd/tmux/usr.bin/tmux/Makefile
diff -u src/external/bsd/tmux/usr.bin/tmux/Makefile:1.1 src/external/bsd/tmux/usr.bin/tmux/Makefile:1.2
--- src/external/bsd/tmux/usr.bin/tmux/Makefile:1.1 Thu Mar 10 04:18:01 2011
+++ src/external/bsd/tmux/usr.bin/tmux/Makefile Fri Mar 11 22:02:59 2011
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2011/03/10 09:18:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2011/03/12 03:02:59 christos Exp $
.include <bsd.own.mk>
+WARNS?= 4
SRCDIR= ${NETBSDSRCDIR}/external/bsd/tmux/dist
.PATH: ${SRCDIR}
@@ -147,8 +148,8 @@
SRCS+= imsg-buffer.c
SRCS+= imsg.c
SRCS+= strtonum.c
-SRCS+= unvis.c
-SRCS+= vis.c
+#SRCS+= unvis.c
+#SRCS+= vis.c
VERSION!= cat "$(.CURDIR)/version.txt"
CPPFLAGS+= -DBUILD="\"$(VERSION)\""
Index: src/external/bsd/tmux/usr.bin/tmux/config.h
diff -u src/external/bsd/tmux/usr.bin/tmux/config.h:1.1 src/external/bsd/tmux/usr.bin/tmux/config.h:1.2
--- src/external/bsd/tmux/usr.bin/tmux/config.h:1.1 Thu Mar 10 04:18:01 2011
+++ src/external/bsd/tmux/usr.bin/tmux/config.h Fri Mar 11 22:02:59 2011
@@ -29,7 +29,7 @@
#undef HAVE_TREE_H
#undef HAVE_UTIL_H
#undef HAVE_U_INT
-#undef HAVE_VIS
+#define HAVE_VIS
#define HAVE_ASPRINTF
#define HAVE_BZERO
#define HAVE_CLOSEFROM
