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 
Conflicts:
	format.c
	osdep-openbsd.c
This commit is contained in:
Thomas Adam
2016-10-12 09:45:49 +01:00
parent 27126f8797 5c49e1d0c1
commit b9dc855016
98 changed files with 2110 additions and 2229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tmux.c
View File

@ -43,10 +43,13 @@ struct hooks *global_hooks;
struct timeval start_time;
const char *socket_path;
__dead void usage(void);
static char *make_label(const char *);
static __dead void usage(void);
static char *make_label(const char *);
__dead void
static const char *getshell(void);
static int checkshell(const char *);
static __dead void
usage(void)
{
fprintf(stderr,
@ -56,7 +59,7 @@ usage(void)
exit(1);
}
const char *
static const char *
getshell(void)
{
struct passwd *pw;
@ -73,7 +76,7 @@ getshell(void)
return (_PATH_BSHELL);
}
int
static int
checkshell(const char *shell)
{
if (shell == NULL || *shell == '\0' || *shell != '/')