===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cfg.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -c -r1.11 -r1.12
*** src/usr.bin/tmux/cfg.c	2010/05/25 19:47:30	1.11
--- src/usr.bin/tmux/cfg.c	2010/12/29 21:28:32	1.12
***************
*** 1,4 ****
! /* $OpenBSD: cfg.c,v 1.11 2010/05/25 19:47:30 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cfg.c,v 1.12 2010/12/29 21:28:32 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 80,85 ****
--- 80,86 ----
  	size_t		 len;
  	struct cmd_list	*cmdlist;
  	struct cmd_ctx	 ctx;
+ 	int		 retval;
  
  	if ((f = fopen(path, "rb")) == NULL) {
  		cfg_add_cause(causes, "%s: %s", path, strerror(errno));
***************
*** 88,93 ****
--- 89,95 ----
  	n = 0;
  
  	line = NULL;
+ 	retval = 0;
  	while ((buf = fgetln(f, &len))) {
  		if (buf[len - 1] == '\n')
  			buf[len - 1] = '\0';
***************
*** 125,143 ****
  		ctx.info = cfg_print;
  
  		cfg_cause = NULL;
! 		cmd_list_exec(cmdlist, &ctx);
  		cmd_list_free(cmdlist);
  		if (cfg_cause != NULL) {
  			cfg_add_cause(causes, "%s: %d: %s", path, n, cfg_cause);
  			xfree(cfg_cause);
- 			continue;
  		}
  	}
  	if (line != NULL)
  		xfree(line);
  	fclose(f);
  
! 	if (ARRAY_LENGTH(causes) != 0)
! 		return (-1);
! 	return (0);
  }
--- 127,143 ----
  		ctx.info = cfg_print;
  
  		cfg_cause = NULL;
! 		if (cmd_list_exec(cmdlist, &ctx) == 1)
! 			retval = 1;
  		cmd_list_free(cmdlist);
  		if (cfg_cause != NULL) {
  			cfg_add_cause(causes, "%s: %d: %s", path, n, cfg_cause);
  			xfree(cfg_cause);
  		}
  	}
  	if (line != NULL)
  		xfree(line);
  	fclose(f);
  
! 	return (retval);
  }