===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-source-file.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -c -r1.42 -r1.43
*** src/usr.bin/tmux/cmd-source-file.c	2019/12/12 12:49:36	1.42
--- src/usr.bin/tmux/cmd-source-file.c	2019/12/18 07:48:56	1.43
***************
*** 1,4 ****
! /* $OpenBSD: cmd-source-file.c,v 1.42 2019/12/12 12:49:36 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Tiago Cunha <me@tiagocunha.org>
--- 1,4 ----
! /* $OpenBSD: cmd-source-file.c,v 1.43 2019/12/18 07:48:56 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Tiago Cunha <me@tiagocunha.org>
***************
*** 130,136 ****
  	char				*pattern, *cwd;
  	const char			*path, *error;
  	glob_t				 g;
! 	int				 i;
  	u_int				 j;
  
  	cdata = xcalloc(1, sizeof *cdata);
--- 130,136 ----
  	char				*pattern, *cwd;
  	const char			*path, *error;
  	glob_t				 g;
! 	int				 i, result;
  	u_int				 j;
  
  	cdata = xcalloc(1, sizeof *cdata);
***************
*** 158,166 ****
  			xasprintf(&pattern, "%s/%s", cwd, path);
  		log_debug("%s: %s", __func__, pattern);
  
! 		if (glob(pattern, 0, NULL, &g) != 0) {
! 			error = strerror(errno);
! 			if (errno != ENOENT || (~flags & CMD_PARSE_QUIET)) {
  				cmdq_error(item, "%s: %s", path, error);
  				retval = CMD_RETURN_ERROR;
  			}
--- 158,172 ----
  			xasprintf(&pattern, "%s/%s", cwd, path);
  		log_debug("%s: %s", __func__, pattern);
  
! 		if ((result = glob(pattern, 0, NULL, &g)) != 0) {
! 			if (result != GLOB_NOMATCH ||
! 			    (~flags & CMD_PARSE_QUIET)) {
! 				if (result == GLOB_NOMATCH)
! 					error = strerror(ENOENT);
! 				else if (result == GLOB_NOSPACE)
! 					error = strerror(ENOMEM);
! 				else
! 					error = strerror(EINVAL);
  				cmdq_error(item, "%s: %s", path, error);
  				retval = CMD_RETURN_ERROR;
  			}