mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-16 19:40:07 +08:00
92ddb74290
* debug.cc (close_handle): Call debugger on failure. * devices.in (device::tty_to_real_device): Delete. * devices.h (device::tty_to_real_device): Ditto. * devices.cc: Regenerate. * dtable.cc: Delete old ifdef'ed vfork code. (dtable::release): Don't handle archetype here. (dtable::init_std_file_from_handle): Consolidate console tests. Generate major/minor for tty ASAP. Fix incorrect setting of DEV_TTYS* for serial. (fh_alloc): New function derived from build_fh_pc. Pass current tty when building tty. (build_pc_pc): Use fh_alloc to create. Set name from fh->dev if appropriate. Generate an archetype or point to one here. (dtable::dup_worker): Deal with archetypes. Rely on = operator copying whole class rather than just fhandler_base. (dtable::fixup_after_exec): Call close_with_arch to handle closing of fhandlers with archetypes. * fhandler.cc (fhandler_base::operator =): Call memcpy with fhandler's size() rather than sizeof fhandler_base. (fhandler_base::open_with_arch): New function. Handles opening of fhandler's with archetypes, dealing with usecounts, etc. (fhandler_base::close_with_arch): Ditto for close. * fhandler.h: Many changes for archetypes. (fhandler_base::set_name): Set both normalized path and regular path. (fhandler_base::open_with_arch): New function. (fhandler_base::open_setup): Ditto. (fhandler_base::use_archetype): Ditto. (fhandler_base::_archetype_usecount): Ditto. (fhandler_*::size): Ditto. (fhandler_dev_tape::open): Remove virtual decoration. (fhandler_console::use_archetype): New function. Return true. (fhandler_console::open_setup): New function. (fhandler_console::dup): Delete. (fhandler_tty_slave::fhandler_tty_slave): Redeclare to take an argument. (fhandler_tty_slave::use_archetype): New function. Return true. (fhandler_tty_slave::cleanup): New function. (fhandler_pty_master::use_archetype): New function. Return true. (fhandler_pty_master::cleanup): New function. (fhandler_pty_master::is_tty_master): New function. Return false. (fhandler_tty_master::is_tty_master): New function. Return true. (fhandler_dev_dsp::fhandler_dev_dsp): New function. Return true. (report_tty_counts): Only report on archetype's usecount if there is one. * fhandler_console.cc (fhandler_console::get_tty_stuff): Remove handling of setsid, set_ctty, set_flags, and manage_console_count. (fhandler_console::open_setup): New function. Implement functionality removed from get_tty_stuff. (fhandler_console::dup): Delete. (fhandler_console::output_tcsetattr): Set errno on error. (fhandler_console::fhandler_console): Set device early. (fhandler_console::init): Use open_with_arch to open console handles. (fhandler_console::fixup_after_fork_exec): Nuke most of the stuff for dealing with console handles. * fhandler_dsp.cc (fhandler_dev_dsp::open): Remove archetype handling. (fhandler_dev_dsp::write): Ditto. (fhandler_dev_dsp::read): Ditto. (fhandler_dev_dsp::close): Ditto. (fhandler_dev_dsp::dup): Ditto. (fhandler_dev_dsp::ioctl): Ditto. (fhandler_dev_dsp::fixup_after_fork): Ditto. (fhandler_dev_dsp::fixup_after_exec): Ditto. * fhandler_tty.cc (fhandler_tty_common::__acquire_output_mutex): Add a little more debugging. (fhandler_tty_common::__release_output_mutex): Ditto. (fhandler_pty_master::process_slave_output): Ditto. Don't do signal handling or pthread_cancel handling in the tty master thread. (process_output): Minor reorg. (fhandler_tty_slave::fhandler_tty_slave): Set device based on new ntty argument. (fhandler_tty_slave::open): Remove archetype handling. Move some processing into open_setup(). (fhandler_tty_slave::open_setup): New function. (fhandler_tty_slave::cleanup): New function. (fhandler_tty_slave::close): Remove archetype handling. Move some processing into cleanup(). (fhandler_tty_slave::init): Rename argument from f to h. Open device using open_with_arch(). Remove archetype handling. (fhandler_pty_master::dup): Ditto. (fhandler_pty_master::open): Ditto. (fhandler_pty_master::close): Ditto. Move some handling to cleanup(). (fhandler_pty_master::cleanup): New function. (fhandler_tty_master::init_console): Give unique name to captive console fhandler. * pinfo.cc (_pinfo::set_ctty): Rename argument from arch to fh. Eliminate archetype assumption. * syscalls.cc (close_all_files): Use close_with_arch for closing. (open): Use open_with_arch() rather than open(). (close): Use close_with_arch() rather than close().
194 lines
5.5 KiB
Plaintext
194 lines
5.5 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_BAD}, ""};
|
|
#define BRACK(x) {x}
|
|
|
|
%storage_here
|
|
}
|
|
%%
|
|
"/dev/tty", BRACK(FH_TTY), "/dev/tty"
|
|
"/dev/tty%(0-63)d", BRACK(FHDEV(DEV_TTYS_MAJOR, {$1})), "/dev/tty{$1}", ttys_dev
|
|
"/dev/console", BRACK(FH_CONSOLE), "/dev/console", console_dev
|
|
"/dev/ttym", BRACK(FH_TTYM), "/dev/ttym", ttym_dev
|
|
"/dev/ptmx", BRACK(FH_PTYM), "/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);
|
|
|
|
devn = 0;
|
|
|
|
for (unsigned i = 0; i < (sizeof (dev_storage) / sizeof (dev_storage[0])); i++)
|
|
if (dev_storage[i].devn == dev)
|
|
{
|
|
*this = dev_storage[i];
|
|
break;
|
|
}
|
|
|
|
if (!*this)
|
|
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));
|
|
}
|