42 lines
1.3 KiB
Diff
42 lines
1.3 KiB
Diff
|
Index: tmux-1.6/compat.h
|
||
|
|
===================================================================
|
||
|
|
--- tmux-1.6.orig/compat.h
|
||
|
|
+++ tmux-1.6/compat.h
|
||
|
|
@@ -198,7 +198,9 @@ int daemon(int, int);
|
||
|
|
|
||
|
|
#ifndef HAVE_B64_NTOP
|
||
|
|
/* b64_ntop.c */
|
||
|
|
-int b64_ntop(const char *, size_t, char *, size_t);
|
||
|
|
+int local_b64_ntop(const char *, size_t, char *, size_t);
|
||
|
|
+#else
|
||
|
|
+#define local_b64_ntop b64_ntop
|
||
|
|
#endif
|
||
|
|
|
||
|
|
#ifndef HAVE_FORKPTY
|
||
|
|
Index: tmux-1.6/compat/b64_ntop.c
|
||
|
|
===================================================================
|
||
|
|
--- tmux-1.6.orig/compat/b64_ntop.c
|
||
|
|
+++ tmux-1.6/compat/b64_ntop.c
|
||
|
|
@@ -122,7 +122,7 @@ static const char Pad64 = '=';
|
||
|
|
*/
|
||
|
|
|
||
|
|
int
|
||
|
|
-b64_ntop(uint8_t const *src, size_t srclength, char *target, size_t targsize) {
|
||
|
|
+local_b64_ntop(uint8_t const *src, size_t srclength, char *target, size_t targsize) {
|
||
|
|
size_t datalength = 0;
|
||
|
|
uint8_t input[3];
|
||
|
|
uint8_t output[4];
|
||
|
|
Index: tmux-1.6/tty.c
|
||
|
|
===================================================================
|
||
|
|
--- tmux-1.6.orig/tty.c
|
||
|
|
+++ tmux-1.6/tty.c
|
||
|
|
@@ -1006,7 +1006,7 @@ tty_cmd_setselection(struct tty *tty, co
|
||
|
|
off = 4 * ((ctx->num + 2) / 3) + 1; /* storage for base64 */
|
||
|
|
buf = xmalloc(off);
|
||
|
|
|
||
|
|
- b64_ntop(ctx->ptr, ctx->num, buf, off);
|
||
|
|
+ local_b64_ntop(ctx->ptr, ctx->num, buf, off);
|
||
|
|
tty_putcode_ptr2(tty, TTYC_MS, "", buf);
|
||
|
|
|
||
|
|
xfree(buf);
|