aboutsummaryrefslogtreecommitdiff
path: root/tmux.c
diff options
context:
space:
mode:
Diffstat (limited to 'tmux.c')
-rw-r--r--tmux.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/tmux.c b/tmux.c
index d221c78e..1ff3e0db 100644
--- a/tmux.c
+++ b/tmux.c
@@ -23,9 +23,7 @@
#include <errno.h>
#include <event.h>
#include <fcntl.h>
-#include <getopt.h>
#include <locale.h>
-#include <paths.h>
#include <pwd.h>
#include <stdlib.h>
#include <string.h>
@@ -46,11 +44,15 @@ const char *socket_path;
__dead void usage(void);
static char *make_label(const char *);
+#ifndef HAVE___PROGNAME
+char *__progname = (char *) "tmux";
+#endif
+
__dead void
usage(void)
{
fprintf(stderr,
- "usage: %s [-2Cluv] [-c shell-command] [-f file] [-L socket-name]\n"
+ "usage: %s [-2CluvV] [-c shell-command] [-f file] [-L socket-name]\n"
" [-S socket-path] [command [flags]]\n",
__progname);
exit(1);
@@ -202,7 +204,7 @@ main(int argc, char **argv)
flags = 0;
label = path = NULL;
- while ((opt = getopt(argc, argv, "2c:Cdf:lL:qS:uUv")) != -1) {
+ while ((opt = getopt(argc, argv, "2c:Cdf:lL:qS:uUVv")) != -1) {
switch (opt) {
case '2':
flags |= CLIENT_256COLOURS;
@@ -217,6 +219,9 @@ main(int argc, char **argv)
else
flags |= CLIENT_CONTROL;
break;
+ case 'V':
+ printf("%s %s\n", __progname, VERSION);
+ exit(0);
case 'f':
set_cfg_file(optarg);
break;
@@ -249,9 +254,11 @@ main(int argc, char **argv)
if (shellcmd != NULL && argc != 0)
usage();
+#ifdef __OpenBSD__
if (pledge("stdio rpath wpath cpath flock fattr unix getpw sendfd "
"recvfd proc exec tty ps", NULL) != 0)
err(1, "pledge");
+#endif
/*
* tmux is a UTF-8 terminal, so if TMUX is set, assume UTF-8.