93062ad099
Fix after merge
2017-04-21 09:29:22 +01:00
22e594fcea
Merge branch 'obsd-master'
...
Conflicts:
Makefile.am
pty.c
2017-04-21 09:25:07 +01:00
b723f50e65
Do not need getopt.h for getopt, from Eric N Vander Weele.
2017-04-20 20:35:11 +01:00
87997efe8d
Use fdforkpty() instead of our own unwrapped versions.
2017-04-20 17:49:26 +00:00
5a551ac57f
Merge branch 'obsd-master'
2017-04-19 16:01:14 +01:00
689f4bfac2
Style nits and a missing cast.
2017-04-19 12:44:29 +00:00
d912687be7
Merge branch 'obsd-master'
2017-04-16 22:01:19 +01:00
d566c780e5
Memory leak, from David CARLIER.
2017-04-16 20:33:46 +00:00
02ddd4ce70
Merge branch 'obsd-master'
2017-03-21 20:01:16 +00:00
04e17a7e11
Use uid_t for UID not u_int.
2017-03-21 19:28:03 +00:00
514a723f74
Solaris fixes, mostly from Dagobert Michelsen.
2017-03-09 15:39:13 +00:00
f734d81074
Merge branch 'obsd-master'
2017-02-16 12:01:21 +00:00
8b8d0963da
Style nits.
2017-02-16 10:53:25 +00:00
a3d5bfcece
Define away pledge() on !OpenBSD.
2017-01-23 12:27:58 +00:00
b3a724f30c
Merge branch 'obsd-master'
...
Conflicts:
Makefile
tmux.c
2017-01-23 12:20:43 +00:00
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
c9fcb76651
Merge branch 'obsd-master'
2017-01-15 22:01:11 +00:00
2b0bc9f1c5
Major tidy up and rework of options tree and set-option/show-options
...
commands this pushes more of the code into options.c and ties it more
closely to the options table rather than having an unnecessary
split. Also add support for array options (will be used later). Only
(intentional) user visible change is that show-options output is now
passed through vis(3) with VIS_DQ so quotes are escaped.
2017-01-15 20:48:41 +00:00
d4cb178249
Merge branch 'obsd-master'
2017-01-12 16:01:13 +00:00
24cba5907b
Simplify appending to string options.
2017-01-12 15:36:35 +00:00
a64b7cfe5d
Merge branch 'obsd-master'
2016-12-10 00:01:11 +00:00
bee95bf378
Spacing nits.
2016-12-09 21:39:27 +00:00
b9dc855016
Merge branch 'obsd-master'
...
Conflicts:
format.c
osdep-openbsd.c
2016-10-12 09:45:49 +01:00
e45401846f
Add static in window-*.c and move some internal functions out of tmux.h.
2016-10-11 13:21:59 +00:00
c426e485e5
Loads more static, except for cmd-*.c and window-*.c.
2016-10-10 21:29:23 +00:00
5e9412608e
No longer set __progname, we have getprogname().
2016-05-30 10:02:08 +01:00
c10d83b4df
__progname -> getprogname()
...
Fix fallout from recent use of getprogname(), which deprecates __progname.
2016-05-27 20:11:32 +01:00
a2e0db67cc
Merge branch 'obsd-master'
2016-05-27 20:01:11 +01:00
fcb00a4161
Use getprogname() instead of __progname to make portability easier.
2016-05-27 17:05:42 +00:00
7411f21c5f
Use osdep_event_init() so that LIBEVENT_NOEPOLL and so on are set to turn off
...
broken event methods. Reported by Suraj N Kurapati.
2016-05-20 07:54:30 +01:00
f4648c1ca1
Merge branch 'obsd-master'
2016-05-05 00:01:11 +01:00
9f045787a5
Fix up a couple of long lines.
2016-05-04 21:29:47 +00:00
5fc5c03dad
Merge branch 'obsd-master'
...
Conflicts:
tmux.c
2016-03-05 17:58:12 +00:00
0d6de44a37
If setlocale("en_US.UTF-8") succeeds, then don't do the check for UTF-8
...
locale since if it isn't UTF-8 the system is broken anyway. If it fails,
try "" and check for UTF-8 with nl_langinfo(CODESET) rather than
wcwidth(). Based on a diff from schwarze@, nl_langinfo also suggested by
stsp@.
2016-03-05 16:08:38 +00:00
81f78f0da7
Merge branch 'obsd-master'
2016-03-05 10:01:09 +00:00
1f0b317088
Although we always have en_US.UTF-8 on OpenBSD, some platforms do not,
...
so fall back to setlocale(LC_CTYPE, ""). tmux requires a UTF-8 locale,
so check with wcwidth() on a UTF-8 character after setlocale().
2016-03-05 07:44:31 +00:00
e304673c65
Merge branch 'obsd-master'
...
Conflicts:
utf8.c
2016-03-02 18:10:51 +00:00
e647eeb0c9
Remove unused variables, from Michal Mazurek.
2016-03-01 12:02:54 +00:00
26945d7956
Use system wcwidth() instead of carrying around UTF-8 width tables.
2016-03-01 12:02:08 +00:00
fc864529f5
Remove malloc_options debug bit (already gone from OpenBSD).
2016-02-19 13:11:10 +00:00
dc42c35f1f
Merge branch 'obsd-master'
2016-01-19 18:01:15 +00:00
995af0e2b7
I no longer use my SourceForge address so replace it.
2016-01-19 15:59:12 +00:00
5862f59ed7
Conflicts:
...
Makefile
2015-12-08 07:11:09 +00:00
d2fb0efcd1
Add hooks infrastructure, basic commands (set-hook, show-hooks) and a
...
couple of not very useful client hooks. This will eventually let
commands be run at various points and on notifications. Joint work with
Thomas Adam.
2015-12-08 01:10:31 +00:00
890d8da2e3
Merge branch 'obsd-master'
...
Conflicts:
log.c
proc.c
tmux.c
2015-11-25 16:37:30 +00:00
62d3af17f9
Make environ_set va_args and use it to tidy up some calls. Also add a
...
missing word in manpage (from jmc).
2015-11-24 23:46:15 +00:00
3ff46b2e43
Shell command from -c doesn't have to be global, pass it as an argument.
2015-11-24 23:22:51 +00:00
c913fb99b6
Tidy the code that works out the socket path, and just use the full path
...
in the global socket_path rather than copying it.
2015-11-24 22:27:22 +00:00
8976dac9e0
Remove malloc_options DEBUG bit.
2015-11-24 22:09:53 +00:00
1e2df2d464
Remove the -I part of show-messages which isn't really that useful; the
...
server start time can now be accessed with a new start_time format (use:
tmux display -p '#{t:start_time}')
2015-11-24 21:52:06 +00:00
