From: Eric Biggers <ebiggers3@gmail.com>
Date: Sun, 21 Apr 2013 22:49:46 +0000 (-0500)
Subject: unix_capture_directory():  Use readdir() instead of readdir_r()
X-Git-Tag: v1.3.3~56
X-Git-Url: https://wimlib.net/git/?p=wimlib;a=commitdiff_plain;h=d8d2377861cec72d3dd51910a417926e37b7f3b4;ds=sidebyside

unix_capture_directory():  Use readdir() instead of readdir_r()
---

diff --git a/src/add_image.c b/src/add_image.c
index 923d361e..7a0ef113 100644
--- a/src/add_image.c
+++ b/src/add_image.c
@@ -141,7 +141,7 @@ unix_capture_directory(struct wim_dentry *dir_dentry,
 {
 
 	DIR *dir;
-	struct dirent entry, *result;
+	struct dirent *entry;
 	struct wim_dentry *child;
 	int ret;
 
@@ -154,26 +154,26 @@ unix_capture_directory(struct wim_dentry *dir_dentry,
 	}
 
 	/* Recurse on directory contents */
-	while (1) {
+	for (;;) {
 		errno = 0;
-		ret = readdir_r(dir, &entry, &result);
-		if (ret != 0) {
-			ret = WIMLIB_ERR_READ;
-			ERROR_WITH_ERRNO("Error reading the "
-					 "directory `%s'",
-					 path);
+		entry = readdir(dir);
+		if (!entry) {
+			if (errno) {
+				ret = WIMLIB_ERR_READ;
+				ERROR_WITH_ERRNO("Error reading the "
+						 "directory `%s'", path);
+			}
 			break;
 		}
-		if (result == NULL)
-			break;
-		if (result->d_name[0] == '.' && (result->d_name[1] == '\0'
-		      || (result->d_name[1] == '.' && result->d_name[2] == '\0')))
+
+		if (entry->d_name[0] == '.' && (entry->d_name[1] == '\0'
+		      || (entry->d_name[1] == '.' && entry->d_name[2] == '\0')))
 				continue;
 
-		size_t name_len = strlen(result->d_name);
+		size_t name_len = strlen(entry->d_name);
 
 		path[path_len] = '/';
-		memcpy(&path[path_len + 1], result->d_name, name_len + 1);
+		memcpy(&path[path_len + 1], entry->d_name, name_len + 1);
 		ret = unix_build_dentry_tree_recursive(&child,
 						       path,
 						       path_len + 1 + name_len,