circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 09:26:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source 
Conflicts:
	Makefile
	cmd-list-commands.c
	cmd-suspend-client.c
	job.c
	tmux.h
	xmalloc.c
This commit is contained in:
Thomas Adam
2014-10-21 07:11:44 +01:00
parent b6aef2490f 0a1a88d63c
commit 562af864bd
100 changed files with 432 additions and 757 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tmux.c
View File

@@ -22,6 +22,7 @@
#include <errno.h>
#include <event.h>
#include <fcntl.h>
#include <getopt.h>
#include <locale.h>
#include <pwd.h>
#include <stdlib.h>
@@ -45,7 +46,7 @@ char *cfg_file;
char *shell_cmd;
int debug_level;
time_t start_time;
char socket_path[MAXPATHLEN];
char socket_path[PATH_MAX];
int login_shell;
char *environ_path;
@@ -127,7 +128,7 @@ areshell(const char *shell)
char *
makesocketpath(const char *label)
{
char base[MAXPATHLEN], realbase[MAXPATHLEN], *path, *s;
char base[PATH_MAX], realbase[PATH_MAX], *path, *s;
struct stat sb;
u_int uid;
@@ -205,7 +206,7 @@ int
main(int argc, char **argv)
{
struct passwd *pw;
char *s, *path, *label, **var, tmp[MAXPATHLEN];
char *s, *path, *label, **var, tmp[PATH_MAX];
char in[256];
const char *home;
long long pid;