aboutsummaryrefslogtreecommitdiff
path: root/winsup/cygwin/devices.gperf
diff options
context:
space:
mode:
authorChristopher Faylor <me@cgf.cx>2003-02-01 18:42:23 +0000
committerChristopher Faylor <me@cgf.cx>2003-02-01 18:42:23 +0000
commitb91fd70788dff637d29acc51372075fc5ef2902e (patch)
treea6b32e0ca9b19b63a8333d719bfdc946635535a4 /winsup/cygwin/devices.gperf
parent003a950a8b47e2458947d1fdc1f1dc9e4f59e212 (diff)
downloadnewlib-b91fd70788dff637d29acc51372075fc5ef2902e.zip
newlib-b91fd70788dff637d29acc51372075fc5ef2902e.tar.gz
newlib-b91fd70788dff637d29acc51372075fc5ef2902e.tar.bz2
merge from trunk
Diffstat (limited to 'winsup/cygwin/devices.gperf')
-rw-r--r--winsup/cygwin/devices.gperf29
1 files changed, 27 insertions, 2 deletions
diff --git a/winsup/cygwin/devices.gperf b/winsup/cygwin/devices.gperf
index fd42e46..63ee935 100644
--- a/winsup/cygwin/devices.gperf
+++ b/winsup/cygwin/devices.gperf
@@ -46,7 +46,32 @@ struct device;
"/dev/fd", FH_FLOPPY, "\\Device\\Floppy%d", 0, 15
"/dev/scd", FH_CDROM, "\\Device\\CdRom%d", 0, 15
"/dev/sr", FH_CDROM, "\\Device\\CdRom%d", 0, 15
-"/dev/sd", FH_SD, "\\Device\\Harddisk%d\\Partition%d", 'a', 'z', -'a', 16
+"/dev/sda", FH_SDA, "\\Device\\Harddisk%d\\Partition%d", 1, 16, -1
+"/dev/sdb", FH_SDB, "\\Device\\Harddisk%d\\Partition%d", 1, 16, 15
+"/dev/sdc", FH_SDC, "\\Device\\Harddisk%d\\Partition%d", 1, 16, 31
+"/dev/sdd", FH_SDD, "\\Device\\Harddisk%d\\Partition%d", 1, 16, 47
+"/dev/sde", FH_SDE, "\\Device\\Harddisk%d\\Partition%d", 1, 16, 63
+"/dev/sdf", FH_SDF, "\\Device\\Harddisk%d\\Partition%d", 1, 16, 79
+"/dev/sdg", FH_SDG, "\\Device\\Harddisk%d\\Partition%d", 1, 16, 95
+"/dev/sdh", FH_SDH, "\\Device\\Harddisk%d\\Partition%d", 1, 16, 111
+"/dev/sdi", FH_SDI, "\\Device\\Harddisk%d\\Partition%d", 1, 16, 127
+"/dev/sdj", FH_SDJ, "\\Device\\Harddisk%d\\Partition%d", 1, 16, 143
+"/dev/sdk", FH_SDK, "\\Device\\Harddisk%d\\Partition%d", 1, 16, 159
+"/dev/sdl", FH_SDL, "\\Device\\Harddisk%d\\Partition%d", 1, 16, 175
+"/dev/sdm", FH_SDM, "\\Device\\Harddisk%d\\Partition%d", 1, 16, 191
+"/dev/sdn", FH_SDN, "\\Device\\Harddisk%d\\Partition%d", 1, 16, 207
+"/dev/sdo", FH_SDO, "\\Device\\Harddisk%d\\Partition%d", 1, 16, 223
+"/dev/sdp", FH_SDP, "\\Device\\Harddisk%d\\Partition%d", 1, 16, 239
+"/dev/sdq", FH_SDQ, "\\Device\\Harddisk%d\\Partition%d", 1, 16, 255 /* FIXME 8 bit lunacy */
+"/dev/sdr", FH_SDR, "\\Device\\Harddisk%d\\Partition%d", 1, 16, 271
+"/dev/sds", FH_SDS, "\\Device\\Harddisk%d\\Partition%d", 1, 16, 287
+"/dev/sdt", FH_SDT, "\\Device\\Harddisk%d\\Partition%d", 1, 16, 303
+"/dev/sdu", FH_SDU, "\\Device\\Harddisk%d\\Partition%d", 1, 16, 319
+"/dev/sdv", FH_SDV, "\\Device\\Harddisk%d\\Partition%d", 1, 16, 335
+"/dev/sdw", FH_SDW, "\\Device\\Harddisk%d\\Partition%d", 1, 16, 351
+"/dev/sdx", FH_SDX, "\\Device\\Harddisk%d\\Partition%d", 1, 16, 367
+"/dev/sdy", FH_SDY, "\\Device\\Harddisk%d\\Partition%d", 1, 16, 383
+"/dev/sdz", FH_SDZ, "\\Device\\Harddisk%d\\Partition%d", 1, 16, 399
"/dev/rawdrive", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
":bad:", FH_BAD, ":bad:", 0, 0, 0, 0
%%
@@ -65,7 +90,7 @@ device::parse (const char *s)
if (++len < prior_len)
{
dev = lookup (s, len);
- if (!dev || (!dev->upper && ! dev->devn == FH_TTY))
+ if (!dev || (!dev->upper && !dev->devn == FH_TTY))
dev = NULL;
else
{