The branch, master has been updated
via 931c17ed4f3ac18470f5b385210d61b24a57b5d4 (commit)
via 24d9dc518de6761f645165d49f321b2b56904fb5 (commit)
from 2874a431c050527244a56e7f241baf053c722f88 (commit)
- Log -----------------------------------------------------------------
commit 931c17ed4f3ac18470f5b385210d61b24a57b5d4
Merge: 24d9dc5 2874a43
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Commit: Nicholas Marriott <nicholas.marri...@gmail.com>
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
client.c | 4 ++--
cmd-list.c | 2 +-
cmd-load-buffer.c | 2 +-
cmd-new-window.c | 2 +-
cmd-queue.c | 6 +++---
cmd-select-pane.c | 34 +++++++++++++++++++++++-----------
cmd-set-option.c | 4 ++--
cmd-split-window.c | 2 +-
cmd-wait-for.c | 26 ++++++++++++++++++++++++--
format.c | 5 ++++-
grid.c | 12 +++++-------
mode-key.c | 1 +
paste.c | 7 +++++--
screen.c | 23 ++++++++++++++++++-----
server-client.c | 2 +-
server.c | 18 +++++++++++++++++-
tmux.1 | 21 +++++++++++++++++----
tmux.h | 7 ++++++-
window-copy.c | 7 ++++---
window.c | 7 ++++---
20 files changed, 140 insertions(+), 52 deletions(-)
commit 24d9dc518de6761f645165d49f321b2b56904fb5
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Commit: Nicholas Marriott <nicholas.marri...@gmail.com>
Fix osdep_get_cwd on Solaris 11, from J Raynor.
---
osdep-sunos.c | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/osdep-sunos.c b/osdep-sunos.c
index fd644f5..d071694 100644
--- a/osdep-sunos.c
+++ b/osdep-sunos.c
@@ -69,10 +69,19 @@ osdep_get_cwd(int fd)
{
static char target[MAXPATHLEN + 1];
char *path;
+ const char *ttypath;
ssize_t n;
pid_t pgrp;
+ int retval, ttyfd;
- if ((pgrp = tcgetpgrp(fd)) == -1)
+ if ((ttypath = ptsname(fd)) == NULL)
+ return (NULL);
+ if ((ttyfd = open(ttypath, O_RDONLY|O_NOCTTY)) == -1)
+ return (NULL);
+
+ retval = ioctl(ttyfd, TIOCGPGRP, &pgrp);
+ close(ttyfd);
+ if (retval == -1)
return (NULL);
xasprintf(&path, "/proc/%u/path/cwd", (u_int) pgrp);
-----------------------------------------------------------------------
Summary of changes:
osdep-sunos.c | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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
