===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -c -r1.131 -r1.132
*** src/usr.bin/tmux/tmux.c	2014/04/17 07:55:43	1.131
--- src/usr.bin/tmux/tmux.c	2014/10/20 23:27:14	1.132
***************
*** 1,4 ****
! /* $OpenBSD: tmux.c,v 1.131 2014/04/17 07:55:43 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: tmux.c,v 1.132 2014/10/20 23:27:14 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 22,27 ****
--- 22,28 ----
  #include <errno.h>
  #include <event.h>
  #include <fcntl.h>
+ #include <getopt.h>
  #include <locale.h>
  #include <paths.h>
  #include <pwd.h>
***************
*** 46,52 ****
  char		*shell_cmd;
  int		 debug_level;
  time_t		 start_time;
! char		 socket_path[MAXPATHLEN];
  int		 login_shell;
  char		*environ_path;
  
--- 47,53 ----
  char		*shell_cmd;
  int		 debug_level;
  time_t		 start_time;
! char		 socket_path[PATH_MAX];
  int		 login_shell;
  char		*environ_path;
  
***************
*** 124,130 ****
  char *
  makesocketpath(const char *label)
  {
! 	char		base[MAXPATHLEN], realbase[MAXPATHLEN], *path, *s;
  	struct stat	sb;
  	u_int		uid;
  
--- 125,131 ----
  char *
  makesocketpath(const char *label)
  {
! 	char		base[PATH_MAX], realbase[PATH_MAX], *path, *s;
  	struct stat	sb;
  	u_int		uid;
  
***************
*** 202,208 ****
  main(int argc, char **argv)
  {
  	struct passwd	*pw;
! 	char		*s, *path, *label, **var, tmp[MAXPATHLEN];
  	char		 in[256];
  	const char	*home;
  	long long	 pid;
--- 203,209 ----
  main(int argc, char **argv)
  {
  	struct passwd	*pw;
! 	char		*s, *path, *label, **var, tmp[PATH_MAX];
  	char		 in[256];
  	const char	*home;
  	long long	 pid;