circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-02 13:37:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2025-04-09 10:01:12 +01:00
parent d3c39375d5 68ffe65499
commit ac2779f4d8
18 changed files with 103 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tmux.c
View File

@ -43,20 +43,20 @@ const char *socket_path;
int ptm_fd = -1;
const char *shell_command;
static __dead void usage(void);
static __dead void usage(int);
static char *make_label(const char *, char **);
static int areshell(const char *);
static const char *getshell(void);
static __dead void
usage(void)
usage(int status)
{
fprintf(stderr,
"usage: %s [-2CDlNuVv] [-c shell-command] [-f file] [-L socket-name]\n"
fprintf(status ? stderr : stdout,
"usage: %s [-2CDhlNuVv] [-c shell-command] [-f file] [-L socket-name]\n"
" [-S socket-path] [-T features] [command [flags]]\n",
getprogname());
exit(1);
exit(status);
}
static const char *
@ -379,7 +379,7 @@ main(int argc, char **argv)
environ_set(global_environ, "PWD", 0, "%s", cwd);
expand_paths(TMUX_CONF, &cfg_files, &cfg_nfiles, 1);
while ((opt = getopt(argc, argv, "2c:CDdf:lL:NqS:T:uUvV")) != -1) {
while ((opt = getopt(argc, argv, "2c:CDdf:hlL:NqS:T:uUvV")) != -1) {
switch (opt) {
case '2':
tty_add_features(&feat, "256", ":,");
@ -408,6 +408,8 @@ main(int argc, char **argv)
cfg_files[cfg_nfiles++] = xstrdup(optarg);
cfg_quiet = 0;
break;
case 'h':
usage(0);
case 'V':
printf("tmux %s\n", getversion());
exit(0);
@ -437,16 +439,16 @@ main(int argc, char **argv)
log_add_level();
break;
default:
usage();
usage(1);
}
}
argc -= optind;
argv += optind;
if (shell_command != NULL && argc != 0)
usage();
usage(1);
if ((flags & CLIENT_NOFORK) && argc != 0)
usage();
usage(1);
if ((ptm_fd = getptmfd()) == -1)
err(1, "getptmfd");