Thomas Adam
52e3d960e7
Merge branch 'obsd-master'
2020-04-09 16:01:45 +01:00
nicm
b96ac80901
Some unnecessary assignments and unused variables.
2020-04-09 13:52:31 +00:00
Thomas Adam
588865152a
Merge branch 'obsd-master'
2020-03-30 18:01:28 +01:00
nicm
34de379c7d
Add to rather than replace flags with -c.
2020-03-30 15:49:23 +00:00
Thomas Adam
1a2e66f345
Merge branch 'obsd-master'
2020-03-12 10:01:25 +00:00
nicm
2a5702a936
When the server socket is given by the user with -S, create it with
...
umask 177 instead of 117 because it may not be in a safe directory like
the default directory in /tmp. The user can chmod it more open after it
is created if they want.
2020-03-12 09:26:34 +00:00
Thomas Adam
32be954bdd
Merge branch 'obsd-master'
2020-01-29 18:01:24 +00:00
nicm
44dad918f8
Warn if a message type that is no longer used is received.
2020-01-29 16:22:32 +00:00
Thomas Adam
52b6ca5706
Merge branch 'obsd-master'
2019-12-16 18:01:31 +00:00
nicm
b4520aaf2c
Need to include message size in the maximum buffer calculation.
2019-12-16 16:09:28 +00:00
nicm
eaa58d28dc
Instead of using large buffers in imsgs, add the data or path onto the end.
2019-12-16 15:48:50 +00:00
Thomas Adam
e24e9867ec
Merge branch 'obsd-master'
2019-12-13 08:01:24 +00:00
nicm
6ce943f4d9
Need to check in the error callback also.
2019-12-13 07:00:22 +00:00
nicm
828001ecc5
Do not spin waiting for exit, instead check in the write callback.
2019-12-13 06:55:12 +00:00
Thomas Adam
7922f4ee7b
Merge branch 'obsd-master'
2019-12-12 14:33:47 +00:00
nicm
c284ebe0ad
Rewrite the code for reading and writing files. Now, if the client is
...
not attached, the server process asks it to open the file, similar to
how works for stdin, stdout, stderr. This makes special files like
/dev/fd/X work (used by some shells). stdin, stdout and stderr and
control mode are now just special cases of the same mechanism. This will
also make it easier to use for other commands that read files such as
source-file.
2019-12-12 11:39:56 +00:00
Thomas Adam
b90a9fcd13
Merge branch 'obsd-master'
2019-07-26 23:02:27 +01:00
nicm
8f40f791d9
Change "lost server" message to "server exited unexpectedly", from Neal
...
McBurnett in GitHub issue 1857.
2019-07-26 20:08:40 +00:00
Thomas Adam
68c2fc6824
Merge branch 'obsd-master'
2019-06-28 17:02:26 +01:00
deraadt
4ff7bc3eb3
When system calls indicate an error they return -1, not some arbitrary
...
value < 0. errno is only updated in this case. Change all (most?)
callers of syscalls to follow this better, and let's see if this strictness
helps us in the future.
2019-06-28 13:35:05 +00:00
Thomas Adam
463bd8abb9
Merge branch 'obsd-master'
2019-05-25 18:41:51 +01:00
nicm
f8d3d247d8
Merge cmd_list_parse into cmd-parse.y so it can use the new alias
...
processing code.
2019-05-25 07:18:20 +00:00
Thomas Adam
2977317243
Merge branch 'obsd-master'
2018-11-22 12:02:38 +00:00
nicm
3a7b9d5735
Do not use PWD unless it actually matches the real working directory.
2018-11-22 10:36:40 +00:00
Thomas Adam
91280f1fca
Linux: include sys/file.h for flock()
2018-06-07 09:17:05 +01:00
Thomas Adam
645fe9013f
Merge branch 'obsd-master'
2018-04-26 17:02:31 +01:00
guenther
896c1da7da
Use <fcntl.h> instead of <sys/file.h> for open() and friends.
...
Delete a bunch of unnecessary #includes and sort to match style(9)
while doing the above cleanup.
ok deraadt@ krw@
2018-04-26 12:42:51 +00:00
Thomas Adam
06684c93de
Merge branch 'obsd-master'
2018-01-01 12:01:13 +00:00
nicm
d17c90583a
Prefer PWD for current directory if present in client, from Wei Zhao in
...
GitHub issue 1183.
2018-01-01 11:19:08 +00:00
Thomas Adam
74ecc866cf
Merge branch 'obsd-master'
2017-12-19 16:01:20 +00:00
nicm
b20a00f93e
Report better error from server when socket create fails, GitHub issue
...
1201.
2017-12-19 15:00:39 +00:00
Thomas Adam
641a885af8
Merge branch 'obsd-master'
2017-12-19 00:01:18 +00:00
nicm
62144b9f57
Do not try to put more in command message than will fit when sending
...
(the server will treat as a fatal error). GitHub issue 1200.
2017-12-18 22:13:36 +00:00
Thomas Adam
acbbc93501
Merge branch 'obsd-master'
2017-07-14 22:01:10 +01:00
nicm
932f6cfbfc
Because ignore SIGCHLD early, letting signal_del restore it doesn't work
...
correctly, so set it explicitly back to default (and the others for good
measure).
2017-07-14 18:49:07 +00:00
Thomas Adam
1076a2e26c
Merge branch 'obsd-master'
...
Conflicts:
cmd-pipe-pane.c
proc.c
tmux.c
window.c
2017-07-12 13:43:08 +01:00
nicm
0453ad0146
Move signal code into proc.c.
2017-07-12 09:24:17 +00:00
nicm
ed3cfaafb2
Make shell_command a global like other stuff rather than making it an
...
exception and using callback argument.
2017-07-12 09:21:25 +00:00
Thomas Adam
418ab1a553
Merge branch 'obsd-master'
2017-01-24 22:01:13 +00:00
nicm
85338bb75f
Add support for custom command aliases, this is an array option which
...
contains items of the form "alias=command". This is consulted when an
unknown command is parsed.
2017-01-24 19:53:37 +00:00
Nicholas Marriott
a3d5bfcece
Define away pledge() on !OpenBSD.
2017-01-23 12:27:58 +00:00
Thomas Adam
b3a724f30c
Merge branch 'obsd-master'
...
Conflicts:
Makefile
tmux.c
2017-01-23 12:20:43 +00:00
nicm
98e7fbb2ac
Open /dev/ptm before pledge() and save it to be used for PTMGET later
...
(this means inlining forkpty()).
ok deraadt
2017-01-23 10:09:43 +00:00
Thomas Adam
c17b0a202a
Merge branch 'obsd-master'
2017-01-20 16:01:11 +00:00
nicm
46572ba904
Print error rather than fatal() if tcgetattr() fails, which is much more
...
useful to user.
2017-01-20 14:02:33 +00:00
nicm
ef15b4195f
Revert WIP parts of previous I didn't mean to commit yet.
2017-01-16 14:52:25 +00:00
nicm
68db958477
getopt() has a struct option so just return to using options_entry.
2017-01-16 14:49:14 +00:00
Thomas Adam
2311bbd28a
Merge branch 'obsd-master'
2017-01-13 12:01:12 +00:00
nicm
95950bf668
Add -E to detach-client to exec a command to replace the client instead
...
of exiting it, useful if tmux wasn't exec'd itself. From Jenna Magius.
2017-01-13 10:12:12 +00:00
Thomas Adam
4740ecbeae
Merge branch 'obsd-master'
2016-10-04 02:01:11 +01:00
