Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Johnny Cai
wine
Commits
9786b058
Commit
9786b058
authored
21 years ago
by
Michal Janusz Miroslaw
Committed by
Alexandre Julliard
21 years ago
Browse files
Options
Downloads
Patches
Plain Diff
On Linux: avoid blocking in DOSFS_OpenDir_VFAT if specified path is
not a directory.
parent
9aee7c60
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
files/dos_fs.c
+6
-1
6 additions, 1 deletion
files/dos_fs.c
with
6 additions
and
1 deletion
files/dos_fs.c
+
6
−
1
View file @
9786b058
...
...
@@ -75,6 +75,11 @@ typedef struct
#define VFAT_IOCTL_READDIR_BOTH _IOR('r', 1, KERNEL_DIRENT [2] )
/* To avoid blocking on non-directories in DOSFS_OpenDir_VFAT*/
#ifndef O_DIRECTORY
# define O_DIRECTORY 0200000
/* must be directory */
#endif
#else
/* linux */
#undef VFAT_IOCTL_READDIR_BOTH
/* just in case... */
#endif
/* linux */
...
...
@@ -461,7 +466,7 @@ static BOOL DOSFS_OpenDir_VFAT(UINT codepage, DOS_DIR **dir, const char *unix_pa
{
#ifdef VFAT_IOCTL_READDIR_BOTH
KERNEL_DIRENT
de
[
2
];
int
fd
=
open
(
unix_path
,
O_RDONLY
);
int
fd
=
open
(
unix_path
,
O_RDONLY
|
O_DIRECTORY
);
BOOL
r
=
TRUE
;
/* Check if the VFAT ioctl is supported on this directory */
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment