diff options
| -rw-r--r-- | winsup/cygwin/ChangeLog | 6 | ||||
| -rw-r--r-- | winsup/cygwin/path.cc | 13 |
2 files changed, 19 insertions, 0 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 33f507764..5ebc53dc1 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,11 @@ 2012-04-04 Corinna Vinschen <corinna@vinschen.de> + * path.cc (path_conv::check): Convert device type to FH_FS for + non-existant files on /dev, unless /dev itself doesn't exist on disk. + Add comment to explain why. + +2012-04-04 Corinna Vinschen <corinna@vinschen.de> + * hookapi.cc (rvadelta): Compute max_size using SizeOfRawData rather than VirtualSize. diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc index 87389141a..4fee713ae 100644 --- a/winsup/cygwin/path.cc +++ b/winsup/cygwin/path.cc @@ -882,6 +882,19 @@ is_virtual_symlink: : sym.fileattr; path_flags = sym.pflags; } + else if (isdev_dev (dev)) + { + /* If we're looking for a file below /dev, which doesn't exist, + make sure that the device type is converted to FH_FS, so that + subsequent code handles the file correctly. + Unless /dev itself doesn't exist on disk. In that case /dev + is handled as virtual filesystem, and virtual filesystems are + read-only. */ + if (sym.error == ENOENT) + sym.error = EROFS; + else + dev.d.devn = FH_FS; + } /* If symlink.check found an existing non-symlink file, then it sets the appropriate flag. It also sets any suffix found |