remove from trunk

2 files changed, 0 insertions, 297 deletions

diff --git a/winsup/cygwin/devices.gperf b/winsup/cygwin/devices.gperf
deleted file mode 100644
index b764e070e..000000000
--- a/winsup/cygwin/devices.gperf
+++ /dev/null
@@ -1,175 +0,0 @@
-%{
-#include "winsup.h"
-#include <sys/types.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <string.h>
-#include "devices.h"
-#include "sys/cygwin.h"
-#include "tty.h"
-#include "pinfo.h"
-#undef __GNUC__
-static unsigned int devhash (const char *, unsigned)
-  __attribute__ ((regparm (2)));
-%}
-struct device;
-%%
-"/dev/tty", FH_TTY, "\\dev\\tty", 0, 255, 0, 0
-"/dev/ttys", FH_TTYS, "\\dev\\tty%d", 0, 255, 0, 0
-"/dev/console", FH_CONSOLE, "\\dev\\console", 0, 0, 0, 0
-"/dev/ttym", FH_TTYM, "\\dev\\ttym", 0, 255, 0, 0
-"/dev/ptmx", FH_PTYM, "\\dev\\ptmx", 0, 0, 0, 0
-"/dev/windows", FH_WINDOWS, "\\dev\\windows", 0, 0, 0, 0
-"/dev/dsp", FH_OSS_DSP, "\\dev\\dsp", 0, 0, 0, 0
-"/dev/conin", FH_CONIN, "conin", 0, 0, 0, 0
-"/dev/conout", FH_CONOUT, "conout", 0, 0, 0, 0
-"/dev/null", FH_NULL, "nul", 0, 0, 0, 0
-"/dev/zero", FH_ZERO, "\\dev\\zero", 0, 0, 0, 0
-"/dev/random", FH_RANDOM, "\\dev\\random", 0, 0, 0, 0
-"/dev/urandom", FH_URANDOM, "\\dev\\urandom", 0, 0, 0, 0
-"/dev/mem", FH_MEM, "\\dev\\mem", 0, 0, 0, 0
-"/dev/clipboard", FH_CLIPBOARD, "\\dev\\clipboard", 0, 0, 0, 0
-"/dev/port", FH_PORT, "\\dev\\port", 0, 0, 0, 0
-"/dev/com", FH_SERIAL, "\\.\\com%d", 1, 99
-"/dev/ttyS", FH_SERIAL, "\\.\\com%d", 0, 99, -1
-"/dev/pipe", FH_PIPE, "\\dev\\pipe", 0, 0, 0, 0
-"/dev/piper", FH_PIPER, "\\dev\\piper", 0, 0, 0, 0
-"/dev/pipew", FH_PIPEW, "\\dev\\pipew", 0, 0, 0, 0
-"/dev/streamsocket", FH_SOCKET, "\\dev\\socket", 0, 0, 0, 0
-"/dev/tcp", FH_SOCKET, "\\dev\\socket", 0, 0, 0, 0
-"/dev/udp", FH_SOCKET, "\\dev\\socket", 0, 0, 0, 0
-"/dev/dgsocket", FH_SOCKET, "\\dev\\socket", 0, 0, 0, 0
-"/dev/st", FH_TAPE, "\\Device\\Tape%d", 0, 127
-"/dev/nst", FH_NTAPE, "\\Device\\Tape%d", 0, 127
-"/dev/fd", FH_FLOPPY, "\\Device\\Floppy%d", 0, 15
-"/dev/scd", FH_CDROM, "\\Device\\CdRom%d", 0, 15
-"/dev/sd", FH_SD, "\\Device\\Harddisk%d\\Partition%d", 'a', 'z', -'a', 16
-"/dev/tape", FH_TAPE, "\\Device\\Tape%d", 0, 127, 0, 0
-"/dev/ntape", FH_NTAPE, "\\Device\\Tape%d", 0, 127, 128, 0
-"\\\\.\\tape", FH_TAPE, "\\Device\\Tape%d", 0, 127, 0, 0
-"\\\\.\\ntape", FH_NTAPE, "\\Device\\Tape%d", 0, 127, 128, 0
-"\\\\.\\physicaldrive", FH_SD, "\\Device\\Harddisk%d\\Partition%d", 0, 224, 0, 16
-"\\\\.\\a:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"\\\\.\\b:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"\\\\.\\c:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"\\\\.\\d:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"\\\\.\\e:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"\\\\.\\f:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"\\\\.\\g:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"\\\\.\\h:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"\\\\.\\i:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"\\\\.\\j:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"\\\\.\\k:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"\\\\.\\l:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"\\\\.\\m:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"\\\\.\\n:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"\\\\.\\o:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"\\\\.\\p:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"\\\\.\\q:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"\\\\.\\r:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"\\\\.\\s:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"\\\\.\\t:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"\\\\.\\u:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"\\\\.\\v:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"\\\\.\\w:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"\\\\.\\x:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"\\\\.\\y:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"\\\\.\\z:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"////.//tape", FH_TAPE, "//Device//Tape%d", 0, 127, 0, 0
-"////.//ntape", FH_NTAPE, "//Device//Tape%d", 0, 127, 128, 0
-"//./physicaldrive", FH_SD, "\\Device\\Harddisk%d\\Partition%d", 0, 224, 0, 16
-"//./a:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"//./b:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"//./c:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"//./d:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"//./e:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"//./f:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"//./g:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"//./h:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"//./i:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"//./j:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"//./k:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"//./l:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"//./m:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"//./n:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"//./o:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"//./p:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"//./q:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"//./r:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"//./s:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"//./t:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"//./u:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"//./v:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"//./w:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"//./x:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"//./y:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-"//./z:", FH_RAWDRIVE, "\\DosDevices\\%c:", 0, 0, 0, 0
-%%
-void
-device::parse (const char *s)
-{
-  size_t len = strlen (s);
-  const device *dev = lookup (s, len);
-  unsigned unit = 0;
-
-  if (!dev || !*dev)
-    {
-      size_t prior_len = len;
-      while (len-- > 0 && isdigit (s[len]))
-	continue;
-      if (++len < prior_len)
-	{
-	  dev = lookup (s, len);
-	  if (!dev || !dev->upper)
-	    dev = NULL;
-	  else
-	    {
-	      unsigned n = atoi (s + len);
-	      if (dev->devn == FH_TTY)
-		dev = ttys_dev;         // SIGH
-	      if (n >= dev->lower && n <= dev->upper)
-		unit = n;
-	    }
-	}
-    }
-
-  if (!dev || !*dev)
-    devn = 0;
-  else
-    {
-      if (dev->devn != FH_TTY)
-	*this = *dev;
-      else
-	{
-	  if (!real_tty_attached (myself))
-	    *this = *console_dev;
-	  else
-	    {
-	      unit = myself->ctty;
-	      *this = *ttys_dev;
-	    }
-	}
-      if (!setunit (unit))
-	devn = 0;
-    }
-}
-
-const device *console_dev;
-const device *piper_dev;
-const device *pipew_dev;
-const device *socket_dev;
-const device *ttym_dev;
-const device *ttys_dev;
-const device *urandom_dev;
-
-void
-device::init ()
-{
-  piper_dev = lookup ("/dev/piper", sizeof ("/dev/piper") - 1);
-  pipew_dev = lookup ("/dev/pipew", sizeof ("/dev/pipew") - 1);
-  console_dev = lookup ("/dev/console", sizeof ("/dev/console") - 1);
-  ttym_dev = lookup ("/dev/ttym", sizeof ("/dev/ttym") - 1);
-  ttys_dev = lookup ("/dev/ttys", sizeof ("/dev/ttys") - 1);
-  socket_dev = lookup ("/dev/tcp", sizeof ("/dev/tcp") - 1);
-  urandom_dev = lookup ("/dev/urandom", sizeof ("/dev/urandom") - 1);
-}
diff --git a/winsup/cygwin/devices.h b/winsup/cygwin/devices.h
deleted file mode 100644
index 97002ed2d..000000000
--- a/winsup/cygwin/devices.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/* devices.h
-
-   Copyright 2002 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-/* Change this if we use another size for devices */
-#define FHDEV(maj, min) ((((unsigned) (maj)) << 16) | (unsigned) (min))
-
-typedef unsigned short _major_t;
-typedef unsigned short _minor_t;
-typedef unsigned char _devtype_t;
-typedef __dev32_t _dev_t;
-
-enum fh_devices
-{
-  /* "Slow" devices */
-  FH_TTY     = FHDEV (5, 0),
-  FH_CONSOLE = FHDEV (5, 1),
-  FH_CONIN   = FHDEV (5, 512),
-  FH_CONOUT  = FHDEV (5, 513),
-  FH_PTYM    = FHDEV (5, 2),	/* /dev/ptmx */
-
-  DEV_TTYM_MAJOR = 128,
-  FH_TTYM    = FHDEV (128, 0),
-  FH_TTYM_MAX= FHDEV (128, 255),
-
-  DEV_TTYS_MAJOR = 136,
-  FH_TTYS    = FHDEV (DEV_TTYS_MAJOR, 0),	/* FIXME: Should separate ttys and ptys */
-  FH_TTYS_MAX= FHDEV (DEV_TTYS_MAJOR, 255),	/* FIXME: Should separate ttys and ptys */
-
-  DEV_SERIAL_MAJOR = 117,
-  FH_SERIAL  = FHDEV (117, 0),	/* /dev/ttyS? */
-
-  FH_PIPE    = FHDEV (0, 512),
-  FH_PIPER   = FHDEV (0, 513),
-  FH_PIPEW   = FHDEV (0, 514),
-  FH_FIFO    = FHDEV (0, 515),
-  FH_SOCKET  = FHDEV (0, 516),
-  FH_WINDOWS = FHDEV (13, 512),
-
-  /* Fast devices */
-  FH_FS      = FHDEV (0, 517),	/* filesystem based device */
-
-  DEV_FLOPPY_MAJOR = 2,
-  FH_FLOPPY  = FHDEV (DEV_FLOPPY_MAJOR, 0),
-
-  DEV_CDROM_MAJOR = 11,
-  FH_CDROM   = FHDEV (DEV_CDROM_MAJOR, 0),
-
-  DEV_TAPE_MAJOR = 9,
-  FH_TAPE    = FHDEV (DEV_TAPE_MAJOR, 0),
-  FH_NTAPE   = FHDEV (DEV_TAPE_MAJOR, 128),
-  FH_MAXNTAPE= FHDEV (DEV_TAPE_MAJOR, 255),
-
-  DEV_SD_MAJOR = 8,
-  FH_SD      = FHDEV (8, 0),
-
-  FH_NULL    = FHDEV (1, 3),
-  FH_ZERO    = FHDEV (1, 4),
-  FH_PORT    = FHDEV (1, 5),
-  FH_RANDOM  = FHDEV (1, 8),
-  FH_URANDOM = FHDEV (1, 9),
-  FH_MEM     = FHDEV (1, 1),
-  FH_CLIPBOARD=FHDEV (13, 513),
-  FH_OSS_DSP = FHDEV (14, 3),
-
-  DEV_CYGDRIVE_MAJOR = 30,
-  FH_CYGDRIVE= FHDEV (DEV_CYGDRIVE_MAJOR, 0),
-  FH_CYGDRIVE_A= FHDEV (DEV_CYGDRIVE_MAJOR, 'a'),
-  FH_CYGDRIVE_Z= FHDEV (DEV_CYGDRIVE_MAJOR, 'z'),
-
-  FH_PROC    = FHDEV (0, 519),
-  FH_REGISTRY= FHDEV (0, 520),
-  FH_PROCESS = FHDEV (0, 521),
-
-  DEV_RAWDRIVE_MAJOR = 65,
-  FH_RAWDRIVE= FHDEV (DEV_RAWDRIVE_MAJOR, 0),
-
-  FH_BAD     = 0
-};
-
-struct device
-{
-  const char *name;
-  union
-  {
-    _dev_t devn;
-    struct
-    {
-      _minor_t minor;
-      _major_t major;
-    };
-  };
-  const char *fmt;
-  unsigned lower, upper;
-  int adjust;
-  unsigned mul;
-  _devtype_t type;
-  static const device *lookup (const char *, unsigned int = 0xffffffff);
-  void parse (const char *);
-  inline bool setunit (unsigned n)
-  {
-    if (mul && n > mul)
-      return false;
-    minor += (n + adjust) * (mul ?: 1);
-    return true;
-  }
-  static void init ();
-  inline operator int () const {return devn;}
-};
-
-extern const device *console_dev;
-extern const device *piper_dev;
-extern const device *pipew_dev;
-extern const device *socket_dev;
-extern const device *ttym_dev;
-extern const device *ttys_dev;