Merge the before and after attach client code into one in client.c

(instead of two in tmux.c and client.c).
This commit is contained in:
Nicholas Marriott
2010-10-18 20:00:02 +00:00
parent 31954339d1
commit 248fb14f08
4 changed files with 297 additions and 337 deletions

13
tmux.h
View File

@ -1291,15 +1291,19 @@ extern struct options global_w_options;
extern struct environ global_environ;
extern struct event_base *ev_base;
extern char *cfg_file;
extern char *shell_cmd;
extern int debug_level;
extern int be_quiet;
extern time_t start_time;
extern char *socket_path;
extern char socket_path[MAXPATHLEN];
extern int login_shell;
extern char *environ_path;
extern pid_t environ_pid;
extern u_int environ_idx;
void logfile(const char *);
const char *getshell(void);
int checkshell(const char *);
int areshell(const char *);
__dead void shell_exec(const char *, const char *);
/* cfg.c */
extern int cfg_finished;
@ -1598,8 +1602,7 @@ void cmd_buffer_free(struct cmd *);
size_t cmd_buffer_print(struct cmd *, char *, size_t);
/* client.c */
struct imsgbuf *client_init(char *, int, int);
__dead void client_main(void);
int client_main(int, char **, int);
/* key-bindings.c */
extern struct key_bindings key_bindings;
@ -1622,7 +1625,7 @@ const char *key_string_lookup_key(int);
/* server.c */
extern struct clients clients;
extern struct clients dead_clients;
int server_start(char *);
int server_start(void);
void server_update_socket(void);
/* server-client.c */