* devices.in: Change raw com device to more correct form.

* 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.

5 files changed, 62 insertions, 54 deletions

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 07458195c..fec42cf2d 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,17 @@
+2004-01-21  Christopher Faylor  <cgf@redhat.com>
+
+	* devices.in: Change raw com device to more correct form.
+
+2004-01-21  Christopher Faylor  <cgf@redhat.com>
+
+	* 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.
+
 2004-01-21  Nicholas Wourms  <nwourms@netscape.net>
 
 	* signal.cc (sigaction): Fix if-statement typo.
diff --git a/winsup/cygwin/devices.cc b/winsup/cygwin/devices.cc
index b0193d09a..750334fbb 100644
--- a/winsup/cygwin/devices.cc
+++ b/winsup/cygwin/devices.cc
@@ -52,23 +52,23 @@ const device dev_bad_storage =
 static const device dev_storage[] =
 {
   {"/dev/clipboard", FH_CLIPBOARD, "\\dev\\clipboard"},
-  {"/dev/com0", FHDEV(DEV_SERIAL_MAJOR, 0), "\\.\\com0"},
-  {"/dev/com1", FHDEV(DEV_SERIAL_MAJOR, 1), "\\.\\com1"},
-  {"/dev/com2", FHDEV(DEV_SERIAL_MAJOR, 2), "\\.\\com2"},
-  {"/dev/com3", FHDEV(DEV_SERIAL_MAJOR, 3), "\\.\\com3"},
-  {"/dev/com4", FHDEV(DEV_SERIAL_MAJOR, 4), "\\.\\com4"},
-  {"/dev/com5", FHDEV(DEV_SERIAL_MAJOR, 5), "\\.\\com5"},
-  {"/dev/com6", FHDEV(DEV_SERIAL_MAJOR, 6), "\\.\\com6"},
-  {"/dev/com7", FHDEV(DEV_SERIAL_MAJOR, 7), "\\.\\com7"},
-  {"/dev/com8", FHDEV(DEV_SERIAL_MAJOR, 8), "\\.\\com8"},
-  {"/dev/com9", FHDEV(DEV_SERIAL_MAJOR, 9), "\\.\\com9"},
-  {"/dev/com10", FHDEV(DEV_SERIAL_MAJOR, 10), "\\.\\com10"},
-  {"/dev/com11", FHDEV(DEV_SERIAL_MAJOR, 11), "\\.\\com11"},
-  {"/dev/com12", FHDEV(DEV_SERIAL_MAJOR, 12), "\\.\\com12"},
-  {"/dev/com13", FHDEV(DEV_SERIAL_MAJOR, 13), "\\.\\com13"},
-  {"/dev/com14", FHDEV(DEV_SERIAL_MAJOR, 14), "\\.\\com14"},
-  {"/dev/com15", FHDEV(DEV_SERIAL_MAJOR, 15), "\\.\\com15"},
-  {"/dev/com16", FHDEV(DEV_SERIAL_MAJOR, 16), "\\.\\com16"},
+  {"/dev/com0", FHDEV(DEV_SERIAL_MAJOR, 0), "\\\\.\\com0"},
+  {"/dev/com1", FHDEV(DEV_SERIAL_MAJOR, 1), "\\\\.\\com1"},
+  {"/dev/com2", FHDEV(DEV_SERIAL_MAJOR, 2), "\\\\.\\com2"},
+  {"/dev/com3", FHDEV(DEV_SERIAL_MAJOR, 3), "\\\\.\\com3"},
+  {"/dev/com4", FHDEV(DEV_SERIAL_MAJOR, 4), "\\\\.\\com4"},
+  {"/dev/com5", FHDEV(DEV_SERIAL_MAJOR, 5), "\\\\.\\com5"},
+  {"/dev/com6", FHDEV(DEV_SERIAL_MAJOR, 6), "\\\\.\\com6"},
+  {"/dev/com7", FHDEV(DEV_SERIAL_MAJOR, 7), "\\\\.\\com7"},
+  {"/dev/com8", FHDEV(DEV_SERIAL_MAJOR, 8), "\\\\.\\com8"},
+  {"/dev/com9", FHDEV(DEV_SERIAL_MAJOR, 9), "\\\\.\\com9"},
+  {"/dev/com10", FHDEV(DEV_SERIAL_MAJOR, 10), "\\\\.\\com10"},
+  {"/dev/com11", FHDEV(DEV_SERIAL_MAJOR, 11), "\\\\.\\com11"},
+  {"/dev/com12", FHDEV(DEV_SERIAL_MAJOR, 12), "\\\\.\\com12"},
+  {"/dev/com13", FHDEV(DEV_SERIAL_MAJOR, 13), "\\\\.\\com13"},
+  {"/dev/com14", FHDEV(DEV_SERIAL_MAJOR, 14), "\\\\.\\com14"},
+  {"/dev/com15", FHDEV(DEV_SERIAL_MAJOR, 15), "\\\\.\\com15"},
+  {"/dev/com16", FHDEV(DEV_SERIAL_MAJOR, 16), "\\\\.\\com16"},
   {"/dev/conin", FH_CONIN, "conin"},
   {"/dev/conout", FH_CONOUT, "conout"},
   {"/dev/console", FH_CONSOLE, "\\dev\\console"},
@@ -866,22 +866,22 @@ static const device dev_storage[] =
   {"/dev/tty61", FHDEV(DEV_TTYS_MAJOR, 61), "\\dev\\tty61"},
   {"/dev/tty62", FHDEV(DEV_TTYS_MAJOR, 62), "\\dev\\tty62"},
   {"/dev/tty63", FHDEV(DEV_TTYS_MAJOR, 63), "\\dev\\tty63"},
-  {"/dev/ttyS0", FHDEV(DEV_SERIAL_MAJOR, 1), "\\.\\com1"},
-  {"/dev/ttyS1", FHDEV(DEV_SERIAL_MAJOR, 2), "\\.\\com2"},
-  {"/dev/ttyS2", FHDEV(DEV_SERIAL_MAJOR, 3), "\\.\\com3"},
-  {"/dev/ttyS3", FHDEV(DEV_SERIAL_MAJOR, 4), "\\.\\com4"},
-  {"/dev/ttyS4", FHDEV(DEV_SERIAL_MAJOR, 5), "\\.\\com5"},
-  {"/dev/ttyS5", FHDEV(DEV_SERIAL_MAJOR, 6), "\\.\\com6"},
-  {"/dev/ttyS6", FHDEV(DEV_SERIAL_MAJOR, 7), "\\.\\com7"},
-  {"/dev/ttyS7", FHDEV(DEV_SERIAL_MAJOR, 8), "\\.\\com8"},
-  {"/dev/ttyS8", FHDEV(DEV_SERIAL_MAJOR, 9), "\\.\\com9"},
-  {"/dev/ttyS9", FHDEV(DEV_SERIAL_MAJOR, 10), "\\.\\com10"},
-  {"/dev/ttyS10", FHDEV(DEV_SERIAL_MAJOR, 11), "\\.\\com11"},
-  {"/dev/ttyS11", FHDEV(DEV_SERIAL_MAJOR, 12), "\\.\\com12"},
-  {"/dev/ttyS12", FHDEV(DEV_SERIAL_MAJOR, 13), "\\.\\com13"},
-  {"/dev/ttyS13", FHDEV(DEV_SERIAL_MAJOR, 14), "\\.\\com14"},
-  {"/dev/ttyS14", FHDEV(DEV_SERIAL_MAJOR, 15), "\\.\\com15"},
-  {"/dev/ttyS15", FHDEV(DEV_SERIAL_MAJOR, 16), "\\.\\com16"},
+  {"/dev/ttyS0", FHDEV(DEV_SERIAL_MAJOR, 1), "\\\\.\\com1"},
+  {"/dev/ttyS1", FHDEV(DEV_SERIAL_MAJOR, 2), "\\\\.\\com2"},
+  {"/dev/ttyS2", FHDEV(DEV_SERIAL_MAJOR, 3), "\\\\.\\com3"},
+  {"/dev/ttyS3", FHDEV(DEV_SERIAL_MAJOR, 4), "\\\\.\\com4"},
+  {"/dev/ttyS4", FHDEV(DEV_SERIAL_MAJOR, 5), "\\\\.\\com5"},
+  {"/dev/ttyS5", FHDEV(DEV_SERIAL_MAJOR, 6), "\\\\.\\com6"},
+  {"/dev/ttyS6", FHDEV(DEV_SERIAL_MAJOR, 7), "\\\\.\\com7"},
+  {"/dev/ttyS7", FHDEV(DEV_SERIAL_MAJOR, 8), "\\\\.\\com8"},
+  {"/dev/ttyS8", FHDEV(DEV_SERIAL_MAJOR, 9), "\\\\.\\com9"},
+  {"/dev/ttyS9", FHDEV(DEV_SERIAL_MAJOR, 10), "\\\\.\\com10"},
+  {"/dev/ttyS10", FHDEV(DEV_SERIAL_MAJOR, 11), "\\\\.\\com11"},
+  {"/dev/ttyS11", FHDEV(DEV_SERIAL_MAJOR, 12), "\\\\.\\com12"},
+  {"/dev/ttyS12", FHDEV(DEV_SERIAL_MAJOR, 13), "\\\\.\\com13"},
+  {"/dev/ttyS13", FHDEV(DEV_SERIAL_MAJOR, 14), "\\\\.\\com14"},
+  {"/dev/ttyS14", FHDEV(DEV_SERIAL_MAJOR, 15), "\\\\.\\com15"},
+  {"/dev/ttyS15", FHDEV(DEV_SERIAL_MAJOR, 16), "\\\\.\\com16"},
   {"/dev/ttym", FH_TTYM, "\\dev\\ttym"},
   {"/dev/urandom", FH_URANDOM, "\\dev\\urandom"},
   {"/dev/windows", FH_WINDOWS, "\\dev\\windows"},
diff --git a/winsup/cygwin/devices.in b/winsup/cygwin/devices.in
index b55418f97..1bcb73bc7 100644
--- a/winsup/cygwin/devices.in
+++ b/winsup/cygwin/devices.in
@@ -65,8 +65,8 @@ const device dev_bad_storage =
 "/dev/kmem", FH_KMEM, "\\dev\\mem"
 "/dev/clipboard", FH_CLIPBOARD, "\\dev\\clipboard"
 "/dev/port", FH_PORT, "\\dev\\port"
-"/dev/com%(0-16)d", FHDEV(DEV_SERIAL_MAJOR, {$1}), "\\.\\com{$1}"
-"/dev/ttyS%(0-15)d", FHDEV(DEV_SERIAL_MAJOR, {$1 + 1}), "\\.\\com{$1 + 1}"
+"/dev/com%(0-16)d", FHDEV(DEV_SERIAL_MAJOR, {$1}), "\\\\.\\com{$1}"
+"/dev/ttyS%(0-15)d", FHDEV(DEV_SERIAL_MAJOR, {$1 + 1}), "\\\\.\\com{$1 + 1}"
 "/dev/pipe", FH_PIPE, "\\dev\\pipe"
 "/dev/fifo", FH_FIFO, "\\dev\\fifo"
 "/dev/st%(0-127)d", FHDEV(DEV_TAPE_MAJOR, {$1}), "\\Device\\Tape{$1}"
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,
diff --git a/winsup/cygwin/fhandler_raw.cc b/winsup/cygwin/fhandler_raw.cc
index 1ece53107..eb721a7e8 100644
--- a/winsup/cygwin/fhandler_raw.cc
+++ b/winsup/cygwin/fhandler_raw.cc
@@ -98,7 +98,7 @@ fhandler_dev_raw::writebuf (void)
       int ret = 0;
 
       memset (devbuf + devbufend, 0, devbufsiz - devbufend);
-      if (get_device () != FH_TAPE)
+      if (get_major () != DEV_TAPE_MAJOR)
 	to_write = ((devbufend - 1) / 512 + 1) * 512;
       else if (varblkop)
 	to_write = devbufend;
@@ -134,16 +134,10 @@ fhandler_dev_raw::fstat (struct __stat64 *buf)
 {
   debug_printf ("here");
 
-  switch (get_device ())
-    {
-    case FH_TAPE:
-    case FH_NTAPE:
-      buf->st_mode = S_IFCHR | STD_RBITS | STD_WBITS | S_IWGRP | S_IWOTH;
-      break;
-    default:
-      buf->st_mode = S_IFBLK | STD_RBITS | STD_WBITS | S_IWGRP | S_IWOTH;
-      break;
-    }
+  if (get_major () == DEV_TAPE_MAJOR)
+    buf->st_mode = S_IFCHR | STD_RBITS | STD_WBITS | S_IWGRP | S_IWOTH;
+  else
+    buf->st_mode = S_IFBLK | STD_RBITS | STD_WBITS | S_IWGRP | S_IWOTH;
 
   buf->st_uid = geteuid32 ();
   buf->st_gid = getegid32 ();
@@ -176,7 +170,7 @@ fhandler_dev_raw::open (int flags, mode_t)
   flags |= O_BINARY;
 
   DWORD access = GENERIC_READ | SYNCHRONIZE;
-  if (get_device () == FH_TAPE
+  if (get_major () == DEV_TAPE_MAJOR
       || (flags & (O_RDONLY | O_WRONLY | O_RDWR)) == O_WRONLY
       || (flags & (O_RDONLY | O_WRONLY | O_RDWR)) == O_RDWR)
     access |= GENERIC_WRITE;
@@ -274,7 +268,7 @@ fhandler_dev_raw::raw_read (void *ptr, size_t& ulen)
 	    {
 	      if (!varblkop && len >= devbufsiz)
 		{
-		  if (get_device () == FH_TAPE)
+		  if (get_major () == DEV_TAPE_MAJOR)
 		    bytes_to_read = (len / devbufsiz) * devbufsiz;
 		  else
 		    bytes_to_read = (len / 512) * 512;
@@ -538,7 +532,7 @@ fhandler_dev_raw::ioctl (unsigned int cmd, void *buf)
 	switch (op->rd_op)
 	  {
 	  case RDSETBLK:
-	    if (get_device () == FH_TAPE)
+	    if (get_major () == DEV_TAPE_MAJOR)
 	      {
 		struct mtop mop;