The branch, master has been updated
via 792e2856c9774cca262929f81b9adbbac0fa1d13 (commit)
via a46ccbd883495d2acb3eab89e5bcdb61c0c7e195 (commit)
from c24b58e2ee8691870736959deb252c225b205b4d (commit)
- Log -----------------------------------------------------------------
commit 792e2856c9774cca262929f81b9adbbac0fa1d13
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Commit: Nicholas Marriott <nicholas.marri...@gmail.com>
Add compat for cfmakeraw, from Dagobert Michelsen.
---
Makefile.am | 3 +++
compat.h | 5 +++++
compat/cfmakeraw.c | 32 ++++++++++++++++++++++++++++++++
configure.ac | 8 ++++++++
4 files changed, 48 insertions(+), 0 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index b85eae0..c5369fd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -233,6 +233,9 @@ endif
if NO_B64_NTOP
nodist_tmux_SOURCES += compat/b64_ntop.c
endif
+if NO_CFMAKERAW
+nodist_tmux_SOURCES += compat/cfmakeraw.c
+endif
# Build tmux.1 in the right format.
tmux.1: tmux.1.in
diff --git a/compat.h b/compat.h
index 622006e..d397379 100644
--- a/compat.h
+++ b/compat.h
@@ -236,6 +236,11 @@ int setenv(const char *, const char *,
int);
int unsetenv(const char *);
#endif
+#ifndef HAVE_CFMAKERAW
+/* cfmakeraw.c */
+void cfmakeraw(struct termios *tio);
+#endif
+
#ifdef HAVE_GETOPT
#include <getopt.h>
#else
diff --git a/compat/cfmakeraw.c b/compat/cfmakeraw.c
new file mode 100644
index 0000000..3f8dc7e
--- /dev/null
+++ b/compat/cfmakeraw.c
@@ -0,0 +1,32 @@
+/* $Id$ */
+
+/*
+ * Copyright (c) 2013 Dagobert Michelsen
+ * Copyright (c) 2013 Nicholas Marriott <n...@users.sourceforge.net>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
+ * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <string.h>
+
+#include "tmux.h"
+
+void
+cfmakeraw(struct termios *tio)
+{
+ tio->c_iflag &= ~(IGNBRK|BRKINT|PARMRK|ISTRIP|INLCR|IGNCR|ICRNL|IXON);
+ tio->c_oflag &= ~OPOST;
+ tio->c_lflag &= ~(ECHO|ECHONL|ICANON|ISIG|IEXTEN);
+ tio->c_cflag &= ~(CSIZE|PARENB);
+ tio->c_cflag |= CS8;
+}
diff --git a/configure.ac b/configure.ac
index b4f76f5..80cf126 100644
--- a/configure.ac
+++ b/configure.ac
@@ -313,6 +313,13 @@ if test "x$found_strnvis" = xyes; then
fi
AM_CONDITIONAL(NO_VIS, [test "x$found_strnvis" = xno])
+# Look for cfmakeraw, compat/cfmakeraw.c used if missing.
+AC_CHECK_FUNC(cfmakeraw, found_cfmakeraw=yes, found_cfmakeraw=no)
+if test "x$found_cfmakeraw" = xyes; then
+ AC_DEFINE(HAVE_CFMAKERAW)
+fi
+AM_CONDITIONAL(NO_CFMAKERAW, [test "x$found_cfmakeraw" = xno])
+
# Look for getopt. glibc's getopt does not enforce argument order and the ways
# of making it do so are stupid, so just use our own instead.
AC_CHECK_FUNC(getopt, found_getopt=yes, found_getopt=no)
@@ -345,6 +352,7 @@ AC_CHECK_FUNCS(
dirfd \
setproctitle \
sysconf \
+ cfmakeraw \
]
)
commit a46ccbd883495d2acb3eab89e5bcdb61c0c7e195
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Commit: Nicholas Marriott <nicholas.marri...@gmail.com>
-paths.h. Fixes Solaris, from Dagobert Michelsen.
---
tmux.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/tmux.c b/tmux.c
index e6de5cf..2916bbb 100644
--- a/tmux.c
+++ b/tmux.c
@@ -23,7 +23,6 @@
#include <event.h>
#include <fcntl.h>
#include <locale.h>
-#include <paths.h>
#include <pwd.h>
#include <stdlib.h>
#include <string.h>
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 3 +++
compat.h | 5 +++++
osdep-unknown.c => compat/cfmakeraw.c | 29 ++++++++++-------------------
configure.ac | 8 ++++++++
tmux.c | 1 -
5 files changed, 26 insertions(+), 20 deletions(-)
copy osdep-unknown.c => compat/cfmakeraw.c (68%)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
Precog is a next-generation analytics platform capable of advanced
analytics on semi-structured data. The platform includes APIs for building
apps and a phenomenal toolset for data science. Developers can use
our toolset for easy data analysis & visualization. Get a free account!
http://www2.precog.com/precogplatform/slashdotnewsletter
_______________________________________________
tmux-cvs mailing list
tmux-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
