fixup! mingw: optionally enable wsl compability file mode bits

fix wsl mode bits bug in subdir Support for wsl mode bits was previously added to git, but there was a bug because the filenames provided by fdata did not contain paths. Ex: fdata->FileName is only foo.sh while we need path/to/foo.sh to open the file. This commit fixes the issue. Signed-off-by: lixungeng <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>
dscho · Aug 7, 2024 · 15bcde9 · 15bcde9
1 parent 2e6a859
commit 15bcde9
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/compat/win32/fscache.c b/compat/win32/fscache.c
@@ -238,9 +238,20 @@ static struct fsentry *fseentry_create_entry(struct fscache *cache,
 			     &(fse->u.s.st_mtim));
 	filetime_to_timespec((FILETIME *)&(fdata->CreationTime),
 			     &(fse->u.s.st_ctim));
-	if (fdata->EaSize > 0 && are_wsl_compatible_mode_bits_enabled()) {
-		copy_wsl_mode_bits_from_disk(fdata->FileName,
-			fdata->FileNameLength / sizeof(wchar_t), &fse->st_mode);
+	if (fdata->EaSize > 0 &&
+	    sizeof(buf) >= (list ? list->len+1 : 0) + fse->len+1 &&
+	    are_wsl_compatible_mode_bits_enabled()) {
+		size_t off = 0;
+		wchar_t wpath[MAX_LONG_PATH];
+		if (list && list->len) {
+			memcpy(buf, list->dirent.d_name, list->len);
+			buf[list->len] = '/';
+			off = list->len + 1;
+		}
+		memcpy(buf + off, fse->dirent.d_name, fse->len);
+		buf[off + fse->len] = '\0';
+		if (xutftowcs_long_path(wpath, buf) >= 0)
+			copy_wsl_mode_bits_from_disk(wpath, -1, &fse->st_mode);
 	}
 
 	return fse;