The branch, master has been updated
via 16670410ca24e43eff88824aacb988432afc8691 (commit)
via 054a825ee24e2a2ea294ea2a259af7eeb8ae947e (commit)
via b2224947fa697c397b5d3617b6b17e96c4302e6c (commit)
from 4d53fd98a67b20527718013ef52f263bf878481c (commit)
- Log -----------------------------------------------------------------
commit 16670410ca24e43eff88824aacb988432afc8691
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Commit: Nicholas Marriott <nicholas.marri...@gmail.com>
I broke last change, fix so it works, from J Raynor.
---
compat/forkpty-aix.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/compat/forkpty-aix.c b/compat/forkpty-aix.c
index 78e5f7e..7638c52 100644
--- a/compat/forkpty-aix.c
+++ b/compat/forkpty-aix.c
@@ -30,7 +30,7 @@
pid_t
forkpty(int *master, unused char *name, struct termios *tio, struct winsize
*ws)
{
- int slave, fd, pipe_fd[2];
+ int slave = -1, fd, pipe_fd[2];
char *path, dummy;
pid_t pid;
@@ -38,7 +38,7 @@ forkpty(int *master, unused char *name, struct termios *tio,
struct winsize *ws)
return (-1);
if ((*master = open("/dev/ptc", O_RDWR|O_NOCTTY)) == -1)
- return (-1);
+ goto out;
if ((path = ttyname(*master)) == NULL)
goto out;
@@ -95,19 +95,19 @@ forkpty(int *master, unused char *name, struct termios
*tio, struct winsize *ws)
return (0);
}
- close(pipe_fd[0]);
- close(pipe_fd[1]);
-
close(slave);
- return (pid);
-out:
close(pipe_fd[0]);
close(pipe_fd[1]);
+ return (pid);
+out:
if (*master != -1)
close(*master);
if (slave != -1)
close(slave);
+
+ close(pipe_fd[0]);
+ close(pipe_fd[1]);
return (-1);
}
commit 054a825ee24e2a2ea294ea2a259af7eeb8ae947e
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Commit: Nicholas Marriott <nicholas.marri...@gmail.com>
cdefs.h -> types.h.
---
compat/fparseln.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/compat/fparseln.c b/compat/fparseln.c
index f10fbd5..348bfa1 100644
--- a/compat/fparseln.c
+++ b/compat/fparseln.c
@@ -32,7 +32,7 @@
/* OPENBSD ORIGINAL: lib/libutil/fparseln.c */
-#include <sys/cdefs.h>
+#include <sys/types.h>
#include <stdio.h>
#include <string.h>
commit b2224947fa697c397b5d3617b6b17e96c4302e6c
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Commit: Nicholas Marriott <nicholas.marri...@gmail.com>
Solaris doesn't have flock and fcntl is useless so make a no-op flock.
Reported
by Dagobert Michelsen.
---
compat.h | 7 +++++++
configure.ac | 1 +
2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/compat.h b/compat.h
index bf6e536..2e433a0 100644
--- a/compat.h
+++ b/compat.h
@@ -176,6 +176,13 @@ typedef uint64_t u_int64_t;
#define TTY_NAME_MAX 32
#endif
+#ifndef HAVE_FLOCK
+#define LOCK_SH 0
+#define LOCK_EX 0
+#define LOCK_NB 0
+#define flock(fd, op) (0)
+#endif
+
#ifndef HAVE_BZERO
#undef bzero
#define bzero(buf, len) memset(buf, 0, len);
diff --git a/configure.ac b/configure.ac
index b524ff8..fc71f02 100644
--- a/configure.ac
+++ b/configure.ac
@@ -386,6 +386,7 @@ AC_CHECK_FUNCS(
[ \
bzero \
dirfd \
+ flock \
setproctitle \
sysconf \
cfmakeraw \
-----------------------------------------------------------------------
Summary of changes:
compat.h | 7 +++++++
compat/forkpty-aix.c | 14 +++++++-------
compat/fparseln.c | 2 +-
configure.ac | 1 +
4 files changed, 16 insertions(+), 8 deletions(-)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer
Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports
Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper
Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer
http://pubads.g.doubleclick.net/gampad/clk?id=154622311&iu=/4140/ostg.clktrk
_______________________________________________
tmux-cvs mailing list
tmux-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
