diff options
| author | Christopher Faylor <me@cgf.cx> | 2004-01-21 18:19:29 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2004-01-21 18:19:29 +0000 |
| commit | 918f634fed57f28899ec9d2ed1d9922a57ee8cb4 (patch) | |
| tree | 8667f4e62b5499cbfb0fe147dd502c3147e01103 /winsup/cygwin/fhandler.cc | |
| parent | 0a0c89ef546fb75187312603f074b9ac0cf5b0ae (diff) | |
| download | cygnal-918f634fed57f28899ec9d2ed1d9922a57ee8cb4.tar.gz cygnal-918f634fed57f28899ec9d2ed1d9922a57ee8cb4.tar.bz2 cygnal-918f634fed57f28899ec9d2ed1d9922a57ee8cb4.zip | |
* fhandler.cc (fhandler_base::open): Use major numbers rather than device
numbers to control special behavior for devices which take units.
* fhandler_raw.cc (fhandler_dev_raw::writebuf): Ditto.
(fhandler_dev_raw::fstat): Ditto.
(fhandler_dev_raw::open): Ditto.
(fhandler_dev_raw::ioctl): Ditto.
Diffstat (limited to 'winsup/cygwin/fhandler.cc')
| -rw-r--r-- | winsup/cygwin/fhandler.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler.cc index 9be543a06..6d3070992 100644 --- a/winsup/cygwin/fhandler.cc +++ b/winsup/cygwin/fhandler.cc @@ -353,7 +353,7 @@ fhandler_base::open (int flags, mode_t mode) if (get_query_open ()) access = 0; - else if (get_device () == FH_TAPE) + else if (get_major () == DEV_TAPE_MAJOR) access = GENERIC_READ | GENERIC_WRITE; else if ((flags & (O_RDONLY | O_WRONLY | O_RDWR)) == O_RDONLY) access = GENERIC_READ; @@ -363,7 +363,7 @@ fhandler_base::open (int flags, mode_t mode) access = GENERIC_READ | GENERIC_WRITE; /* Allow reliable lseek on disk devices. */ - if (get_device () == FH_FLOPPY) + if (get_major () == DEV_FLOPPY_MAJOR) access |= GENERIC_READ; /* FIXME: O_EXCL handling? */ @@ -392,11 +392,11 @@ fhandler_base::open (int flags, mode_t mode) file_attributes = FILE_ATTRIBUTE_NORMAL; if (flags & O_DIROPEN) file_attributes |= FILE_FLAG_BACKUP_SEMANTICS; - if (get_device () == FH_SERIAL) + if (get_major () == DEV_SERIAL_MAJOR) file_attributes |= FILE_FLAG_OVERLAPPED; #ifdef HIDDEN_DOT_FILES - if (flags & O_CREAT && get_device () == FH_FS) + if (flags & O_CREAT && dev ().isfs ()) { char *c = strrchr (get_win32_name (), '\\'); if ((c && c[1] == '.') || *get_win32_name () == '.') @@ -420,7 +420,7 @@ fhandler_base::open (int flags, mode_t mode) /* If the file should actually be created and ntsec is on, set files attributes. */ - if (flags & O_CREAT && get_device () == FH_FS && allow_ntsec && has_acls ()) + if (flags & O_CREAT && dev ().isfs () && allow_ntsec && has_acls ()) set_security_attribute (mode, &sa, sd); x = CreateFile (get_win32_name (), access, shared, &sa, creation_distribution, |