mirrors/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-07 03:48:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'obsd-master' into master

Browse Source
This commit is contained in:
Thomas Adam
2021-01-17 18:01:21 +00:00
parent d4866d5fe6 71c590a37f
commit 24c15eda79
4 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tmux.c
View File

@@ -53,7 +53,7 @@ static __dead void
usage(void)
{
fprintf(stderr,
"usage: %s [-2CDluvV] [-c shell-command] [-f file] [-L socket-name]\n"
"usage: %s [-2CDlNuvV] [-c shell-command] [-f file] [-L socket-name]\n"
" [-S socket-path] [-T features] [command [flags]]\n",
getprogname());
exit(1);
@@ -340,7 +340,7 @@ main(int argc, char **argv)
if (**argv == '-')
flags = CLIENT_LOGIN;
while ((opt = getopt(argc, argv, "2c:CDdf:lL:qS:T:uUvV")) != -1) {
while ((opt = getopt(argc, argv, "2c:CDdf:lL:NqS:T:uUvV")) != -1) {
switch (opt) {
case '2':
tty_add_features(&feat, "256", ":,");
@@ -370,6 +370,9 @@ main(int argc, char **argv)
free(label);
label = xstrdup(optarg);
break;
case 'N':
flags |= CLIENT_NOSTARTSERVER;
break;
case 'q':
break;
case 'S':