===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -c -r1.96 -r1.97
*** src/usr.bin/tmux/server.c	2010/10/18 20:00:02	1.96
--- src/usr.bin/tmux/server.c	2010/12/21 22:37:59	1.97
***************
*** 1,4 ****
! /* $OpenBSD: server.c,v 1.96 2010/10/18 20:00:02 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: server.c,v 1.97 2010/12/21 22:37:59 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 147,154 ****
  	ARRAY_INIT(&windows);
  	ARRAY_INIT(&clients);
  	ARRAY_INIT(&dead_clients);
! 	ARRAY_INIT(&sessions);
! 	ARRAY_INIT(&dead_sessions);
  	TAILQ_INIT(&session_groups);
  	mode_key_init_trees();
  	key_bindings_init();
--- 147,154 ----
  	ARRAY_INIT(&windows);
  	ARRAY_INIT(&clients);
  	ARRAY_INIT(&dead_clients);
! 	RB_INIT(&sessions);
! 	RB_INIT(&dead_sessions);
  	TAILQ_INIT(&session_groups);
  	mode_key_init_trees();
  	key_bindings_init();
***************
*** 174,181 ****
  	 * If there is a session already, put the current window and pane into
  	 * more mode.
  	 */
! 	if (!ARRAY_EMPTY(&sessions) && !ARRAY_EMPTY(&cfg_causes)) {
! 		wp = ARRAY_FIRST(&sessions)->curw->window->active;
  		window_pane_set_mode(wp, &window_copy_mode);
  		window_copy_init_for_output(wp);
  		for (i = 0; i < ARRAY_LENGTH(&cfg_causes); i++) {
--- 174,181 ----
  	 * If there is a session already, put the current window and pane into
  	 * more mode.
  	 */
! 	if (!RB_EMPTY(&sessions) && !ARRAY_EMPTY(&cfg_causes)) {
! 		wp = RB_MIN(sessions, &sessions)->curw->window->active;
  		window_pane_set_mode(wp, &window_copy_mode);
  		window_copy_init_for_output(wp);
  		for (i = 0; i < ARRAY_LENGTH(&cfg_causes); i++) {
***************
*** 223,232 ****
  	u_int	i;
  
  	if (!options_get_number(&global_options, "exit-unattached")) {
! 		for (i = 0; i < ARRAY_LENGTH(&sessions); i++) {
! 			if (ARRAY_ITEM(&sessions, i) != NULL)
! 				return (0);
! 		}
  	}
  	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
  		if (ARRAY_ITEM(&clients, i) != NULL)
--- 223,230 ----
  	u_int	i;
  
  	if (!options_get_number(&global_options, "exit-unattached")) {
! 		if (!RB_EMPTY(&sessions))
! 			return (0);
  	}
  	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
  		if (ARRAY_ITEM(&clients, i) != NULL)
***************
*** 240,246 ****
  server_send_shutdown(void)
  {
  	struct client	*c;
! 	struct session	*s;
  	u_int		 i;
  
  	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
--- 238,244 ----
  server_send_shutdown(void)
  {
  	struct client	*c;
! 	struct session	*s, *next_s;
  	u_int		 i;
  
  	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
***************
*** 254,262 ****
  		}
  	}
  
! 	for (i = 0; i < ARRAY_LENGTH(&sessions); i++) {
! 		if ((s = ARRAY_ITEM(&sessions, i)) != NULL)
! 			session_destroy(s);
  	}
  }
  
--- 252,262 ----
  		}
  	}
  
! 	s = RB_MIN(sessions, &sessions);
! 	while (s != NULL) {
! 		next_s = RB_NEXT(sessions, &sessions, s);
! 		session_destroy(s);
! 		s = next_s;
  	}
  }
  
***************
*** 264,279 ****
  void
  server_clean_dead(void)
  {
! 	struct session	*s;
  	struct client	*c;
  	u_int		 i;
  
! 	for (i = 0; i < ARRAY_LENGTH(&dead_sessions); i++) {
! 		s = ARRAY_ITEM(&dead_sessions, i);
! 		if (s == NULL || s->references != 0)
! 			continue;
! 		ARRAY_SET(&dead_sessions, i, NULL);
! 		xfree(s);
  	}
  
  	for (i = 0; i < ARRAY_LENGTH(&dead_clients); i++) {
--- 264,282 ----
  void
  server_clean_dead(void)
  {
! 	struct session	*s, *next_s;
  	struct client	*c;
  	u_int		 i;
  
! 	s = RB_MIN(sessions, &dead_sessions);
! 	while (s != NULL) {
! 		next_s = RB_NEXT(sessions, &dead_sessions, s);
! 		if (s->references == 0) {
! 			RB_REMOVE(sessions, &dead_sessions, s);
! 			xfree(s->name);
! 			xfree(s);
! 		}
! 		s = next_s;
  	}
  
  	for (i = 0; i < ARRAY_LENGTH(&dead_clients); i++) {
***************
*** 290,304 ****
  server_update_socket(void)
  {
  	struct session	*s;
- 	u_int		 i;
  	static int	 last = -1;
  	int		 n, mode;
  	struct stat      sb;
  
  	n = 0;
! 	for (i = 0; i < ARRAY_LENGTH(&sessions); i++) {
! 		s = ARRAY_ITEM(&sessions, i);
! 		if (s != NULL && !(s->flags & SESSION_UNATTACHED)) {
  			n++;
  			break;
  		}
--- 293,305 ----
  server_update_socket(void)
  {
  	struct session	*s;
  	static int	 last = -1;
  	int		 n, mode;
  	struct stat      sb;
  
  	n = 0;
! 	RB_FOREACH(s, sessions, &sessions) {
! 		if (!(s->flags & SESSION_UNATTACHED)) {
  			n++;
  			break;
  		}
***************
*** 485,499 ****
  server_lock_server(void)
  {
  	struct session  *s;
- 	u_int            i;
  	int		 timeout;
  	time_t           t;
  
  	t = time(NULL);
! 	for (i = 0; i < ARRAY_LENGTH(&sessions); i++) {
! 		if ((s = ARRAY_ITEM(&sessions, i)) == NULL)
! 			continue;
! 
  		if (s->flags & SESSION_UNATTACHED) {
  			if (gettimeofday(&s->activity_time, NULL) != 0)
  				fatal("gettimeofday failed");
--- 486,496 ----
  server_lock_server(void)
  {
  	struct session  *s;
  	int		 timeout;
  	time_t           t;
  
  	t = time(NULL);
! 	RB_FOREACH(s, sessions, &sessions) {
  		if (s->flags & SESSION_UNATTACHED) {
  			if (gettimeofday(&s->activity_time, NULL) != 0)
  				fatal("gettimeofday failed");
***************
*** 514,528 ****
  server_lock_sessions(void)
  {
  	struct session  *s;
- 	u_int		 i;
  	int		 timeout;
  	time_t		 t;
  
  	t = time(NULL);
! 	for (i = 0; i < ARRAY_LENGTH(&sessions); i++) {
! 		if ((s = ARRAY_ITEM(&sessions, i)) == NULL)
! 			continue;
! 
  		if (s->flags & SESSION_UNATTACHED) {
  			if (gettimeofday(&s->activity_time, NULL) != 0)
  				fatal("gettimeofday failed");
--- 511,521 ----
  server_lock_sessions(void)
  {
  	struct session  *s;
  	int		 timeout;
  	time_t		 t;
  
  	t = time(NULL);
! 	RB_FOREACH(s, sessions, &sessions) {
  		if (s->flags & SESSION_UNATTACHED) {
  			if (gettimeofday(&s->activity_time, NULL) != 0)
  				fatal("gettimeofday failed");