mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-30 11:00:41 +08:00
23771fa1f7
logs easier. Throughout, change /dev/tty* to /dev/pty*. Throughout, add flags argument to fhandler_*::dup methods. * devices.in: Rename (temporarily?) /dev/ttyN to /dev/ptyN. Add /dev/ptymN devices for pty masters. * devices.cc: Regenerate. * devices.h (MAX_CONSOLES): Set to max number supported by devices.in. (fh_devices::FH_PTMX): Rename from FH_PTYM. (device::operator int): Return by reference. * dtable.cc (fh_alloc): Take pc as an argument rather than just the device. This makes debugging easier since more information is available. Actually implement handling for already-allocated pty master devices. Make different decisions when generating fhandler for not-opened devices. Add kludge to deal with opening /dev/tty. (cnew_no_ctor): New macro. (build_fh_pc): Make debugging output more verbose. Use new clone() fhandler interface to duplicate archetypes. Reset last term opened. (dtable::dup_worker): Use Use new clone() fhandler interface to duplicate archetypes. Pass flags to child dup handler. (dtable::dup3): Set O_NOCTTY flag if newfd is not stdin/stdout/stderr. * fhandler.cc (fhandler_base::reset): Rename from operator =() and reduce functionality and sense of copy direction. (fhandler_base::open_with_arch): Use published interface to query io_handle(). Use new copyto() fhandler method to copy from/to found archetype. * fhandler.h: Throughout, delete size(), add copyout, clone, and fhandler_* (void *) methods. (fhandler_base::reset): Rename from operator =(). (fhandler_termios::is_dev_tty): Delete. (fhandler_termios): change "protected" region to "private". (fhandler_termios::is_dev_tty): Delete. (fhandler_termios): Rearrange protected/public. (fhandler_termios::fhandler_termios): Remember last fhandler_termios "opened". (fhandler_termios::~fhandler_termios): Forget last fhandler_termios opened. (ioctl): Rename from ioctl_termios. Take a void * argument. Reflect argument change in pinfo::set_ctty. (fhandler_console::dup): Declare new function. Set ctty here if appropriate. (fhandler_pty_master::from_master): Privatize. (fhandler_pty_master::to_master): Ditto. (fhandler_pty_master::dwProcessId): Ditto. (fhandler_pty_master::fhandler_pty_master): Add an `int' argument. (fhandler_pty_master::open_setup): Declare new function. (fhandler_pty_master::~fhandler_pty_master): Declare new method. (fhandler_nodevice): Remove commented out function declaration. * fhandler_console.cc: Use get_ttyp() instead of tc() throughout. (fhandler_console::dup): Define new function to set controlling ctty on dup, as appropriate. (fhandler_console::ioctl): Reflect ioctl_termios name change. (fhandler_console::setup): Rename from get_tty_stuff. (fhandler_console::open_setup): Reflect argument change in pinfo::set_ctty. (fhandler_console::fhandler_console): Set _tc here. * fhandler_termios.cc (handler_termios::ioctl): Rename. Take a void * arg like other ioctl functions. * fhandler_tty.cc (fhandler_pty_slave::dup): Call myself->set_ctty to potentially reset the controlling terminal. (fhandler_pty_slave::ioctl): Reflect name/arg change for ioctl_termios. (fhandler_pty_slave::fhandler_pty_slave): Take a "unit" argument. Call setup() here so that we will know the unit number of this fhandler as soon as possible. Set the unit as appropriate. (handler_pty_master::open): Move most stuff to constructor and open_setup. (handler_pty_slave::open_setup): Reflect argument change in pinfo::set_ctty. (handler_pty_master::open_setup): Define new function. (fhandler_pty_master::cleanup): Clear handles as a flag that the destructor does not have to do "close" operations. (fhandler_pty_master::close): Ditto. (fhandler_pty_master::~fhandler_pty_master): Define new method. (fhandler_pty_master::ioctl): Reflect name/arg change for ioctl_termios. (fhandler_pty_master::setup): Allocate tty here. Rely on handles being returned from allocated test rather than opening them here. Avoid setting _need_nl here since it is already zeroed in the constructor. Set up device information with DEV_TTYM_MAJOR. * path.h (path_conv &operator =): Take a const argument. (path_conv::dup): Ditto. (pathconv_arg::PC_OPEN): New enum. (pathconv_arg::PC_CTTY): Ditto. (path_types::PATH_CTTY): Ditto. (path_types::PATH_OPEN): Ditto. (path_conv::isopen): New method. (path_conv::isctty_capable): Ditto. * path.cc (path_conv::check): Set PATH_OPEN and PATH_CTTY as appropriate. * pipe.cc (fhandler_pipe::open): Use copyto to copy pipe handle. * syscall.cc (open): Reinstate fd > 2 check to disallow resetting ctty on non-std* handles. * tty.cc (tty_list::allocate): Pass out handles for allocated tty. use `not_allocated' to find unallocated ttys. Avoid keeping the lock since the allocation of the tty should be sufficient to prevent multiple access. (tty::not_allocated): Clarify comment. Rename. Return handles when an unused tty is found. Simply test for existing tty. (tty::exists): Rewrite to use `not_allocated'. * tty.h (NTTYS): Reset down to actual number supported by devices.in. (tty::not_allocated): Declare new function. (tty_list::allocate): Pass out read/write tty handles. Zero them when not found. * fhandler_proc.cc: Reflect name change from FH_PTYM -> FH_PTMX. * pinfo.h (pinfo::set_ctty): Reduce/reorder arguments passed in. * pinfo.cc (pinfo::set_ctty): Ditto. Just use tc() built into the passed-in fhandler_termios pointer. Return true if ctty is assigned. * syscalls.cc (open): Call build_fh_pc with PC_OPEN flag. Set PC_CTTY if appropriate. (stat_worker): Remove is_dev_tty () stuff.
198 lines
5.7 KiB
Plaintext
198 lines
5.7 KiB
Plaintext
%import {
|
|
#include "winsup.h"
|
|
#include "devices.h"
|
|
#include "sys/cygwin.h"
|
|
#include "tty.h"
|
|
#include "pinfo.h"
|
|
typedef const device *KR_device_t;
|
|
}
|
|
%type KR_device_t
|
|
%local {
|
|
const device dev_cygdrive_storage =
|
|
{"/cygdrive", {FH_CYGDRIVE}, "/cygdrive"};
|
|
|
|
const device dev_fs_storage =
|
|
{"", {FH_FS}, ""};
|
|
|
|
const device dev_proc_storage =
|
|
{"", {FH_PROC}, ""};
|
|
|
|
const device dev_procnet_storage =
|
|
{"", {FH_PROCNET}, ""};
|
|
|
|
const device dev_procsys_storage =
|
|
{"", {FH_PROCSYS}, ""};
|
|
|
|
const device dev_procsysvipc_storage =
|
|
{"", {FH_PROCSYSVIPC}, ""};
|
|
|
|
const device dev_netdrive_storage =
|
|
{"", {FH_NETDRIVE}, ""};
|
|
|
|
#if 0
|
|
const device dev_dev_storage =
|
|
{"/dev", {FH_DEV}, "/dev"};
|
|
#endif
|
|
|
|
const device dev_registry_storage =
|
|
{"", {FH_REGISTRY}, ""};
|
|
|
|
const device dev_piper_storage =
|
|
{"", {FH_PIPER}, ""};
|
|
|
|
const device dev_pipew_storage =
|
|
{"", {FH_PIPEW}, ""};
|
|
|
|
const device dev_tcp_storage =
|
|
{"", {FH_TCP}, ""};
|
|
|
|
const device dev_udp_storage =
|
|
{"", {FH_UDP}, ""};
|
|
|
|
const device dev_stream_storage =
|
|
{"", {FH_STREAM}, ""};
|
|
|
|
const device dev_dgram_storage =
|
|
{"", {FH_DGRAM}, ""};
|
|
|
|
const device dev_bad_storage =
|
|
{"", {FH_NADA}, ""};
|
|
|
|
const device dev_error_storage =
|
|
{"", {FH_ERROR}, ""};
|
|
#define BRACK(x) {devn_int: x}
|
|
|
|
%storage_here
|
|
}
|
|
%%
|
|
"/dev/tty", BRACK(FH_TTY), "/dev/tty"
|
|
"/dev/pty%(0-63)d", BRACK(FHDEV(DEV_TTYS_MAJOR, {$1})), "/dev/pty{$1}", ttys_dev
|
|
"/dev/ptym%(0-63)d", BRACK(FHDEV(DEV_TTYM_MAJOR, {$1})), "/dev/ptym{$1}", ttym_dev
|
|
"/dev/cons%(0-63)d", BRACK(FHDEV(DEV_CONS_MAJOR, {$1})), "/dev/cons{$1}", cons_dev
|
|
"/dev/console", BRACK(FH_CONSOLE), "/dev/console", console_dev
|
|
"/dev/ptmx", BRACK(FH_PTMX), "/dev/ptmx"
|
|
"/dev/windows", BRACK(FH_WINDOWS), "/dev/windows"
|
|
"/dev/dsp", BRACK(FH_OSS_DSP), "/dev/dsp"
|
|
"/dev/conin", BRACK(FH_CONIN), "/dev/conin"
|
|
"/dev/conout", BRACK(FH_CONOUT), "/dev/conout"
|
|
"/dev/null", BRACK(FH_NULL), "\\Device\\Null"
|
|
"/dev/zero", BRACK(FH_ZERO), "/dev/zero"
|
|
"/dev/full", BRACK(FH_FULL), "/dev/full"
|
|
"/dev/random", BRACK(FH_RANDOM), "/dev/random"
|
|
"/dev/urandom", BRACK(FH_URANDOM), "/dev/urandom", urandom_dev
|
|
"/dev/mem", BRACK(FH_MEM), "/dev/mem"
|
|
"/dev/kmem", BRACK(FH_KMEM), "/dev/mem"
|
|
"/dev/clipboard", BRACK(FH_CLIPBOARD), "/dev/clipboard"
|
|
"/dev/port", BRACK(FH_PORT), "/dev/port"
|
|
"/dev/com%(1-16)d", BRACK(FHDEV(DEV_SERIAL_MAJOR, {$1 - 1})), "\\??\\COM{$1}"
|
|
"/dev/ttyS%(0-63)d", BRACK(FHDEV(DEV_SERIAL_MAJOR, {$1})), "\\??\\COM{$1 + 1}"
|
|
"/dev/pipe", BRACK(FH_PIPE), "/dev/pipe"
|
|
"/dev/fifo", BRACK(FH_FIFO), "/dev/fifo"
|
|
"/dev/st%(0-127)d", BRACK(FHDEV(DEV_TAPE_MAJOR, {$1})), "\\Device\\Tape{$1}"
|
|
"/dev/nst%(0-127)d", BRACK(FHDEV(DEV_TAPE_MAJOR, {$1 + 128})), "\\Device\\Tape{$1}"
|
|
"/dev/fd%(0-15)d", BRACK(FHDEV(DEV_FLOPPY_MAJOR, {$1})), "\\Device\\Floppy{$1}"
|
|
"/dev/scd%(0-15)d", BRACK(FHDEV(DEV_CDROM_MAJOR, {$1})), "\\Device\\CdRom{$1}"
|
|
"/dev/sr%(0-15)d", BRACK(FHDEV(DEV_CDROM_MAJOR, {$1})), "\\Device\\CdRom{$1}"
|
|
"/dev/sd%{a-z}s", BRACK(FH_SD{uc $1}), "\\Device\\Harddisk{ord($1) - ord('a')}\\Partition0"
|
|
"/dev/sda%{a-z}s", BRACK(FH_SDA{uc $1}), "\\Device\\Harddisk{26 + ord($1) - ord('a')}\\Partition0"
|
|
"/dev/sdb%{a-z}s", BRACK(FH_SDB{uc $1}), "\\Device\\Harddisk{52 + ord($1) - ord('a')}\\Partition0"
|
|
"/dev/sdc%{a-z}s", BRACK(FH_SDC{uc $1}), "\\Device\\Harddisk{78 + ord($1) - ord('a')}\\Partition0"
|
|
"/dev/sdd%{a-x}s", BRACK(FH_SDD{uc $1}), "\\Device\\Harddisk{104 + ord($1) - ord('a')}\\Partition0"
|
|
"/dev/sd%{a-z}s%(1-15)d", BRACK(FH_SD{uc $1} | {$2}), "\\Device\\Harddisk{ord($1) - ord('a')}\\Partition{$2 % 16}"
|
|
"/dev/sda%{a-z}s%(1-15)d", BRACK(FH_SDA{uc $1} | {$2}), "\\Device\\Harddisk{26 + ord($1) - ord('a')}\\Partition{$2 % 16}"
|
|
"/dev/sdb%{a-z}s%(1-15)d", BRACK(FH_SDB{uc $1} | {$2}), "\\Device\\Harddisk{52 + ord($1) - ord('a')}\\Partition{$2 % 16}"
|
|
"/dev/sdc%{a-z}s%(1-15)d", BRACK(FH_SDC{uc $1} | {$2}), "\\Device\\Harddisk{78 + ord($1) - ord('a')}\\Partition{$2 % 16}"
|
|
"/dev/sdd%{a-x}s%(1-15)d", BRACK(FH_SDD{uc $1} | {$2}), "\\Device\\Harddisk{104 + ord($1) - ord('a')}\\Partition{$2 % 16}"
|
|
"/dev/kmsg", BRACK(FH_KMSG), "\\Device\\MailSlot\\cygwin\\dev\\kmsg"
|
|
"/dev", BRACK(FH_DEV), "/dev"
|
|
%other {return NULL;}
|
|
%%
|
|
#undef BRACK
|
|
void
|
|
device::parse (const char *s)
|
|
{
|
|
size_t len = strlen (s);
|
|
const device *dev = KR_find_keyword (s, len);
|
|
|
|
if (!dev)
|
|
*this = *fs_dev;
|
|
else
|
|
*this = *dev;
|
|
}
|
|
|
|
void
|
|
device::init ()
|
|
{
|
|
/* nothing to do... yet */
|
|
}
|
|
|
|
void
|
|
device::parse (_major_t major, _minor_t minor)
|
|
{
|
|
_dev_t dev = FHDEV (major, minor);
|
|
|
|
d.devn = 0;
|
|
|
|
for (unsigned i = 0; i < (sizeof (dev_storage) / sizeof (dev_storage[0])); i++)
|
|
if (dev_storage[i].d.devn == dev)
|
|
{
|
|
*this = dev_storage[i];
|
|
break;
|
|
}
|
|
|
|
if (!*this)
|
|
d.devn = FHDEV (major, minor);
|
|
}
|
|
|
|
void
|
|
device::parse (_dev_t dev)
|
|
{
|
|
parse (_major (dev), _minor (dev));
|
|
}
|
|
|
|
void
|
|
device::parsedisk (int drive, int part)
|
|
{
|
|
int base;
|
|
if (drive < ('q' - 'a')) /* /dev/sda -to- /dev/sdp */
|
|
base = DEV_SD_MAJOR;
|
|
else if (drive < 32) /* /dev/sdq -to- /dev/sdaf */
|
|
{
|
|
base = DEV_SD1_MAJOR;
|
|
drive -= 'q' - 'a';
|
|
}
|
|
else if (drive < 48) /* /dev/sdag -to- /dev/sdav */
|
|
{
|
|
base = DEV_SD2_MAJOR;
|
|
drive -= 32;
|
|
}
|
|
else if (drive < 64) /* /dev/sdaw -to- /dev/sdbl */
|
|
{
|
|
base = DEV_SD3_MAJOR;
|
|
drive -= 48;
|
|
}
|
|
else if (drive < 80) /* /dev/sdbm -to- /dev/sdcb */
|
|
{
|
|
base = DEV_SD4_MAJOR;
|
|
drive -= 64;
|
|
}
|
|
else if (drive < 96) /* /dev/sdcc -to- /dev/sdcr */
|
|
{
|
|
base = DEV_SD5_MAJOR;
|
|
drive -= 80;
|
|
}
|
|
else if (drive < 112) /* /dev/sdcs -to- /dev/sddh */
|
|
{
|
|
base = DEV_SD6_MAJOR;
|
|
drive -= 96;
|
|
}
|
|
/* NOTE: This will cause multiple /dev/sddx entries in
|
|
/proc/partitions if there are more than 128 devices */
|
|
else /* /dev/sddi -to- /dev/sddx */
|
|
{
|
|
base = DEV_SD7_MAJOR;
|
|
drive -= 112;
|
|
}
|
|
parse (base, part + (drive * 16));
|
|
}
|