JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cygwin: change virtual_ftype_t to not rely on negative values

Browse Source 
So far negative values were denoting files, positive values
denoting directories.  We should prefer a less error prone
method.  Redefine virtual_ftype_t to contain only positive
values and replace checks for negativ or positive values with
inline functions virt_ftype_isfile() and virt_ftype_isdir().

Drop outdcated comments referring to numerical virtual_ftype_t
values.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen
2019-07-22 18:40:33 +02:00
parent e118a605e2
commit dec444bee3
9 changed files with 31 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
winsup/cygwin/fhandler.h
View File

@ -126,20 +126,33 @@ enum del_lock_called_from {
};
enum virtual_ftype_t {
virt_fdsymlink = -8, /* Fd symlink (e.g. /proc/<PID>/fd/0) */
virt_blk = -7, /* Block special */
virt_chr = -6, /* Character special */
virt_fsfile = -5, /* FS-based file via /proc/sys */
virt_socket = -4, /* Socket */
virt_pipe = -3, /* Pipe */
virt_symlink = -2, /* Symlink */
virt_file = -1, /* Regular file */
virt_none = 0, /* Invalid, Error */
virt_directory = 1, /* Directory */
virt_rootdir = 2, /* Root directory of virtual FS */
virt_fsdir = 3, /* FS-based directory via /proc/sys */
virt_none = 0x0000, /* Invalid, Error */
virt_file = 0x0001, /* Regular file */
virt_symlink = 0x0002, /* Symlink */
virt_pipe = 0x0003, /* Pipe */
virt_socket = 0x0004, /* Socket */
virt_chr = 0x0005, /* Character special */
virt_blk = 0x0006, /* Block special */
virt_fdsymlink = 0x0007, /* Fd symlink (e.g. /proc/<PID>/fd/0) */
virt_fsfile = 0x0008, /* FS-based file via /proc/sys */
virt_dir_type = 0x1000,
virt_directory = 0x1001, /* Directory */
virt_rootdir = 0x1002, /* Root directory of virtual FS */
virt_fsdir = 0x1003, /* FS-based directory via /proc/sys */
};
static inline bool
virt_ftype_isfile (virtual_ftype_t _f)
{
return _f != virt_none && !(_f & virt_dir_type);
}
static inline bool
virt_ftype_isdir (virtual_ftype_t _f)
{
return _f & virt_dir_type;
}
class fhandler_base
{
friend class dtable;