da1f6fc2c8
Merge branch 'obsd-master'
...
Conflicts:
Makefile
client.c
server-client.c
server.c
tmux.c
tmux.h
2015-10-27 23:27:26 +00:00
44657bf932
Move struct options into options.c.
2015-10-27 15:58:42 +00:00
07b0ea03c3
Break the common process set up, event loop and imsg dispatch code
...
between server and client out into a separate internal API. This will
make it easier to add another process.
2015-10-27 13:23:24 +00:00
bbdc08780c
Merge branch 'obsd-master'
2015-10-18 22:01:08 +01:00
174a2ad731
Pass current directory as a string rather than a file descriptor because
...
pledge doesn't let us pass directory file descriptors.
2015-10-18 20:42:42 +00:00
6c3ade76df
__OpenBSD__ around pledge().
2015-10-17 20:16:12 +01:00
487285b325
Merge branch 'obsd-master'
2015-10-17 20:01:08 +01:00
9c601ebde8
Add pledge "stdio unix sendfd proc exec tty" to tmux client process,
...
"sendfd" is dropped after first message from the server.
2015-10-17 18:30:43 +00:00
f69e09a67e
Merge branch 'obsd-master'
2015-10-11 02:01:14 +01:00
241fd72f75
Userspace doesn't need to use SUN_LEN(): connect() and bind() must accept
...
sizeof(struct sockaddr_un), so do the simple, portable thing
ok beck@ deraadt@
2015-10-11 00:26:23 +00:00
b0372840e7
Merge branch 'obsd-master'
2015-09-24 14:01:10 +01:00
2a62917444
Don't leak fd and path on failure.
2015-09-24 12:06:20 +00:00
5af2f68a2c
Merge branch 'obsd-master'
2015-09-09 14:01:08 +01:00
67ee995cc1
No need to keep global options around for client which doesn't use them.
2015-09-09 12:09:21 +00:00
76688d2040
Merge branch 'obsd-master'
...
Conflicts:
cfg.c
tmux.c
2015-09-06 20:47:50 +01:00
c6e9160c67
Login shell can be a client flag, and move the exec code into client.c.
2015-08-30 22:40:25 +00:00
dd92b6e83d
Event base does not need to be global.
2015-08-30 22:19:07 +00:00
dcc28434f4
Merge branch 'obsd-master'
2015-07-13 20:01:08 +01:00
4e637b1b61
Ignore environment variables that are too long to send to the server.
2015-07-13 18:10:26 +00:00
37005d04a9
Merge branch 'obsd-master'
2015-06-14 12:01:10 +01:00
29c29e7717
Add a format for client PID (client_pid) and server PID (pid). Diff for
...
client_pid from Thomas Adam.
2015-06-14 10:07:44 +00:00
7acc4addb5
Merge branch 'obsd-master'
...
Conflicts:
client.c
tmux.1
tmux.c
2015-06-07 23:42:25 +01:00
6b2129696f
Move the nested check from client to server and compare the client tty
...
name to all the pane pty names instead of comparing socket paths. This
means that "new -d" will work without unsetting $TMUX.
2015-06-04 23:27:51 +00:00
56e1132db4
Merge branch 'obsd-master'
2015-04-25 10:02:46 +00:00
a5a873dccc
Set up signal handler earlier so that we don't get zombies, reported by
...
sobrado@.
2015-04-24 20:58:44 +00:00
0a88377086
Merge branch 'obsd-master'
2015-04-22 10:05:54 +01:00
7a72eff4a4
Simplify error messages when socket connect fails, suggested by "Karthik K".
2015-04-21 22:21:41 +00:00
370cf75458
Merge branch 'obsd-master'
2015-04-19 14:44:56 +01:00
02df86079b
Fix some format specifier nits, from Ben Boeckel.
2015-03-31 17:45:10 +00:00
747cab4281
No need for $Id$ now.
2014-11-08 12:27:43 +00:00
562af864bd
Merge branch 'obsd-master'
...
Conflicts:
Makefile
cmd-list-commands.c
cmd-suspend-client.c
job.c
tmux.h
xmalloc.c
2014-10-21 07:11:44 +01:00
900f6fc17e
Tidy up some includes.
2014-10-20 23:27:14 +00:00
045d0c3b9f
Call waitpid on SIGCHLD even if client not attached, it is possible (on
...
very slow platforms) for the first daemon() child to still be running
when client_attached is set so we end up with a zombie. From J Raynor.
2014-10-01 23:23:19 +00:00
2874a431c0
Merge branch 'obsd-master'
2014-09-25 11:29:54 +01:00
4e956d545a
Various minor style and spacing nits.
2014-09-01 21:50:18 +00:00
a131b82e95
Merge branch 'obsd-master'
...
Conflicts:
client.c
2014-08-09 20:31:36 +01:00
8e4ae12b4d
lockf is entirely useless and it was a mistake to change to it, go back
...
to using flock which actually works sensibly. Also always retry the lock
to fix a potential race, and add some extra logging.
2014-07-21 10:52:48 +00:00
2b67907176
An EOF is a good reason to close a connection.
...
ok nicm@
2014-07-13 20:51:08 +00:00
ea5a223a2e
Merge branch 'obsd-master'
2014-04-30 00:05:58 +01:00
5b2c8156d5
fcntl.h is still needed here.
2014-04-29 22:31:22 +00:00
953c3ef47a
Merge branch 'obsd-master'
...
Conflicts:
Makefile
tmux.1
window.c
2014-04-23 11:26:11 +01:00
bce952777a
Remove some unnecessary includes and fix a typo.
2014-04-17 11:38:35 +00:00
d02c4bda3a
Merge branch 'obsd-master'
2014-01-20 10:48:12 +00:00
b185449d07
Fix a memory/fd leak reported by Tiago Cunha.
2014-01-09 21:20:45 +00:00
adc1f21eae
Three small changes from Tiago Cunha:
...
- Check for truncation when copying path.
- Don't need to use a temporary buffer in screen_set_title.
- Include strerror in output when connecting to server fails.
2014-01-09 14:05:55 +00:00
3e498cdb49
Merge branch 'obsd-master'
2013-11-14 07:51:26 +00:00
7624800ddc
from nicm: : handle msgbuf_write() returning EAGAIN
2013-11-13 20:43:36 +00:00
99e3cbc526
Use format_get_command() and some spacing tweaks.
2013-10-10 12:35:30 +00:00
c1ccefc62d
We accidentally haven't been using $TMUX to work out the session for a
...
while and in fact it is less useful that using the client ttyname. So
don't bother and don't pass it from the client. If we need it in future
it is in c->environ.
2013-10-10 12:29:35 +00:00
7936ce3874
Show session name in detached message. Requested by somebody a few
...
months ago who didn't bother testing it. But it works for me anyway.
2013-10-10 12:28:08 +00:00
