diff options
| author | Yaakov Selkowitz <yselkowi@redhat.com> | 2011-04-04 10:14:27 +0000 |
|---|---|---|
| committer | Yaakov Selkowitz <yselkowi@redhat.com> | 2011-04-04 10:14:27 +0000 |
| commit | 26968b5c0590cf2fd8ff916bc63e0936300160f6 (patch) | |
| tree | 56c352c5d09f4ae1386599c6a86570f7faf60a62 /winsup/cygwin | |
| parent | 3f7dfed9e9620d1b49b1d37e0a183304cef2d104 (diff) | |
| download | newlib-26968b5c0590cf2fd8ff916bc63e0936300160f6.zip newlib-26968b5c0590cf2fd8ff916bc63e0936300160f6.tar.gz newlib-26968b5c0590cf2fd8ff916bc63e0936300160f6.tar.bz2 | |
* devices.h (fh_devices): Define FH_PROC_MIN_MINOR.
Reorder major-0 devices so that all /proc directories fall
between FH_PROC and FH_PROC_MIN_MINOR.
* path.h (isproc_dev): Redefine accordingly.
Diffstat (limited to 'winsup/cygwin')
| -rw-r--r-- | winsup/cygwin/ChangeLog | 8 | ||||
| -rw-r--r-- | winsup/cygwin/devices.h | 33 | ||||
| -rw-r--r-- | winsup/cygwin/path.h | 3 |
3 files changed, 27 insertions, 17 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 6f40632..7387c5d 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,11 @@ +2011-04-04 Yaakov Selkowitz <yselkowitz@users.sourceforge.net> + Corinna Vinschen <corinna@vinschen.de> + + * devices.h (fh_devices): Define FH_PROC_MIN_MINOR. + Reorder major-0 devices so that all /proc directories fall + between FH_PROC and FH_PROC_MIN_MINOR. + * path.h (isproc_dev): Redefine accordingly. + 2011-04-04 Corinna Vinschen <corinna@vinschen.de> * cygserver_setpwd.h (setlsapwd): Add username parameter to declaration. diff --git a/winsup/cygwin/devices.h b/winsup/cygwin/devices.h index 4441b44..882ee51 100644 --- a/winsup/cygwin/devices.h +++ b/winsup/cygwin/devices.h @@ -1,6 +1,6 @@ /* devices.h - Copyright 2002, 2003, 2004, 2005, 2007, 2009, 2010 Red Hat, Inc. + Copyright 2002, 2003, 2004, 2005, 2007, 2009, 2010, 2011 Red Hat, Inc. This file is part of Cygwin. @@ -39,22 +39,25 @@ enum fh_devices FH_WINDOWS = FHDEV (13, 255), FH_CLIPBOARD=FHDEV (13, 254), - FH_PIPE = FHDEV (0, 255), - FH_PIPER = FHDEV (0, 254), - FH_PIPEW = FHDEV (0, 253), - FH_FIFO = FHDEV (0, 252), - FH_PROC = FHDEV (0, 250), - FH_REGISTRY= FHDEV (0, 249), - FH_PROCESS = FHDEV (0, 248), + /* begin /proc directories */ + FH_PROC = FHDEV (0, 255), + FH_REGISTRY= FHDEV (0, 254), + FH_PROCNET = FHDEV (0, 253), + FH_PROCESSFD = FHDEV (0, 252), + FH_PROCSYS = FHDEV (0, 251), + FH_PROCSYSVIPC = FHDEV (0,250), - FH_FS = FHDEV (0, 247), /* filesystem based device */ + FH_PROC_MIN_MINOR = FHDEV (0,200), + /* end /proc directories */ - FH_NETDRIVE= FHDEV (0, 246), - FH_DEV = FHDEV (0, 245), - FH_PROCNET = FHDEV (0, 244), - FH_PROCESSFD = FHDEV (0, 243), - FH_PROCSYS = FHDEV (0, 242), - FH_PROCSYSVIPC = FHDEV (0,241), + FH_PIPE = FHDEV (0, 199), + FH_PIPER = FHDEV (0, 198), + FH_PIPEW = FHDEV (0, 197), + FH_FIFO = FHDEV (0, 196), + FH_PROCESS = FHDEV (0, 195), + FH_FS = FHDEV (0, 194), /* filesystem based device */ + FH_NETDRIVE= FHDEV (0, 193), + FH_DEV = FHDEV (0, 192), DEV_FLOPPY_MAJOR = 2, FH_FLOPPY = FHDEV (DEV_FLOPPY_MAJOR, 0), diff --git a/winsup/cygwin/path.h b/winsup/cygwin/path.h index 0383252..d2fc778 100644 --- a/winsup/cygwin/path.h +++ b/winsup/cygwin/path.h @@ -18,8 +18,7 @@ details. */ #include <fcntl.h> #define isproc_dev(devn) \ - (devn == FH_PROC || devn == FH_REGISTRY || devn == FH_PROCESS || \ - devn == FH_PROCNET || devn == FH_PROCSYS || devn == FH_PROCSYSVIPC) + (devn >= FH_PROC_MIN_MINOR && devn <= FH_PROC) #define isprocsys_dev(devn) (devn == FH_PROCSYS) |