1 files changed, 53 insertions, 42 deletions

diff --git a/src/os_win/os_dir.c b/src/os_win/os_dir.c
index 64eae60983c..6f796f6ef7d 100644
--- a/src/os_win/os_dir.c
+++ b/src/os_win/os_dir.c
@@ -13,34 +13,37 @@
  *	Get a list of files from a directory, MSVC version.
  */
 int
-__wt_win_directory_list(WT_SESSION_IMPL *session, const char *dir,
-    const char *prefix, uint32_t flags, char ***dirlist, u_int *countp)
+__wt_win_directory_list(WT_FILE_SYSTEM *file_system,
+    WT_SESSION *wt_session, const char *directory,
+    const char *prefix, char ***dirlistp, uint32_t *countp)
 {
 	HANDLE findhandle;
 	WIN32_FIND_DATA finddata;
 	WT_DECL_ITEM(pathbuf);
 	WT_DECL_RET;
+	WT_SESSION_IMPL *session;
 	size_t dirallocsz, pathlen;
-	u_int count, dirsz;
-	bool match;
-	char **entries, *path;
+	uint32_t count;
+	char *dir_copy, **entries;
 
-	*dirlist = NULL;
-	*countp = 0;
+	WT_UNUSED(file_system);
 
-	WT_RET(__wt_filename(session, dir, &path));
+	session = (WT_SESSION_IMPL *)wt_session;
 
-	pathlen = strlen(path);
-	if (path[pathlen - 1] == '\\')
-		path[pathlen - 1] = '\0';
-	WT_ERR(__wt_scr_alloc(session, pathlen + 3, &pathbuf));
-	WT_ERR(__wt_buf_fmt(session, pathbuf, "%s\\*", path));
+	*dirlistp = NULL;
+	*countp = 0;
 
 	findhandle = INVALID_HANDLE_VALUE;
 	dirallocsz = 0;
-	dirsz = 0;
 	entries = NULL;
 
+	WT_ERR(__wt_strdup(session, directory, &dir_copy));
+	pathlen = strlen(dir_copy);
+	if (dir_copy[pathlen - 1] == '\\')
+		dir_copy[pathlen - 1] = '\0';
+	WT_ERR(__wt_scr_alloc(session, pathlen + 3, &pathbuf));
+	WT_ERR(__wt_buf_fmt(session, pathbuf, "%s\\*", dir_copy));
+
 	findhandle = FindFirstFileA(pathbuf->data, &finddata);
 	if (findhandle == INVALID_HANDLE_VALUE)
 		WT_ERR_MSG(session, __wt_getlasterror(),
@@ -56,46 +59,54 @@ __wt_win_directory_list(WT_SESSION_IMPL *session, const char *dir,
 			continue;
 
 		/* The list of files is optionally filtered by a prefix. */
-		match = false;
 		if (prefix != NULL &&
-		    ((LF_ISSET(WT_DIRLIST_INCLUDE) &&
-		    WT_PREFIX_MATCH(finddata.cFileName, prefix)) ||
-		    (LF_ISSET(WT_DIRLIST_EXCLUDE) &&
-		    !WT_PREFIX_MATCH(finddata.cFileName, prefix))))
-			match = true;
-		if (prefix == NULL || match) {
-			/*
-			 * We have a file name we want to return.
-			 */
-			count++;
-			if (count > dirsz) {
-				dirsz += WT_DIR_ENTRY;
-				WT_ERR(__wt_realloc_def(session,
-				    &dirallocsz, dirsz, &entries));
-			}
-			WT_ERR(__wt_strdup(session,
-			    finddata.cFileName, &entries[count - 1]));
-		}
+		    !WT_PREFIX_MATCH(finddata.cFileName, prefix))
+			continue;
+
+		WT_ERR(__wt_realloc_def(
+		    session, &dirallocsz, count + 1, &entries));
+		WT_ERR(__wt_strdup(
+		    session, finddata.cFileName, &entries[count]));
+		++count;
 	} while (FindNextFileA(findhandle, &finddata) != 0);
-	if (count > 0)
-		*dirlist = entries;
+
+	*dirlistp = entries;
 	*countp = count;
 
 err:	if (findhandle != INVALID_HANDLE_VALUE)
 		(void)FindClose(findhandle);
-	__wt_free(session, path);
+	__wt_free(session, dir_copy);
 	__wt_scr_free(session, &pathbuf);
 
 	if (ret == 0)
 		return (0);
 
-	if (*dirlist != NULL) {
-		for (count = dirsz; count > 0; count--)
-			__wt_free(session, entries[count]);
-		__wt_free(session, entries);
-	}
+	WT_TRET(__wt_win_directory_list_free(
+	    file_system, wt_session, entries, count));
 
 	WT_RET_MSG(session, ret,
 	    "%s: directory-list, prefix \"%s\"",
-	    dir, prefix == NULL ? "" : prefix);
+	    directory, prefix == NULL ? "" : prefix);
+}
+
+/*
+ * __wt_win_directory_list_free --
+ *	Free memory returned by __wt_win_directory_list, Windows version.
+ */
+int
+__wt_win_directory_list_free(WT_FILE_SYSTEM *file_system,
+    WT_SESSION *wt_session, char **dirlist, uint32_t count)
+{
+	WT_SESSION_IMPL *session;
+
+	WT_UNUSED(file_system);
+
+	session = (WT_SESSION_IMPL *)wt_session;
+
+	if (dirlist != NULL) {
+		while (count > 0)
+			__wt_free(session, dirlist[--count]);
+		__wt_free(session, dirlist);
+	}
+	return (0);
 }