PlaneteCasio
/
libc
1
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity

* devices.h (FH_DEV): Define as DEV_VIRTFS_MAJOR class device. 

(DEV_DEV_MAJOR): Remove.
	* dtable.cc (fh_alloc): Accommodate above change.
	* syscalls.cc (set_ino_and_dev): Drop check for DEV_DEV_MAJOR from
	conditional.
This commit is contained in:
Corinna Vinschen 2012-04-02 11:45:56 +00:00
parent 949cc8b640
commit 1f312200d3
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,11 @@
2012-04-02 Corinna Vinschen <corinna@vinschen.de>
* devices.h (FH_DEV): Define as DEV_VIRTFS_MAJOR class device.
(DEV_DEV_MAJOR): Remove.
* dtable.cc (fh_alloc): Accommodate above change.
* syscalls.cc (set_ino_and_dev): Drop check for DEV_DEV_MAJOR from
conditional.
2012-04-02 Corinna Vinschen <corinna@vinschen.de>
* fhandler.h (fhandler_base::set_ino_and_dev): Declare.

4
winsup/cygwin/devices.h
View File

@ -72,6 +72,7 @@ enum fh_devices
FH_FIFO = FHDEV (DEV_VIRTFS_MAJOR, 196),
FH_FS = FHDEV (DEV_VIRTFS_MAJOR, 195), /* filesystem based device */
FH_NETDRIVE= FHDEV (DEV_VIRTFS_MAJOR, 194),
FH_DEV = FHDEV (DEV_VIRTFS_MAJOR, 193),
DEV_FLOPPY_MAJOR = 2,
FH_FLOPPY = FHDEV (DEV_FLOPPY_MAJOR, 0),
@ -246,9 +247,6 @@ enum fh_devices
DEV_CYGDRIVE_MAJOR = 98,
FH_CYGDRIVE= FHDEV (DEV_CYGDRIVE_MAJOR, 0),
DEV_DEV_MAJOR = 99,
FH_DEV= FHDEV (DEV_DEV_MAJOR, 0),
DEV_TCP_MAJOR = 30,
FH_TCP = FHDEV (DEV_TCP_MAJOR, 36),
FH_UDP = FHDEV (DEV_TCP_MAJOR, 39),

6
winsup/cygwin/dtable.cc
View File

@ -459,9 +459,6 @@ fh_alloc (path_conv& pc)
case DEV_CYGDRIVE_MAJOR:
fh = cnew (fhandler_cygdrive);
break;
case DEV_DEV_MAJOR:
fh = cnew (fhandler_dev);
break;
case DEV_FLOPPY_MAJOR:
case DEV_CDROM_MAJOR:
case DEV_SD_MAJOR:
@ -562,6 +559,9 @@ fh_alloc (path_conv& pc)
case FH_NETDRIVE:
fh = cnew (fhandler_netdrive);
break;
case FH_DEV:
fh = cnew (fhandler_dev);
break;
case FH_TTY:
if (!pc.isopen ())
{

2
winsup/cygwin/syscalls.cc
View File

@ -1613,7 +1613,7 @@ fhandler_base::set_ino_and_dev (struct __stat64 *buf)
}
/* Only set st_rdev if it's a device. */
if (!buf->st_rdev && get_major () != DEV_VIRTFS_MAJOR
&& get_major () != DEV_CYGDRIVE_MAJOR && get_major () != DEV_DEV_MAJOR)
&& get_major () != DEV_CYGDRIVE_MAJOR)
buf->st_rdev = get_device ();
}