2000-02-17 20:38:33 +01:00
|
|
|
/* fhandler_tty.cc
|
|
|
|
|
2006-01-12 05:41:06 +01:00
|
|
|
Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
|
2010-01-13 12:06:21 +01:00
|
|
|
2006, 2007, 2008, 2009, 2010 Red Hat, Inc.
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
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. */
|
|
|
|
|
2000-08-02 18:28:18 +02:00
|
|
|
#include "winsup.h"
|
2000-02-17 20:38:33 +01:00
|
|
|
#include <stdlib.h>
|
2006-07-03 17:29:10 +02:00
|
|
|
#include <cygwin/kd.h>
|
2000-08-22 07:10:20 +02:00
|
|
|
#include "cygerrno.h"
|
2001-07-26 21:22:24 +02:00
|
|
|
#include "security.h"
|
2001-10-01 06:10:07 +02:00
|
|
|
#include "path.h"
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
#include "fhandler.h"
|
2000-08-12 07:35:42 +02:00
|
|
|
#include "dtable.h"
|
2000-08-22 07:10:20 +02:00
|
|
|
#include "sigproc.h"
|
2000-08-12 07:47:12 +02:00
|
|
|
#include "pinfo.h"
|
2010-04-19 21:52:43 +02:00
|
|
|
#include "ntdll.h"
|
2000-09-03 06:16:35 +02:00
|
|
|
#include "cygheap.h"
|
2000-09-07 18:23:51 +02:00
|
|
|
#include "shared_info.h"
|
2002-08-01 18:20:31 +02:00
|
|
|
#include "cygthread.h"
|
2006-06-02 17:41:34 +02:00
|
|
|
#include "child_info.h"
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2010-04-19 21:52:43 +02:00
|
|
|
#define close_maybe(h) \
|
|
|
|
do { \
|
|
|
|
if (h && h != INVALID_HANDLE_VALUE) \
|
|
|
|
CloseHandle (h); \
|
|
|
|
} while (0)
|
|
|
|
|
|
|
|
/* pty master control pipe messages */
|
|
|
|
struct pipe_request {
|
|
|
|
DWORD pid;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct pipe_reply {
|
|
|
|
HANDLE from_master;
|
|
|
|
HANDLE to_master;
|
|
|
|
DWORD error;
|
|
|
|
};
|
|
|
|
|
2006-06-02 17:41:34 +02:00
|
|
|
/* tty master stuff */
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
fhandler_tty_master NO_COPY *tty_master;
|
|
|
|
|
|
|
|
static DWORD WINAPI process_input (void *); // Input queue thread
|
|
|
|
static DWORD WINAPI process_output (void *); // Output queue thread
|
|
|
|
static DWORD WINAPI process_ioctl (void *); // Ioctl requests thread
|
|
|
|
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
fhandler_tty_master::fhandler_tty_master ()
|
|
|
|
: fhandler_pty_master (), console (NULL)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
fhandler_tty_slave::get_unit ()
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
return dev () == FH_TTY ? myself->ctty : dev ().minor;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2002-12-27 06:31:30 +01:00
|
|
|
void
|
|
|
|
fhandler_tty_master::set_winsize (bool sendSIGWINCH)
|
|
|
|
{
|
|
|
|
winsize w;
|
|
|
|
console->ioctl (TIOCGWINSZ, &w);
|
|
|
|
get_ttyp ()->winsize = w;
|
|
|
|
if (sendSIGWINCH)
|
|
|
|
tc->kill_pgrp (SIGWINCH);
|
|
|
|
}
|
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
int
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
fhandler_tty_master::init ()
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2003-10-01 14:36:39 +02:00
|
|
|
termios_printf ("Creating master for tty%d", get_unit ());
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
if (init_console ())
|
|
|
|
{
|
|
|
|
termios_printf ("can't create fhandler");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2006-06-03 23:44:01 +02:00
|
|
|
if (!setup (false))
|
2006-06-02 17:41:34 +02:00
|
|
|
return 1;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2002-12-27 06:31:30 +01:00
|
|
|
set_winsize (false);
|
|
|
|
|
2003-12-27 02:59:29 +01:00
|
|
|
set_close_on_exec (true);
|
2001-03-19 19:27:37 +01:00
|
|
|
|
2002-08-01 18:20:31 +02:00
|
|
|
cygthread *h;
|
2005-10-18 01:27:00 +02:00
|
|
|
h = new cygthread (process_input, 0, cygself, "ttyin");
|
2002-10-09 07:55:40 +02:00
|
|
|
h->SetThreadPriority (THREAD_PRIORITY_HIGHEST);
|
|
|
|
h->zap_h ();
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2005-10-18 01:27:00 +02:00
|
|
|
h = new cygthread (process_ioctl, 0, cygself, "ttyioctl");
|
2002-10-09 07:55:40 +02:00
|
|
|
h->SetThreadPriority (THREAD_PRIORITY_HIGHEST);
|
|
|
|
h->zap_h ();
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2005-10-18 01:27:00 +02:00
|
|
|
h = new cygthread (process_output, 0, cygself, "ttyout");
|
2002-10-09 07:55:40 +02:00
|
|
|
h->SetThreadPriority (THREAD_PRIORITY_HIGHEST);
|
|
|
|
h->zap_h ();
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef DEBUGGING
|
|
|
|
static class mutex_stack
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
const char *fn;
|
|
|
|
int ln;
|
|
|
|
const char *tname;
|
|
|
|
} ostack[100];
|
|
|
|
|
2001-09-06 06:41:59 +02:00
|
|
|
static int osi;
|
2000-02-17 20:38:33 +01:00
|
|
|
#endif /*DEBUGGING*/
|
|
|
|
|
|
|
|
DWORD
|
|
|
|
fhandler_tty_common::__acquire_output_mutex (const char *fn, int ln,
|
|
|
|
DWORD ms)
|
|
|
|
{
|
2005-12-29 21:46:34 +01:00
|
|
|
if (strace.active ())
|
2000-08-02 21:26:01 +02:00
|
|
|
strace.prntf (_STRACE_TERMIOS, fn, "(%d): tty output_mutex: waiting %d ms", ln, ms);
|
2000-02-17 20:38:33 +01:00
|
|
|
DWORD res = WaitForSingleObject (output_mutex, ms);
|
|
|
|
if (res == WAIT_OBJECT_0)
|
|
|
|
{
|
2000-03-09 22:04:05 +01:00
|
|
|
#ifndef DEBUGGING
|
2005-12-29 22:10:50 +01:00
|
|
|
if (strace.active ())
|
2000-08-02 21:26:01 +02:00
|
|
|
strace.prntf (_STRACE_TERMIOS, fn, "(%d): tty output_mutex: acquired", ln, res);
|
2000-03-09 22:04:05 +01:00
|
|
|
#else
|
2000-02-17 20:38:33 +01:00
|
|
|
ostack[osi].fn = fn;
|
|
|
|
ostack[osi].ln = ln;
|
2002-08-01 18:20:31 +02:00
|
|
|
ostack[osi].tname = cygthread::name ();
|
2000-02-17 20:38:33 +01:00
|
|
|
termios_printf ("acquired for %s:%d, osi %d", fn, ln, osi);
|
|
|
|
osi++;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
fhandler_tty_common::__release_output_mutex (const char *fn, int ln)
|
|
|
|
{
|
|
|
|
if (ReleaseMutex (output_mutex))
|
|
|
|
{
|
2000-03-09 22:04:05 +01:00
|
|
|
#ifndef DEBUGGING
|
2005-12-29 22:10:50 +01:00
|
|
|
if (strace.active ())
|
2000-08-02 21:26:01 +02:00
|
|
|
strace.prntf (_STRACE_TERMIOS, fn, "(%d): tty output_mutex released", ln);
|
2000-03-09 22:04:05 +01:00
|
|
|
#else
|
2000-02-17 20:38:33 +01:00
|
|
|
if (osi > 0)
|
|
|
|
osi--;
|
|
|
|
termios_printf ("released at %s:%d, osi %d", fn, ln, osi);
|
2001-03-11 02:58:23 +01:00
|
|
|
termios_printf (" for %s:%d (%s)", ostack[osi].fn, ostack[osi].ln, ostack[osi].tname);
|
2000-02-17 20:38:33 +01:00
|
|
|
ostack[osi].ln = -ln;
|
|
|
|
#endif
|
|
|
|
}
|
2006-05-22 06:50:54 +02:00
|
|
|
#ifdef DEBUGGING
|
|
|
|
else if (osi > 0)
|
|
|
|
{
|
|
|
|
system_printf ("couldn't release output mutex but we seem to own it, %E");
|
|
|
|
try_to_debug ();
|
|
|
|
}
|
|
|
|
#endif
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Process tty input. */
|
|
|
|
|
|
|
|
void
|
|
|
|
fhandler_pty_master::doecho (const void *str, DWORD len)
|
|
|
|
{
|
|
|
|
acquire_output_mutex (INFINITE);
|
2006-06-03 08:35:10 +02:00
|
|
|
if (!WriteFile (to_master, str, len, &len, NULL))
|
|
|
|
termios_printf ("Write to %p failed, %E", to_master);
|
2000-02-17 20:38:33 +01:00
|
|
|
// WaitForSingleObject (output_done_event, INFINITE);
|
|
|
|
release_output_mutex ();
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
fhandler_pty_master::accept_input ()
|
|
|
|
{
|
2002-12-17 04:49:34 +01:00
|
|
|
DWORD bytes_left;
|
|
|
|
int ret = 1;
|
2001-03-04 16:34:25 +01:00
|
|
|
|
2005-07-06 22:05:03 +02:00
|
|
|
WaitForSingleObject (input_mutex, INFINITE);
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2002-12-17 04:49:34 +01:00
|
|
|
bytes_left = eat_readahead (-1);
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2002-12-17 04:49:34 +01:00
|
|
|
if (!bytes_left)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2002-12-17 04:49:34 +01:00
|
|
|
termios_printf ("sending EOF to slave");
|
|
|
|
get_ttyp ()->read_retval = 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
char *p = rabuf;
|
|
|
|
DWORD rc;
|
|
|
|
DWORD written = 0;
|
2002-11-30 23:23:01 +01:00
|
|
|
|
2002-12-17 04:49:34 +01:00
|
|
|
termios_printf ("about to write %d chars to slave", bytes_left);
|
|
|
|
rc = WriteFile (get_output_handle (), p, bytes_left, &written, NULL);
|
|
|
|
if (!rc)
|
|
|
|
{
|
|
|
|
debug_printf ("error writing to pipe %E");
|
|
|
|
get_ttyp ()->read_retval = -1;
|
2002-12-20 02:38:55 +01:00
|
|
|
ret = -1;
|
2002-12-17 04:49:34 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
get_ttyp ()->read_retval = 1;
|
2001-04-27 08:27:28 +02:00
|
|
|
p += written;
|
|
|
|
bytes_left -= written;
|
|
|
|
if (bytes_left > 0)
|
|
|
|
{
|
|
|
|
debug_printf ("to_slave pipe is full");
|
2002-12-17 04:49:34 +01:00
|
|
|
puts_readahead (p, bytes_left);
|
|
|
|
ret = 0;
|
2001-04-27 08:27:28 +02:00
|
|
|
}
|
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
2002-12-17 04:49:34 +01:00
|
|
|
|
2001-03-04 16:34:25 +01:00
|
|
|
SetEvent (input_available_event);
|
|
|
|
ReleaseMutex (input_mutex);
|
2002-12-17 04:49:34 +01:00
|
|
|
return ret;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static DWORD WINAPI
|
2000-02-21 06:20:38 +01:00
|
|
|
process_input (void *)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
char rawbuf[INP_BUFFER_SIZE];
|
|
|
|
|
|
|
|
while (1)
|
|
|
|
{
|
2002-12-14 05:01:32 +01:00
|
|
|
size_t nraw = INP_BUFFER_SIZE;
|
|
|
|
tty_master->console->read ((void *) rawbuf, nraw);
|
2003-02-13 03:52:41 +01:00
|
|
|
if (tty_master->line_edit (rawbuf, nraw, tty_master->get_ttyp ()->ti)
|
|
|
|
== line_edit_signalled)
|
|
|
|
tty_master->console->eat_readahead (-1);
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-09-24 23:50:44 +02:00
|
|
|
bool
|
2000-02-17 20:38:33 +01:00
|
|
|
fhandler_pty_master::hit_eof ()
|
|
|
|
{
|
|
|
|
if (get_ttyp ()->was_opened && !get_ttyp ()->slave_alive ())
|
|
|
|
{
|
|
|
|
/* We have the only remaining open handle to this pty, and
|
|
|
|
the slave pty has been opened at least once. We treat
|
|
|
|
this as EOF. */
|
|
|
|
termios_printf ("all other handles closed");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Process tty output requests */
|
|
|
|
|
|
|
|
int
|
2000-03-12 07:29:54 +01:00
|
|
|
fhandler_pty_master::process_slave_output (char *buf, size_t len, int pktmode_on)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
size_t rlen;
|
2000-03-12 07:29:54 +01:00
|
|
|
char outbuf[OUT_BUFFER_SIZE + 1];
|
2000-02-17 20:38:33 +01:00
|
|
|
DWORD n;
|
|
|
|
int column = 0;
|
2000-03-12 05:44:37 +01:00
|
|
|
int rc = 0;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
if (len == 0)
|
2000-03-12 05:44:37 +01:00
|
|
|
goto out;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2000-03-12 07:29:54 +01:00
|
|
|
if (need_nl)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2000-03-12 07:29:54 +01:00
|
|
|
/* We need to return a left over \n character, resulting from
|
|
|
|
\r\n conversion. Note that we already checked for FLUSHO and
|
2001-04-29 01:48:28 +02:00
|
|
|
output_stopped at the time that we read the character, so we
|
2000-03-12 07:29:54 +01:00
|
|
|
don't check again here. */
|
2003-09-18 20:54:48 +02:00
|
|
|
if (buf)
|
|
|
|
buf[0] = '\n';
|
2000-03-12 07:29:54 +01:00
|
|
|
need_nl = 0;
|
2000-08-03 15:02:09 +02:00
|
|
|
rc = 1;
|
2000-03-12 07:29:54 +01:00
|
|
|
goto out;
|
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2000-03-12 07:29:54 +01:00
|
|
|
|
|
|
|
for (;;)
|
|
|
|
{
|
2000-03-12 05:44:37 +01:00
|
|
|
/* Set RLEN to the number of bytes to read from the pipe. */
|
|
|
|
rlen = len;
|
|
|
|
if (get_ttyp ()->ti.c_oflag & OPOST && get_ttyp ()->ti.c_oflag & ONLCR)
|
|
|
|
{
|
|
|
|
/* We are going to expand \n to \r\n, so don't read more than
|
|
|
|
half of the number of bytes requested. */
|
|
|
|
rlen /= 2;
|
|
|
|
if (rlen == 0)
|
|
|
|
rlen = 1;
|
|
|
|
}
|
|
|
|
if (rlen > sizeof outbuf)
|
|
|
|
rlen = sizeof outbuf;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2000-03-12 05:44:37 +01:00
|
|
|
HANDLE handle = get_io_handle ();
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2000-03-12 07:29:54 +01:00
|
|
|
n = 0; // get_readahead_into_buffer (outbuf, len);
|
|
|
|
if (!n)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2000-03-12 07:29:54 +01:00
|
|
|
/* Doing a busy wait like this is quite inefficient, but nothing
|
|
|
|
else seems to work completely. Windows should provide some sort
|
|
|
|
of overlapped I/O for pipes, or something, but it doesn't. */
|
|
|
|
while (1)
|
|
|
|
{
|
|
|
|
if (!PeekNamedPipe (handle, NULL, 0, NULL, &n, NULL))
|
|
|
|
goto err;
|
|
|
|
if (n > 0)
|
|
|
|
break;
|
|
|
|
if (hit_eof ())
|
|
|
|
goto out;
|
2003-09-18 20:54:48 +02:00
|
|
|
/* DISCARD (FLUSHO) and tcflush can finish here. */
|
|
|
|
if (n == 0 && (get_ttyp ()->ti.c_lflag & FLUSHO || !buf))
|
2004-05-28 21:50:07 +02:00
|
|
|
goto out;
|
2001-08-15 09:49:15 +02:00
|
|
|
if (n == 0 && is_nonblocking ())
|
2000-03-12 07:29:54 +01:00
|
|
|
{
|
|
|
|
set_errno (EAGAIN);
|
|
|
|
rc = -1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2002-11-26 21:32:39 +01:00
|
|
|
Sleep (10);
|
2000-03-12 07:29:54 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if (ReadFile (handle, outbuf, rlen, &n, NULL) == FALSE)
|
2000-03-12 05:44:37 +01:00
|
|
|
goto err;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2000-03-12 07:29:54 +01:00
|
|
|
termios_printf ("bytes read %u", n);
|
2000-09-07 18:23:51 +02:00
|
|
|
get_ttyp ()->write_error = 0;
|
|
|
|
if (output_done_event != NULL)
|
|
|
|
SetEvent (output_done_event);
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2003-09-18 20:54:48 +02:00
|
|
|
if (get_ttyp ()->ti.c_lflag & FLUSHO || !buf)
|
2000-09-07 18:23:51 +02:00
|
|
|
continue;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2000-03-12 07:29:54 +01:00
|
|
|
char *optr;
|
|
|
|
optr = buf;
|
|
|
|
if (pktmode_on)
|
|
|
|
*optr++ = TIOCPKT_DATA;
|
|
|
|
|
2000-03-12 05:44:37 +01:00
|
|
|
if (!(get_ttyp ()->ti.c_oflag & OPOST)) // post-process output
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2000-03-12 07:29:54 +01:00
|
|
|
memcpy (optr, outbuf, n);
|
|
|
|
optr += n;
|
2000-03-12 05:44:37 +01:00
|
|
|
}
|
|
|
|
else // raw output mode
|
|
|
|
{
|
2000-03-12 07:29:54 +01:00
|
|
|
char *iptr = outbuf;
|
2000-03-12 05:44:37 +01:00
|
|
|
|
|
|
|
while (n--)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2000-03-12 05:44:37 +01:00
|
|
|
switch (*iptr)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2000-03-12 05:44:37 +01:00
|
|
|
case '\r':
|
|
|
|
if ((get_ttyp ()->ti.c_oflag & ONOCR) && column == 0)
|
|
|
|
{
|
|
|
|
iptr++;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (get_ttyp ()->ti.c_oflag & OCRNL)
|
|
|
|
*iptr = '\n';
|
|
|
|
else
|
|
|
|
column = 0;
|
|
|
|
break;
|
|
|
|
case '\n':
|
|
|
|
if (get_ttyp ()->ti.c_oflag & ONLCR)
|
|
|
|
{
|
|
|
|
*optr++ = '\r';
|
|
|
|
column = 0;
|
|
|
|
}
|
|
|
|
if (get_ttyp ()->ti.c_oflag & ONLRET)
|
|
|
|
column = 0;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
column++;
|
|
|
|
break;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
2000-03-12 05:44:37 +01:00
|
|
|
|
|
|
|
/* Don't store data past the end of the user's buffer. This
|
|
|
|
can happen if the user requests a read of 1 byte when
|
|
|
|
doing \r\n expansion. */
|
|
|
|
if (optr - buf >= (int) len)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2000-03-12 05:44:37 +01:00
|
|
|
if (*iptr != '\n' || n != 0)
|
|
|
|
system_printf ("internal error: %d unexpected characters", n);
|
2000-03-12 07:29:54 +01:00
|
|
|
need_nl = 1;
|
2000-03-12 05:44:37 +01:00
|
|
|
break;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2000-03-12 05:44:37 +01:00
|
|
|
*optr++ = *iptr++;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
2000-03-12 05:44:37 +01:00
|
|
|
}
|
2000-03-12 07:29:54 +01:00
|
|
|
rc = optr - buf;
|
2000-03-12 05:44:37 +01:00
|
|
|
break;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2000-03-12 05:44:37 +01:00
|
|
|
err:
|
|
|
|
if (GetLastError () == ERROR_BROKEN_PIPE)
|
|
|
|
rc = 0;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
__seterrno ();
|
|
|
|
rc = -1;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
2000-03-12 05:44:37 +01:00
|
|
|
break;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
2000-03-12 05:44:37 +01:00
|
|
|
|
|
|
|
out:
|
|
|
|
termios_printf ("returning %d", rc);
|
|
|
|
return rc;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static DWORD WINAPI
|
2002-10-09 07:55:40 +02:00
|
|
|
process_output (void *)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2002-10-09 07:55:40 +02:00
|
|
|
char buf[OUT_BUFFER_SIZE * 2];
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2000-03-12 07:29:54 +01:00
|
|
|
for (;;)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2000-03-12 07:29:54 +01:00
|
|
|
int n = tty_master->process_slave_output (buf, OUT_BUFFER_SIZE, 0);
|
2002-08-02 04:10:24 +02:00
|
|
|
if (n <= 0)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2002-08-02 04:10:24 +02:00
|
|
|
if (n < 0)
|
|
|
|
termios_printf ("ReadFile %E");
|
2002-10-09 07:55:40 +02:00
|
|
|
ExitThread (0);
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
n = tty_master->console->write ((void *) buf, (size_t) n);
|
2000-09-07 18:23:51 +02:00
|
|
|
tty_master->get_ttyp ()->write_error = n == -1 ? get_errno () : 0;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Process tty ioctl requests */
|
|
|
|
|
|
|
|
static DWORD WINAPI
|
2000-02-21 06:20:38 +01:00
|
|
|
process_ioctl (void *)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
while (1)
|
|
|
|
{
|
|
|
|
WaitForSingleObject (tty_master->ioctl_request_event, INFINITE);
|
|
|
|
termios_printf ("ioctl() request");
|
2006-07-03 17:29:10 +02:00
|
|
|
tty *ttyp = tty_master->get_ttyp ();
|
|
|
|
ttyp->ioctl_retval =
|
|
|
|
tty_master->console->ioctl (ttyp->cmd,
|
|
|
|
(ttyp->cmd == KDSKBMETA)
|
|
|
|
? (void *) ttyp->arg.value
|
|
|
|
: (void *) &ttyp->arg);
|
2000-02-17 20:38:33 +01:00
|
|
|
SetEvent (tty_master->ioctl_done_event);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**********************************************************************/
|
|
|
|
/* Tty slave stuff */
|
|
|
|
|
2001-10-13 19:23:35 +02:00
|
|
|
fhandler_tty_slave::fhandler_tty_slave ()
|
2006-06-02 17:41:34 +02:00
|
|
|
: fhandler_tty_common (), inuse (NULL)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2004-04-10 15:45:10 +02:00
|
|
|
uninterruptible_io (true);
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2001-04-24 04:07:58 +02:00
|
|
|
/* FIXME: This function needs to close handles when it has
|
|
|
|
a failing condition. */
|
2000-02-17 20:38:33 +01:00
|
|
|
int
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
fhandler_tty_slave::open (int flags, mode_t)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2010-04-02 17:41:27 +02:00
|
|
|
HANDLE tty_owner, from_master_local, to_master_local;
|
|
|
|
HANDLE *handles[] =
|
|
|
|
{
|
|
|
|
&from_master_local, &input_available_event, &input_mutex, &inuse,
|
|
|
|
&ioctl_done_event, &ioctl_request_event, &output_done_event,
|
|
|
|
&output_mutex, &to_master_local, &tty_owner,
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
|
|
|
const char *errmsg = NULL;
|
|
|
|
|
|
|
|
for (HANDLE **h = handles; *h; h++)
|
|
|
|
**h = NULL;
|
|
|
|
|
2003-12-11 07:12:41 +01:00
|
|
|
if (get_device () == FH_TTY)
|
2006-06-03 23:44:01 +02:00
|
|
|
dev().tty_to_real_device ();
|
2005-11-14 06:36:16 +01:00
|
|
|
fhandler_tty_slave *arch = (fhandler_tty_slave *) cygheap->fdtab.find_archetype (pc.dev);
|
2003-12-11 07:12:41 +01:00
|
|
|
if (arch)
|
2003-12-07 23:37:12 +01:00
|
|
|
{
|
2003-12-11 07:12:41 +01:00
|
|
|
*this = *(fhandler_tty_slave *) arch;
|
2006-06-02 17:41:34 +02:00
|
|
|
termios_printf ("copied fhandler_tty_slave archetype");
|
2004-07-22 22:39:08 +02:00
|
|
|
set_flags ((flags & ~O_TEXT) | O_BINARY);
|
2005-11-14 05:28:45 +01:00
|
|
|
cygheap->manage_console_count ("fhandler_tty_slave::open<arch>", 1);
|
2003-12-11 07:12:41 +01:00
|
|
|
goto out;
|
2003-12-07 23:37:12 +01:00
|
|
|
}
|
|
|
|
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
tcinit (cygwin_shared->tty[get_unit ()]);
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2006-06-03 22:32:07 +02:00
|
|
|
cygwin_shared->tty.attach (get_unit ());
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2002-07-01 21:03:26 +02:00
|
|
|
set_flags ((flags & ~O_TEXT) | O_BINARY);
|
2000-02-17 20:38:33 +01:00
|
|
|
/* Create synchronisation events */
|
2007-12-05 17:50:18 +01:00
|
|
|
char buf[MAX_PATH];
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
/* output_done_event may or may not exist. It will exist if the tty
|
|
|
|
was opened by fhandler_tty_master::init, normally called at
|
|
|
|
startup if use_tty is non-zero. It will not exist if this is a
|
|
|
|
pty opened by fhandler_pty_master::open. In the former case, tty
|
|
|
|
output is handled by a separate thread which controls output. */
|
2004-05-12 03:44:11 +02:00
|
|
|
shared_name (buf, OUTPUT_DONE_EVENT, get_unit ());
|
2010-04-19 21:52:43 +02:00
|
|
|
output_done_event = OpenEvent (MAXIMUM_ALLOWED, TRUE, buf);
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2010-04-19 21:52:43 +02:00
|
|
|
if (!(output_mutex = get_ttyp ()->open_output_mutex (MAXIMUM_ALLOWED)))
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2010-04-02 17:41:27 +02:00
|
|
|
errmsg = "open output mutex failed, %E";
|
|
|
|
goto err;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
2010-04-19 21:52:43 +02:00
|
|
|
if (!(input_mutex = get_ttyp ()->open_input_mutex (MAXIMUM_ALLOWED)))
|
2001-03-04 16:34:25 +01:00
|
|
|
{
|
2010-04-02 17:41:27 +02:00
|
|
|
errmsg = "open input mutex failed, %E";
|
|
|
|
goto err;
|
2001-03-04 16:34:25 +01:00
|
|
|
}
|
2004-05-12 03:44:11 +02:00
|
|
|
shared_name (buf, INPUT_AVAILABLE_EVENT, get_unit ());
|
2010-04-19 21:52:43 +02:00
|
|
|
if (!(input_available_event = OpenEvent (MAXIMUM_ALLOWED, TRUE, buf)))
|
2001-03-04 16:34:25 +01:00
|
|
|
{
|
2010-04-02 17:41:27 +02:00
|
|
|
errmsg = "open input event failed, %E";
|
|
|
|
goto err;
|
2001-03-04 16:34:25 +01:00
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
/* The ioctl events may or may not exist. See output_done_event,
|
|
|
|
above. */
|
2004-05-12 03:44:11 +02:00
|
|
|
shared_name (buf, IOCTL_REQUEST_EVENT, get_unit ());
|
2010-04-19 21:52:43 +02:00
|
|
|
ioctl_request_event = OpenEvent (MAXIMUM_ALLOWED, TRUE, buf);
|
2004-05-12 03:44:11 +02:00
|
|
|
shared_name (buf, IOCTL_DONE_EVENT, get_unit ());
|
2010-04-19 21:52:43 +02:00
|
|
|
ioctl_done_event = OpenEvent (MAXIMUM_ALLOWED, TRUE, buf);
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
/* FIXME: Needs a method to eliminate tty races */
|
|
|
|
{
|
2010-04-19 21:52:43 +02:00
|
|
|
/* Create security attribute. Default permissions are 0620. */
|
|
|
|
security_descriptor sd;
|
|
|
|
sd.malloc (sizeof (SECURITY_DESCRIPTOR));
|
|
|
|
InitializeSecurityDescriptor (sd, SECURITY_DESCRIPTOR_REVISION);
|
|
|
|
SECURITY_ATTRIBUTES sa = { sizeof (SECURITY_ATTRIBUTES), NULL, TRUE };
|
|
|
|
if (!create_object_sd_from_attribute (NULL, myself->uid, myself->gid,
|
|
|
|
S_IFCHR | S_IRUSR | S_IWUSR | S_IWGRP,
|
|
|
|
sd))
|
|
|
|
sa.lpSecurityDescriptor = (PSECURITY_DESCRIPTOR) sd;
|
2000-02-17 20:38:33 +01:00
|
|
|
acquire_output_mutex (500);
|
2010-04-19 21:52:43 +02:00
|
|
|
inuse = get_ttyp ()->create_inuse (&sa);
|
2003-12-07 23:37:12 +01:00
|
|
|
get_ttyp ()->was_opened = true;
|
2000-02-17 20:38:33 +01:00
|
|
|
release_output_mutex ();
|
|
|
|
}
|
|
|
|
|
2006-06-02 17:41:34 +02:00
|
|
|
if (!get_ttyp ()->from_master || !get_ttyp ()->to_master)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2010-04-02 17:41:27 +02:00
|
|
|
errmsg = "tty handles have been closed";
|
2000-02-17 20:38:33 +01:00
|
|
|
set_errno (EACCES);
|
2010-04-02 17:41:27 +02:00
|
|
|
goto err_no_errno;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2010-04-19 21:52:43 +02:00
|
|
|
if (get_ttyp ()->master_pid < 0)
|
|
|
|
{
|
|
|
|
errmsg = "*** master is closed";
|
|
|
|
set_errno (EAGAIN);
|
|
|
|
goto err_no_errno;
|
|
|
|
}
|
|
|
|
/* Three case for duplicating the pipe handles:
|
|
|
|
- Either we're the master. In this case, just duplicate the handles.
|
|
|
|
- Or, we have the right to open the master process for handle duplication.
|
|
|
|
In this case, just duplicate the handles.
|
|
|
|
- Or, we have to ask the master process itself. In this case, send our
|
|
|
|
pid to the master process and check the reply. The reply contains
|
|
|
|
either the handles, or an error code which tells us why we didn't
|
|
|
|
get the handles. */
|
|
|
|
if (myself->pid == get_ttyp ()->master_pid)
|
|
|
|
{
|
|
|
|
/* This is the most common case, just calling openpty. */
|
|
|
|
termios_printf ("dup handles within myself.");
|
|
|
|
tty_owner = GetCurrentProcess ();
|
|
|
|
}
|
|
|
|
else
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2006-06-02 17:41:34 +02:00
|
|
|
pinfo p (get_ttyp ()->master_pid);
|
|
|
|
if (!p)
|
2010-04-19 21:52:43 +02:00
|
|
|
termios_printf ("*** couldn't find tty master");
|
2010-04-12 15:28:06 +02:00
|
|
|
else
|
|
|
|
{
|
|
|
|
tty_owner = OpenProcess (PROCESS_DUP_HANDLE, FALSE, p->dwProcessId);
|
2010-04-19 21:52:43 +02:00
|
|
|
if (tty_owner)
|
|
|
|
termios_printf ("dup handles directly since I'm allmighty.");
|
2002-05-28 03:55:40 +02:00
|
|
|
}
|
2010-04-19 21:52:43 +02:00
|
|
|
}
|
|
|
|
if (tty_owner)
|
|
|
|
{
|
2002-05-28 03:55:40 +02:00
|
|
|
if (!DuplicateHandle (tty_owner, get_ttyp ()->from_master,
|
2009-12-18 21:32:04 +01:00
|
|
|
GetCurrentProcess (), &from_master_local, 0, TRUE,
|
2002-02-28 15:30:38 +01:00
|
|
|
DUPLICATE_SAME_ACCESS))
|
2002-05-28 03:55:40 +02:00
|
|
|
{
|
2009-07-03 20:05:51 +02:00
|
|
|
termios_printf ("can't duplicate input from %u/%p, %E",
|
|
|
|
get_ttyp ()->master_pid, get_ttyp ()->from_master);
|
2002-05-28 03:55:40 +02:00
|
|
|
__seterrno ();
|
2010-04-02 17:41:27 +02:00
|
|
|
goto err_no_msg;
|
2002-05-28 03:55:40 +02:00
|
|
|
}
|
|
|
|
if (!DuplicateHandle (tty_owner, get_ttyp ()->to_master,
|
2009-12-18 21:32:04 +01:00
|
|
|
GetCurrentProcess (), &to_master_local, 0, TRUE,
|
2002-02-28 15:30:38 +01:00
|
|
|
DUPLICATE_SAME_ACCESS))
|
2002-05-28 03:55:40 +02:00
|
|
|
{
|
2010-04-02 17:41:27 +02:00
|
|
|
errmsg = "can't duplicate output, %E";
|
|
|
|
goto err;
|
2002-05-28 03:55:40 +02:00
|
|
|
}
|
2010-04-12 15:28:06 +02:00
|
|
|
if (tty_owner != GetCurrentProcess ())
|
|
|
|
CloseHandle (tty_owner);
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
2010-04-19 21:52:43 +02:00
|
|
|
else
|
|
|
|
{
|
|
|
|
pipe_request req = { GetCurrentProcessId () };
|
|
|
|
pipe_reply repl;
|
|
|
|
DWORD len;
|
|
|
|
|
|
|
|
__small_sprintf (buf, "\\\\.\\pipe\\cygwin-%S-tty%d-master-ctl",
|
|
|
|
&installation_key, get_unit ());
|
|
|
|
termios_printf ("dup handles via master control pipe %s", buf);
|
|
|
|
if (!CallNamedPipe (buf, &req, sizeof req, &repl, sizeof repl,
|
|
|
|
&len, 500))
|
|
|
|
{
|
|
|
|
errmsg = "can't call master, %E";
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
from_master_local = repl.from_master;
|
|
|
|
to_master_local = repl.to_master;
|
|
|
|
if (!from_master_local || !to_master_local)
|
|
|
|
{
|
|
|
|
SetLastError (repl.error);
|
|
|
|
errmsg = "error duplicating pipes, %E";
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
VerifyHandle (from_master_local);
|
|
|
|
VerifyHandle (to_master_local);
|
2002-02-28 15:30:38 +01:00
|
|
|
|
|
|
|
termios_printf ("duplicated from_master %p->%p from tty_owner",
|
2006-06-03 08:35:10 +02:00
|
|
|
get_ttyp ()->from_master, from_master_local);
|
2002-02-28 15:30:38 +01:00
|
|
|
termios_printf ("duplicated to_master %p->%p from tty_owner",
|
2006-06-03 08:35:10 +02:00
|
|
|
get_ttyp ()->to_master, to_master_local);
|
2002-02-28 15:30:38 +01:00
|
|
|
|
|
|
|
set_io_handle (from_master_local);
|
|
|
|
set_output_handle (to_master_local);
|
2010-01-14 19:46:02 +01:00
|
|
|
set_close_on_exec (!!(flags & O_CLOEXEC));
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2001-04-24 04:07:58 +02:00
|
|
|
set_open_status ();
|
2006-05-20 06:19:47 +02:00
|
|
|
if (cygheap->manage_console_count ("fhandler_tty_slave::open", 1) == 1
|
|
|
|
&& !output_done_event)
|
|
|
|
fhandler_console::need_invisible ();
|
2003-12-11 07:12:41 +01:00
|
|
|
|
|
|
|
// FIXME: Do this better someday
|
2007-11-26 22:30:49 +01:00
|
|
|
arch = (fhandler_tty_slave *) cmalloc_abort (HEAP_ARCHETYPES, sizeof (*this));
|
2003-12-11 07:12:41 +01:00
|
|
|
*((fhandler_tty_slave **) cygheap->fdtab.add_archetype ()) = arch;
|
|
|
|
archetype = arch;
|
|
|
|
*arch = *this;
|
|
|
|
|
|
|
|
out:
|
|
|
|
usecount = 0;
|
2006-06-02 17:41:34 +02:00
|
|
|
arch->usecount++;
|
2005-11-14 05:28:45 +01:00
|
|
|
report_tty_counts (this, "opened", "");
|
2003-12-11 07:12:41 +01:00
|
|
|
myself->set_ctty (get_ttyp (), flags, arch);
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
return 1;
|
2010-04-02 17:41:27 +02:00
|
|
|
|
|
|
|
err:
|
|
|
|
__seterrno ();
|
|
|
|
err_no_errno:
|
|
|
|
termios_printf (errmsg);
|
|
|
|
err_no_msg:
|
|
|
|
for (HANDLE **h = handles; *h; h++)
|
|
|
|
if (**h && **h != INVALID_HANDLE_VALUE)
|
|
|
|
CloseHandle (**h);
|
|
|
|
return 0;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2003-03-04 05:07:34 +01:00
|
|
|
int
|
|
|
|
fhandler_tty_slave::close ()
|
|
|
|
{
|
2006-05-20 06:59:53 +02:00
|
|
|
/* This used to always call fhandler_tty_common::close when hExeced but that
|
|
|
|
caused multiple closes of the handles associated with this tty. Since
|
|
|
|
close_all_files is not called until after the cygwin process has synced
|
|
|
|
or before a non-cygwin process has exited, it should be safe to just
|
|
|
|
close this normally. cgf 2006-05-20 */
|
|
|
|
cygheap->manage_console_count ("fhandler_tty_slave::close", -1);
|
2003-12-27 18:41:17 +01:00
|
|
|
|
2010-04-02 18:16:53 +02:00
|
|
|
archetype->usecount--;
|
2006-05-20 06:59:53 +02:00
|
|
|
report_tty_counts (this, "closed", "");
|
2003-12-27 18:41:17 +01:00
|
|
|
|
2010-04-02 18:16:53 +02:00
|
|
|
if (archetype->usecount)
|
2006-05-20 06:59:53 +02:00
|
|
|
{
|
2003-12-12 21:46:03 +01:00
|
|
|
#ifdef DEBUGGING
|
2006-05-20 06:59:53 +02:00
|
|
|
if (archetype->usecount < 0)
|
|
|
|
system_printf ("error: usecount %d", archetype->usecount);
|
2003-12-12 21:46:03 +01:00
|
|
|
#endif
|
2006-05-20 06:59:53 +02:00
|
|
|
termios_printf ("just returning because archetype usecount is != 0");
|
|
|
|
return 0;
|
2003-12-11 07:12:41 +01:00
|
|
|
}
|
|
|
|
|
2003-12-30 02:57:16 +01:00
|
|
|
termios_printf ("closing last open %s handle", ttyname ());
|
2006-06-02 17:41:34 +02:00
|
|
|
if (inuse && !CloseHandle (inuse))
|
|
|
|
termios_printf ("CloseHandle (inuse), %E");
|
2003-12-12 21:46:03 +01:00
|
|
|
return fhandler_tty_common::close ();
|
2003-03-04 05:07:34 +01:00
|
|
|
}
|
|
|
|
|
2002-02-28 15:30:38 +01:00
|
|
|
int
|
2010-04-19 21:52:43 +02:00
|
|
|
fhandler_tty_slave::init (HANDLE f, DWORD a, mode_t)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
int flags = 0;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
a &= GENERIC_READ | GENERIC_WRITE;
|
|
|
|
if (a == GENERIC_READ)
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
flags = O_RDONLY;
|
2000-02-17 20:38:33 +01:00
|
|
|
if (a == GENERIC_WRITE)
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
flags = O_WRONLY;
|
2000-02-17 20:38:33 +01:00
|
|
|
if (a == (GENERIC_READ | GENERIC_WRITE))
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
flags = O_RDWR;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2010-04-19 21:52:43 +02:00
|
|
|
int ret = open (flags);
|
2010-05-07 17:03:27 +02:00
|
|
|
if (ret && !cygwin_finished_initializing && !IsDebuggerPresent ())
|
2010-04-21 21:36:40 +02:00
|
|
|
{
|
|
|
|
/* This only occurs when called from dtable::init_std_file_from_handle
|
|
|
|
We have been started from a non-Cygwin process. So we should become
|
|
|
|
tty process group leader.
|
|
|
|
TODO: Investigate how SIGTTIN should be handled with pure-windows
|
|
|
|
programs. */
|
|
|
|
tc->pgid = myself->pgid;
|
|
|
|
}
|
2010-04-19 21:52:43 +02:00
|
|
|
|
|
|
|
if (f != INVALID_HANDLE_VALUE)
|
|
|
|
CloseHandle (f); /* Reopened by open */
|
|
|
|
|
|
|
|
return ret;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2009-07-24 22:54:33 +02:00
|
|
|
ssize_t __stdcall
|
2000-02-17 20:38:33 +01:00
|
|
|
fhandler_tty_slave::write (const void *ptr, size_t len)
|
|
|
|
{
|
|
|
|
DWORD n, towrite = len;
|
|
|
|
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
termios_printf ("tty%d, write(%x, %d)", get_unit (), ptr, len);
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
acquire_output_mutex (INFINITE);
|
|
|
|
|
|
|
|
while (len)
|
|
|
|
{
|
|
|
|
n = min (OUT_BUFFER_SIZE, len);
|
|
|
|
char *buf = (char *)ptr;
|
|
|
|
ptr = (char *) ptr + n;
|
|
|
|
len -= n;
|
|
|
|
|
2000-09-07 18:23:51 +02:00
|
|
|
/* Previous write may have set write_error to != 0. Check it here.
|
|
|
|
This is less than optimal, but the alternative slows down tty
|
|
|
|
writes enormously. */
|
|
|
|
if (get_ttyp ()->write_error)
|
|
|
|
{
|
|
|
|
set_errno (get_ttyp ()->write_error);
|
|
|
|
towrite = (DWORD) -1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
if (WriteFile (get_output_handle (), buf, n, &n, NULL) == FALSE)
|
|
|
|
{
|
2000-08-29 04:06:49 +02:00
|
|
|
DWORD err = GetLastError ();
|
2000-02-17 20:38:33 +01:00
|
|
|
termios_printf ("WriteFile failed, %E");
|
2000-08-29 04:06:49 +02:00
|
|
|
switch (err)
|
|
|
|
{
|
|
|
|
case ERROR_NO_DATA:
|
|
|
|
err = ERROR_IO_DEVICE;
|
|
|
|
default:
|
2000-09-19 01:46:10 +02:00
|
|
|
__seterrno_from_win_error (err);
|
2000-08-29 04:06:49 +02:00
|
|
|
}
|
2002-10-20 06:15:50 +02:00
|
|
|
raise (SIGHUP); /* FIXME: Should this be SIGTTOU? */
|
2000-08-29 04:06:49 +02:00
|
|
|
towrite = (DWORD) -1;
|
2000-02-17 20:38:33 +01:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (output_done_event != NULL)
|
|
|
|
{
|
2000-03-12 05:44:37 +01:00
|
|
|
DWORD rc;
|
|
|
|
DWORD x = n * 1000;
|
|
|
|
rc = WaitForSingleObject (output_done_event, x);
|
2001-03-11 02:58:23 +01:00
|
|
|
termios_printf ("waited %d ms for output_done_event, WFSO %d", x, rc);
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
release_output_mutex ();
|
|
|
|
return towrite;
|
|
|
|
}
|
|
|
|
|
2002-12-14 05:01:32 +01:00
|
|
|
void __stdcall
|
|
|
|
fhandler_tty_slave::read (void *ptr, size_t& len)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
int totalread = 0;
|
2002-10-16 06:54:08 +02:00
|
|
|
int vmin = 0;
|
2000-02-17 20:38:33 +01:00
|
|
|
int vtime = 0; /* Initialized to prevent -Wuninitialized warning */
|
2001-03-04 16:34:25 +01:00
|
|
|
size_t readlen;
|
|
|
|
DWORD bytes_in_pipe;
|
2000-02-17 20:38:33 +01:00
|
|
|
char buf[INP_BUFFER_SIZE];
|
2001-03-18 19:05:01 +01:00
|
|
|
char peek_buf[INP_BUFFER_SIZE];
|
2001-03-04 16:34:25 +01:00
|
|
|
DWORD time_to_wait;
|
|
|
|
DWORD rc;
|
|
|
|
HANDLE w4[2];
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2002-02-28 15:30:38 +01:00
|
|
|
termios_printf ("read(%x, %d) handle %p", ptr, len, get_handle ());
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2003-09-18 20:54:48 +02:00
|
|
|
if (!ptr) /* Indicating tcflush(). */
|
|
|
|
time_to_wait = 0;
|
|
|
|
else if ((get_ttyp ()->ti.c_lflag & ICANON))
|
2002-10-16 06:54:08 +02:00
|
|
|
time_to_wait = INFINITE;
|
|
|
|
else
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2002-05-18 22:27:49 +02:00
|
|
|
vmin = get_ttyp ()->ti.c_cc[VMIN];
|
|
|
|
if (vmin > INP_BUFFER_SIZE)
|
|
|
|
vmin = INP_BUFFER_SIZE;
|
2000-02-17 20:38:33 +01:00
|
|
|
vtime = get_ttyp ()->ti.c_cc[VTIME];
|
2002-08-31 05:35:50 +02:00
|
|
|
if (vmin < 0)
|
|
|
|
vmin = 0;
|
|
|
|
if (vtime < 0)
|
|
|
|
vtime = 0;
|
2002-10-16 06:54:08 +02:00
|
|
|
if (!vmin && !vtime)
|
|
|
|
time_to_wait = 0;
|
|
|
|
else
|
|
|
|
time_to_wait = !vtime ? INFINITE : 100 * vtime;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
2001-03-04 16:34:25 +01:00
|
|
|
|
|
|
|
w4[0] = signal_arrived;
|
|
|
|
w4[1] = input_available_event;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2004-10-07 10:03:24 +02:00
|
|
|
DWORD waiter = time_to_wait;
|
2000-02-17 20:38:33 +01:00
|
|
|
while (len)
|
|
|
|
{
|
2002-10-16 06:54:08 +02:00
|
|
|
rc = WaitForMultipleObjects (2, w4, FALSE, waiter);
|
|
|
|
|
|
|
|
if (rc == WAIT_TIMEOUT)
|
2004-11-26 05:15:10 +01:00
|
|
|
{
|
|
|
|
termios_printf ("wait timed out, waiter %u", waiter);
|
|
|
|
break;
|
|
|
|
}
|
2002-10-16 06:54:08 +02:00
|
|
|
|
|
|
|
if (rc == WAIT_FAILED)
|
|
|
|
{
|
|
|
|
termios_printf ("wait for input event failed, %E");
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2001-03-04 16:34:25 +01:00
|
|
|
if (rc == WAIT_OBJECT_0)
|
2001-03-11 02:58:23 +01:00
|
|
|
{
|
2001-03-17 02:45:40 +01:00
|
|
|
/* if we've received signal after successfully reading some data,
|
2001-03-11 02:58:23 +01:00
|
|
|
just return all data successfully read */
|
|
|
|
if (totalread > 0)
|
|
|
|
break;
|
|
|
|
set_sig_errno (EINTR);
|
2003-09-07 04:22:58 +02:00
|
|
|
len = (size_t) -1;
|
2002-12-14 05:01:32 +01:00
|
|
|
return;
|
2001-03-11 02:58:23 +01:00
|
|
|
}
|
2002-10-16 06:54:08 +02:00
|
|
|
|
2001-03-04 16:34:25 +01:00
|
|
|
rc = WaitForSingleObject (input_mutex, 1000);
|
|
|
|
if (rc == WAIT_FAILED)
|
2001-03-11 02:58:23 +01:00
|
|
|
{
|
|
|
|
termios_printf ("wait for input mutex failed, %E");
|
|
|
|
break;
|
|
|
|
}
|
2001-03-04 16:34:25 +01:00
|
|
|
else if (rc == WAIT_TIMEOUT)
|
2001-03-11 02:58:23 +01:00
|
|
|
{
|
|
|
|
termios_printf ("failed to acquire input mutex after input event arrived");
|
|
|
|
break;
|
|
|
|
}
|
2002-09-22 05:38:57 +02:00
|
|
|
if (!PeekNamedPipe (get_handle (), peek_buf, sizeof (peek_buf), &bytes_in_pipe, NULL, NULL))
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2001-03-04 16:34:25 +01:00
|
|
|
termios_printf ("PeekNamedPipe failed, %E");
|
2002-10-20 06:15:50 +02:00
|
|
|
raise (SIGHUP);
|
2001-03-11 02:58:23 +01:00
|
|
|
bytes_in_pipe = 0;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
2002-10-16 06:54:08 +02:00
|
|
|
|
2003-09-18 20:54:48 +02:00
|
|
|
/* On first peek determine no. of bytes to flush. */
|
|
|
|
if (!ptr && len == UINT_MAX)
|
2004-05-28 21:50:07 +02:00
|
|
|
len = (size_t) bytes_in_pipe;
|
2003-09-18 20:54:48 +02:00
|
|
|
|
2005-05-02 02:17:45 +02:00
|
|
|
if (ptr && !bytes_in_pipe && !vmin && !time_to_wait)
|
2002-10-16 06:54:08 +02:00
|
|
|
{
|
|
|
|
ReleaseMutex (input_mutex);
|
2003-09-07 20:27:54 +02:00
|
|
|
len = (size_t) bytes_in_pipe;
|
2002-12-14 05:01:32 +01:00
|
|
|
return;
|
2002-10-16 06:54:08 +02:00
|
|
|
}
|
|
|
|
|
2001-03-04 16:34:25 +01:00
|
|
|
readlen = min (bytes_in_pipe, min (len, sizeof (buf)));
|
2002-10-16 06:54:08 +02:00
|
|
|
|
2003-09-18 20:54:48 +02:00
|
|
|
if (ptr && vmin && readlen > (unsigned) vmin)
|
2002-10-16 06:54:08 +02:00
|
|
|
readlen = vmin;
|
|
|
|
|
|
|
|
DWORD n = 0;
|
2001-03-11 02:58:23 +01:00
|
|
|
if (readlen)
|
|
|
|
{
|
|
|
|
termios_printf ("reading %d bytes (vtime %d)", readlen, vtime);
|
|
|
|
if (ReadFile (get_handle (), buf, readlen, &n, NULL) == FALSE)
|
|
|
|
{
|
2001-03-04 16:34:25 +01:00
|
|
|
termios_printf ("read failed, %E");
|
2002-10-20 06:15:50 +02:00
|
|
|
raise (SIGHUP);
|
2001-03-04 16:34:25 +01:00
|
|
|
}
|
2001-09-07 23:32:07 +02:00
|
|
|
/* MSDN states that 5th prameter can be used to determine total
|
|
|
|
number of bytes in pipe, but for some reason this number doesn't
|
|
|
|
change after successful read. So we have to peek into the pipe
|
|
|
|
again to see if input is still available */
|
|
|
|
if (!PeekNamedPipe (get_handle (), peek_buf, 1, &bytes_in_pipe, NULL, NULL))
|
2001-03-18 19:05:01 +01:00
|
|
|
{
|
|
|
|
termios_printf ("PeekNamedPipe failed, %E");
|
2002-10-20 06:15:50 +02:00
|
|
|
raise (SIGHUP);
|
2001-03-18 19:05:01 +01:00
|
|
|
bytes_in_pipe = 0;
|
|
|
|
}
|
2001-03-11 02:58:23 +01:00
|
|
|
if (n)
|
|
|
|
{
|
|
|
|
len -= n;
|
|
|
|
totalread += n;
|
2003-09-18 20:54:48 +02:00
|
|
|
if (ptr)
|
2004-05-28 21:50:07 +02:00
|
|
|
{
|
2003-09-18 20:54:48 +02:00
|
|
|
memcpy (ptr, buf, n);
|
|
|
|
ptr = (char *) ptr + n;
|
|
|
|
}
|
2001-03-11 02:58:23 +01:00
|
|
|
}
|
|
|
|
}
|
2001-03-04 16:34:25 +01:00
|
|
|
|
2001-03-18 19:05:01 +01:00
|
|
|
if (!bytes_in_pipe)
|
|
|
|
ResetEvent (input_available_event);
|
2001-03-04 16:34:25 +01:00
|
|
|
|
|
|
|
ReleaseMutex (input_mutex);
|
2000-03-12 07:29:54 +01:00
|
|
|
|
2003-09-18 20:54:48 +02:00
|
|
|
if (!ptr)
|
|
|
|
{
|
|
|
|
if (!bytes_in_pipe)
|
|
|
|
break;
|
|
|
|
continue;
|
2004-05-28 21:50:07 +02:00
|
|
|
}
|
2003-09-18 20:54:48 +02:00
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
if (get_ttyp ()->read_retval < 0) // read error
|
|
|
|
{
|
|
|
|
set_errno (-get_ttyp ()->read_retval);
|
|
|
|
totalread = -1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (get_ttyp ()->read_retval == 0) //EOF
|
|
|
|
{
|
|
|
|
termios_printf ("saw EOF");
|
|
|
|
break;
|
|
|
|
}
|
2001-08-15 09:49:15 +02:00
|
|
|
if (get_ttyp ()->ti.c_lflag & ICANON || is_nonblocking ())
|
2000-02-17 20:38:33 +01:00
|
|
|
break;
|
2002-10-16 06:54:08 +02:00
|
|
|
if (vmin && totalread >= vmin)
|
2001-03-11 02:58:23 +01:00
|
|
|
break;
|
2001-03-04 16:34:25 +01:00
|
|
|
|
2001-03-11 02:58:23 +01:00
|
|
|
/* vmin == 0 && vtime == 0:
|
2001-03-04 16:34:25 +01:00
|
|
|
* we've already read all input, if any, so return immediately
|
|
|
|
* vmin == 0 && vtime > 0:
|
|
|
|
* we've waited for input 10*vtime ms in WFSO(input_available_event),
|
|
|
|
* no matter whether any input arrived, we shouldn't wait any longer,
|
2001-03-11 02:58:23 +01:00
|
|
|
* so return immediately
|
2001-03-04 16:34:25 +01:00
|
|
|
* vmin > 0 && vtime == 0:
|
|
|
|
* here, totalread < vmin, so continue waiting until more data
|
|
|
|
* arrive
|
|
|
|
* vmin > 0 && vtime > 0:
|
|
|
|
* similar to the previous here, totalread < vmin, and timer
|
|
|
|
* hadn't expired -- WFSO(input_available_event) != WAIT_TIMEOUT,
|
|
|
|
* so "restart timer" and wait until more data arrive
|
|
|
|
*/
|
|
|
|
|
2001-03-11 02:58:23 +01:00
|
|
|
if (vmin == 0)
|
|
|
|
break;
|
2002-10-16 06:54:08 +02:00
|
|
|
|
|
|
|
if (n)
|
|
|
|
waiter = time_to_wait;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
termios_printf ("%d=read(%x, %d)", totalread, ptr, len);
|
2003-09-07 20:27:54 +02:00
|
|
|
len = (size_t) totalread;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2003-03-04 05:07:34 +01:00
|
|
|
int
|
2005-09-28 21:22:25 +02:00
|
|
|
fhandler_tty_slave::dup (fhandler_base *child)
|
2003-03-04 05:07:34 +01:00
|
|
|
{
|
2003-12-11 07:12:41 +01:00
|
|
|
fhandler_tty_slave *arch = (fhandler_tty_slave *) archetype;
|
|
|
|
*(fhandler_tty_slave *) child = *arch;
|
2008-02-07 19:59:40 +01:00
|
|
|
child->set_flags (get_flags ());
|
2003-12-11 07:12:41 +01:00
|
|
|
child->usecount = 0;
|
2003-12-27 18:41:17 +01:00
|
|
|
arch->usecount++;
|
2005-11-14 05:28:45 +01:00
|
|
|
cygheap->manage_console_count ("fhandler_tty_slave::dup", 1);
|
|
|
|
report_tty_counts (child, "duped", "");
|
2003-12-11 07:12:41 +01:00
|
|
|
return 0;
|
2003-03-04 05:07:34 +01:00
|
|
|
}
|
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
int
|
2006-06-02 17:41:34 +02:00
|
|
|
fhandler_pty_master::dup (fhandler_base *child)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2006-06-02 17:41:34 +02:00
|
|
|
fhandler_tty_master *arch = (fhandler_tty_master *) archetype;
|
|
|
|
*(fhandler_tty_master *) child = *arch;
|
2008-02-07 19:59:40 +01:00
|
|
|
child->set_flags (get_flags ());
|
2006-06-02 17:41:34 +02:00
|
|
|
child->usecount = 0;
|
|
|
|
arch->usecount++;
|
|
|
|
report_tty_counts (child, "duped master", "");
|
2000-02-17 20:38:33 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
fhandler_tty_slave::tcgetattr (struct termios *t)
|
|
|
|
{
|
|
|
|
*t = get_ttyp ()->ti;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2000-02-21 06:20:38 +01:00
|
|
|
fhandler_tty_slave::tcsetattr (int, const struct termios *t)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
acquire_output_mutex (INFINITE);
|
|
|
|
get_ttyp ()->ti = *t;
|
|
|
|
release_output_mutex ();
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2003-09-18 20:54:48 +02:00
|
|
|
fhandler_tty_slave::tcflush (int queue)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2003-09-18 20:54:48 +02:00
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
termios_printf ("tcflush(%d) handle %p", queue, get_handle ());
|
|
|
|
|
|
|
|
if (queue == TCIFLUSH || queue == TCIOFLUSH)
|
|
|
|
{
|
|
|
|
size_t len = UINT_MAX;
|
|
|
|
read (NULL, len);
|
2005-08-05 18:11:21 +02:00
|
|
|
ret = ((int) len) >= 0 ? 0 : -1;
|
2003-09-18 20:54:48 +02:00
|
|
|
}
|
|
|
|
if (queue == TCOFLUSH || queue == TCIOFLUSH)
|
|
|
|
{
|
|
|
|
/* do nothing for now. */
|
|
|
|
}
|
|
|
|
|
|
|
|
termios_printf ("%d=tcflush(%d)", ret, queue);
|
|
|
|
return ret;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
fhandler_tty_slave::ioctl (unsigned int cmd, void *arg)
|
|
|
|
{
|
|
|
|
termios_printf ("ioctl (%x)", cmd);
|
|
|
|
|
2002-08-31 05:35:50 +02:00
|
|
|
if (myself->pgid && get_ttyp ()->getpgid () != myself->pgid
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
&& myself->ctty == get_unit () && (get_ttyp ()->ti.c_lflag & TOSTOP))
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
/* background process */
|
2005-11-14 05:28:45 +01:00
|
|
|
termios_printf ("bg ioctl pgid %d, tpgid %d, %s", myself->pgid,
|
|
|
|
get_ttyp ()->getpgid (), myctty ());
|
2002-10-20 06:15:50 +02:00
|
|
|
raise (SIGTTOU);
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
2000-05-12 07:06:43 +02:00
|
|
|
|
2003-10-24 03:13:22 +02:00
|
|
|
int retval;
|
2000-02-17 20:38:33 +01:00
|
|
|
switch (cmd)
|
|
|
|
{
|
|
|
|
case TIOCGWINSZ:
|
|
|
|
case TIOCSWINSZ:
|
2003-09-27 04:36:50 +02:00
|
|
|
case TIOCLINUX:
|
2006-07-03 17:29:10 +02:00
|
|
|
case KDGKBMETA:
|
|
|
|
case KDSKBMETA:
|
2000-02-17 20:38:33 +01:00
|
|
|
break;
|
|
|
|
case FIONBIO:
|
2001-08-15 09:49:15 +02:00
|
|
|
set_nonblocking (*(int *) arg);
|
2003-10-24 03:13:22 +02:00
|
|
|
retval = 0;
|
2000-05-12 07:06:43 +02:00
|
|
|
goto out;
|
2000-02-17 20:38:33 +01:00
|
|
|
default:
|
|
|
|
set_errno (EINVAL);
|
|
|
|
return -1;
|
|
|
|
}
|
2000-05-12 07:06:43 +02:00
|
|
|
|
|
|
|
acquire_output_mutex (INFINITE);
|
|
|
|
|
|
|
|
get_ttyp ()->cmd = cmd;
|
|
|
|
get_ttyp ()->ioctl_retval = 0;
|
2006-07-17 21:30:30 +02:00
|
|
|
int val;
|
2000-05-12 07:06:43 +02:00
|
|
|
switch (cmd)
|
|
|
|
{
|
|
|
|
case TIOCGWINSZ:
|
|
|
|
get_ttyp ()->arg.winsize = get_ttyp ()->winsize;
|
|
|
|
if (ioctl_request_event)
|
|
|
|
SetEvent (ioctl_request_event);
|
2002-11-04 02:10:38 +01:00
|
|
|
*(struct winsize *) arg = get_ttyp ()->arg.winsize;
|
2000-05-12 07:06:43 +02:00
|
|
|
if (ioctl_done_event)
|
|
|
|
WaitForSingleObject (ioctl_done_event, INFINITE);
|
|
|
|
get_ttyp ()->winsize = get_ttyp ()->arg.winsize;
|
|
|
|
break;
|
|
|
|
case TIOCSWINSZ:
|
2002-11-04 02:10:38 +01:00
|
|
|
if (get_ttyp ()->winsize.ws_row != ((struct winsize *) arg)->ws_row
|
|
|
|
|| get_ttyp ()->winsize.ws_col != ((struct winsize *) arg)->ws_col)
|
|
|
|
{
|
2004-01-21 07:28:35 +01:00
|
|
|
get_ttyp ()->arg.winsize = *(struct winsize *) arg;
|
|
|
|
if (ioctl_request_event)
|
2002-11-04 02:10:38 +01:00
|
|
|
{
|
2004-01-21 07:28:35 +01:00
|
|
|
get_ttyp ()->ioctl_retval = -EINVAL;
|
2003-09-27 05:14:07 +02:00
|
|
|
SetEvent (ioctl_request_event);
|
2004-01-21 07:28:35 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2002-11-04 02:10:38 +01:00
|
|
|
get_ttyp ()->winsize = *(struct winsize *) arg;
|
2004-01-19 06:46:54 +01:00
|
|
|
killsys (-get_ttyp ()->getpgid (), SIGWINCH);
|
2002-11-04 02:10:38 +01:00
|
|
|
}
|
2004-01-21 07:28:35 +01:00
|
|
|
if (ioctl_done_event)
|
|
|
|
WaitForSingleObject (ioctl_done_event, INFINITE);
|
2002-11-04 02:10:38 +01:00
|
|
|
}
|
2000-05-12 07:06:43 +02:00
|
|
|
break;
|
2003-09-27 04:36:50 +02:00
|
|
|
case TIOCLINUX:
|
2006-07-17 21:30:30 +02:00
|
|
|
val = *(unsigned char *) arg;
|
2003-09-27 05:14:07 +02:00
|
|
|
if (val != 6 || !ioctl_request_event || !ioctl_done_event)
|
|
|
|
get_ttyp ()->ioctl_retval = -EINVAL;
|
|
|
|
else
|
2003-09-27 04:36:50 +02:00
|
|
|
{
|
2003-09-27 05:14:07 +02:00
|
|
|
get_ttyp ()->arg.value = val;
|
2003-09-27 04:36:50 +02:00
|
|
|
SetEvent (ioctl_request_event);
|
|
|
|
WaitForSingleObject (ioctl_done_event, INFINITE);
|
2009-05-06 19:16:33 +02:00
|
|
|
*(unsigned char *) arg = (unsigned char) (get_ttyp ()->arg.value);
|
2003-09-27 04:36:50 +02:00
|
|
|
}
|
|
|
|
break;
|
2006-07-03 17:29:10 +02:00
|
|
|
case KDGKBMETA:
|
|
|
|
if (ioctl_request_event)
|
|
|
|
{
|
|
|
|
SetEvent (ioctl_request_event);
|
|
|
|
if (ioctl_done_event)
|
|
|
|
WaitForSingleObject (ioctl_done_event, INFINITE);
|
|
|
|
*(int *) arg = get_ttyp ()->arg.value;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
get_ttyp ()->ioctl_retval = -EINVAL;
|
|
|
|
break;
|
|
|
|
case KDSKBMETA:
|
|
|
|
if (ioctl_request_event)
|
|
|
|
{
|
|
|
|
get_ttyp ()->arg.value = (int) arg;
|
|
|
|
SetEvent (ioctl_request_event);
|
|
|
|
if (ioctl_done_event)
|
|
|
|
WaitForSingleObject (ioctl_done_event, INFINITE);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
get_ttyp ()->ioctl_retval = -EINVAL;
|
|
|
|
break;
|
2000-05-12 07:06:43 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
release_output_mutex ();
|
2003-10-24 03:13:22 +02:00
|
|
|
retval = get_ttyp ()->ioctl_retval;
|
2003-09-27 05:14:07 +02:00
|
|
|
if (retval < 0)
|
|
|
|
{
|
|
|
|
set_errno (-retval);
|
|
|
|
retval = -1;
|
|
|
|
}
|
2003-10-24 03:13:22 +02:00
|
|
|
|
|
|
|
out:
|
2003-09-27 05:14:07 +02:00
|
|
|
termios_printf ("%d = ioctl (%x)", retval, cmd);
|
|
|
|
return retval;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2010-04-19 21:52:43 +02:00
|
|
|
int __stdcall
|
|
|
|
fhandler_tty_slave::fstat (struct __stat64 *st)
|
|
|
|
{
|
|
|
|
fhandler_base::fstat (st);
|
|
|
|
|
|
|
|
bool to_close = false;
|
|
|
|
if (!input_available_event)
|
|
|
|
{
|
|
|
|
char buf[MAX_PATH];
|
|
|
|
shared_name (buf, INPUT_AVAILABLE_EVENT, get_unit ());
|
|
|
|
input_available_event = OpenEvent (READ_CONTROL, TRUE, buf);
|
|
|
|
if (input_available_event)
|
|
|
|
to_close = true;
|
|
|
|
}
|
|
|
|
if (!input_available_event
|
|
|
|
|| get_object_attribute (input_available_event, &st->st_uid, &st->st_gid,
|
|
|
|
&st->st_mode))
|
|
|
|
{
|
|
|
|
/* If we can't access the ACL, or if the tty doesn't actually exist,
|
|
|
|
then fake uid and gid to strict, system-like values. */
|
|
|
|
st->st_mode = S_IFCHR | S_IRUSR | S_IWUSR;
|
|
|
|
st->st_uid = 18;
|
|
|
|
st->st_gid = 544;
|
|
|
|
}
|
|
|
|
if (to_close)
|
|
|
|
CloseHandle (input_available_event);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Helper function for fchmod and fchown, which just opens all handles
|
|
|
|
and signals success via bool return. */
|
|
|
|
bool
|
|
|
|
fhandler_tty_slave::fch_open_handles ()
|
|
|
|
{
|
|
|
|
char buf[MAX_PATH];
|
|
|
|
|
|
|
|
tc = cygwin_shared->tty[get_unit ()];
|
|
|
|
shared_name (buf, INPUT_AVAILABLE_EVENT, get_unit ());
|
|
|
|
input_available_event = OpenEvent (READ_CONTROL | WRITE_DAC | WRITE_OWNER,
|
|
|
|
TRUE, buf);
|
|
|
|
output_mutex = get_ttyp ()->open_output_mutex (WRITE_DAC | WRITE_OWNER);
|
|
|
|
input_mutex = get_ttyp ()->open_input_mutex (WRITE_DAC | WRITE_OWNER);
|
|
|
|
inuse = get_ttyp ()->open_inuse (WRITE_DAC | WRITE_OWNER);
|
|
|
|
if (!input_available_event || !output_mutex || !input_mutex || !inuse)
|
|
|
|
{
|
|
|
|
__seterrno ();
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
/* These members are optional, no error checking */
|
|
|
|
shared_name (buf, OUTPUT_DONE_EVENT, get_unit ());
|
|
|
|
output_done_event = OpenEvent (WRITE_DAC | WRITE_OWNER, TRUE, buf);
|
|
|
|
shared_name (buf, IOCTL_REQUEST_EVENT, get_unit ());
|
|
|
|
ioctl_request_event = OpenEvent (WRITE_DAC | WRITE_OWNER, TRUE, buf);
|
|
|
|
shared_name (buf, IOCTL_DONE_EVENT, get_unit ());
|
|
|
|
ioctl_done_event = OpenEvent (WRITE_DAC | WRITE_OWNER, TRUE, buf);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Helper function for fchmod and fchown, which sets the new security
|
|
|
|
descriptor on all objects representing the tty. */
|
|
|
|
int
|
|
|
|
fhandler_tty_slave::fch_set_sd (security_descriptor &sd, bool chown)
|
|
|
|
{
|
|
|
|
security_descriptor sd_old;
|
|
|
|
|
|
|
|
get_object_sd (input_available_event, sd_old);
|
2010-04-19 22:00:18 +02:00
|
|
|
if (!set_object_sd (input_available_event, sd, chown)
|
2010-04-19 21:52:43 +02:00
|
|
|
&& !set_object_sd (output_mutex, sd, chown)
|
|
|
|
&& !set_object_sd (input_mutex, sd, chown)
|
|
|
|
&& !set_object_sd (inuse, sd, chown)
|
|
|
|
&& (!output_done_event
|
|
|
|
|| !set_object_sd (output_done_event, sd, chown))
|
|
|
|
&& (!ioctl_request_event
|
|
|
|
|| !set_object_sd (ioctl_request_event, sd, chown))
|
|
|
|
&& (!ioctl_done_event
|
|
|
|
|| !set_object_sd (ioctl_done_event, sd, chown)))
|
|
|
|
return 0;
|
|
|
|
set_object_sd (input_available_event, sd_old, chown);
|
|
|
|
set_object_sd (output_mutex, sd_old, chown);
|
|
|
|
set_object_sd (input_mutex, sd_old, chown);
|
|
|
|
set_object_sd (inuse, sd_old, chown);
|
|
|
|
if (!output_done_event)
|
|
|
|
set_object_sd (output_done_event, sd_old, chown);
|
|
|
|
if (!ioctl_request_event)
|
|
|
|
set_object_sd (ioctl_request_event, sd_old, chown);
|
|
|
|
if (!ioctl_done_event)
|
|
|
|
set_object_sd (ioctl_done_event, sd_old, chown);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Helper function for fchmod and fchown, which closes all object handles in
|
|
|
|
the tty. */
|
|
|
|
void
|
|
|
|
fhandler_tty_slave::fch_close_handles ()
|
|
|
|
{
|
|
|
|
close_maybe (get_io_handle ());
|
|
|
|
close_maybe (get_output_handle ());
|
|
|
|
close_maybe (output_done_event);
|
|
|
|
close_maybe (ioctl_done_event);
|
|
|
|
close_maybe (ioctl_request_event);
|
|
|
|
close_maybe (input_available_event);
|
|
|
|
close_maybe (output_mutex);
|
|
|
|
close_maybe (input_mutex);
|
|
|
|
close_maybe (inuse);
|
|
|
|
}
|
|
|
|
|
|
|
|
int __stdcall
|
|
|
|
fhandler_tty_slave::fchmod (mode_t mode)
|
|
|
|
{
|
|
|
|
int ret = -1;
|
|
|
|
bool to_close = false;
|
|
|
|
security_descriptor sd;
|
|
|
|
__uid32_t uid;
|
|
|
|
__gid32_t gid;
|
|
|
|
|
|
|
|
if (!input_available_event)
|
|
|
|
{
|
|
|
|
to_close = true;
|
|
|
|
if (!fch_open_handles ())
|
|
|
|
goto errout;
|
|
|
|
}
|
|
|
|
sd.malloc (sizeof (SECURITY_DESCRIPTOR));
|
|
|
|
InitializeSecurityDescriptor (sd, SECURITY_DESCRIPTOR_REVISION);
|
|
|
|
if (!get_object_attribute (input_available_event, &uid, &gid, NULL)
|
|
|
|
&& !create_object_sd_from_attribute (NULL, uid, gid, S_IFCHR | mode, sd))
|
|
|
|
ret = fch_set_sd (sd, false);
|
|
|
|
errout:
|
|
|
|
if (to_close)
|
|
|
|
fch_close_handles ();
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
int __stdcall
|
|
|
|
fhandler_tty_slave::fchown (__uid32_t uid, __gid32_t gid)
|
|
|
|
{
|
|
|
|
int ret = -1;
|
|
|
|
bool to_close = false;
|
|
|
|
mode_t mode;
|
|
|
|
__uid32_t o_uid;
|
|
|
|
__gid32_t o_gid;
|
|
|
|
security_descriptor sd;
|
|
|
|
|
|
|
|
if (uid == ILLEGAL_UID && gid == ILLEGAL_GID)
|
|
|
|
return 0;
|
|
|
|
if (!input_available_event)
|
|
|
|
{
|
|
|
|
to_close = true;
|
|
|
|
if (!fch_open_handles ())
|
|
|
|
goto errout;
|
|
|
|
}
|
|
|
|
sd.malloc (sizeof (SECURITY_DESCRIPTOR));
|
|
|
|
InitializeSecurityDescriptor (sd, SECURITY_DESCRIPTOR_REVISION);
|
|
|
|
if (!get_object_attribute (input_available_event, &o_uid, &o_gid, &mode))
|
|
|
|
{
|
|
|
|
if ((uid == ILLEGAL_UID || uid == o_uid)
|
|
|
|
&& (gid == ILLEGAL_GID || gid == o_gid))
|
|
|
|
ret = 0;
|
|
|
|
else if (!create_object_sd_from_attribute (input_available_event,
|
|
|
|
uid, gid, S_IFCHR | mode, sd))
|
|
|
|
ret = fch_set_sd (sd, true);
|
|
|
|
}
|
|
|
|
errout:
|
|
|
|
if (to_close)
|
|
|
|
fch_close_handles ();
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
/*******************************************************
|
|
|
|
fhandler_pty_master
|
|
|
|
*/
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
fhandler_pty_master::fhandler_pty_master ()
|
2006-06-02 17:41:34 +02:00
|
|
|
: fhandler_tty_common (), pktmode (0), need_nl (0), dwProcessId (0)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
fhandler_pty_master::open (int flags, mode_t)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2006-06-03 22:32:07 +02:00
|
|
|
int ntty;
|
|
|
|
ntty = cygwin_shared->tty.allocate (false);
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
if (ntty < 0)
|
2000-02-17 20:38:33 +01:00
|
|
|
return 0;
|
|
|
|
|
2006-06-03 23:44:01 +02:00
|
|
|
dev().devn = FHDEV (DEV_TTYM_MAJOR, ntty);
|
|
|
|
if (!setup (true))
|
2006-06-02 17:41:34 +02:00
|
|
|
{
|
2006-06-03 22:32:07 +02:00
|
|
|
lock_ttys::release ();
|
2006-06-02 17:41:34 +02:00
|
|
|
return 0;
|
|
|
|
}
|
2006-06-03 22:32:07 +02:00
|
|
|
lock_ttys::release ();
|
2002-07-01 21:03:26 +02:00
|
|
|
set_flags ((flags & ~O_TEXT) | O_BINARY);
|
2001-04-24 04:07:58 +02:00
|
|
|
set_open_status ();
|
2006-06-02 17:41:34 +02:00
|
|
|
//
|
|
|
|
// FIXME: Do this better someday
|
2007-11-26 22:30:49 +01:00
|
|
|
fhandler_pty_master *arch = (fhandler_tty_master *) cmalloc_abort (HEAP_ARCHETYPES, sizeof (*this));
|
2006-06-02 17:41:34 +02:00
|
|
|
*((fhandler_pty_master **) cygheap->fdtab.add_archetype ()) = arch;
|
|
|
|
archetype = arch;
|
|
|
|
*arch = *this;
|
|
|
|
arch->dwProcessId = GetCurrentProcessId ();
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2006-06-02 17:41:34 +02:00
|
|
|
usecount = 0;
|
|
|
|
arch->usecount++;
|
2006-06-03 22:32:07 +02:00
|
|
|
char buf[sizeof ("opened pty master for ttyNNNNNNNNNNN")];
|
|
|
|
__small_sprintf (buf, "opened pty master for tty%d", get_unit ());
|
|
|
|
report_tty_counts (this, buf, "");
|
2000-02-17 20:38:33 +01:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2005-08-18 22:17:10 +02:00
|
|
|
_off64_t
|
|
|
|
fhandler_tty_common::lseek (_off64_t, int)
|
|
|
|
{
|
|
|
|
set_errno (ESPIPE);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
int
|
|
|
|
fhandler_tty_common::close ()
|
|
|
|
{
|
2003-12-10 04:19:19 +01:00
|
|
|
termios_printf ("tty%d <%p,%p> closing", get_unit (), get_handle (), get_output_handle ());
|
2000-02-17 20:38:33 +01:00
|
|
|
if (output_done_event && !CloseHandle (output_done_event))
|
|
|
|
termios_printf ("CloseHandle (output_done_event), %E");
|
|
|
|
if (ioctl_done_event && !CloseHandle (ioctl_done_event))
|
|
|
|
termios_printf ("CloseHandle (ioctl_done_event), %E");
|
|
|
|
if (ioctl_request_event && !CloseHandle (ioctl_request_event))
|
|
|
|
termios_printf ("CloseHandle (ioctl_request_event), %E");
|
2001-03-04 16:34:25 +01:00
|
|
|
if (!ForceCloseHandle (input_mutex))
|
|
|
|
termios_printf ("CloseHandle (input_mutex<%p>), %E", input_mutex);
|
2002-02-22 20:33:41 +01:00
|
|
|
if (!ForceCloseHandle (output_mutex))
|
|
|
|
termios_printf ("CloseHandle (output_mutex<%p>), %E", output_mutex);
|
2005-08-17 18:10:48 +02:00
|
|
|
if (!ForceCloseHandle1 (get_handle (), from_pty))
|
|
|
|
termios_printf ("CloseHandle (get_handle ()<%p>), %E", get_handle ());
|
|
|
|
if (!ForceCloseHandle1 (get_output_handle (), to_pty))
|
|
|
|
termios_printf ("CloseHandle (get_output_handle ()<%p>), %E", get_output_handle ());
|
2001-03-19 19:27:37 +01:00
|
|
|
|
2001-03-04 16:34:25 +01:00
|
|
|
if (!ForceCloseHandle (input_available_event))
|
|
|
|
termios_printf ("CloseHandle (input_available_event<%p>), %E", input_available_event);
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
fhandler_pty_master::close ()
|
|
|
|
{
|
|
|
|
#if 0
|
|
|
|
while (accept_input () > 0)
|
|
|
|
continue;
|
|
|
|
#endif
|
2006-06-02 17:41:34 +02:00
|
|
|
archetype->usecount--;
|
|
|
|
report_tty_counts (this, "closing master", "");
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2006-06-02 17:41:34 +02:00
|
|
|
if (archetype->usecount)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2006-06-02 17:41:34 +02:00
|
|
|
#ifdef DEBUGGING
|
|
|
|
if (archetype->usecount < 0)
|
|
|
|
system_printf ("error: usecount %d", archetype->usecount);
|
2000-10-17 03:42:04 +02:00
|
|
|
#endif
|
2006-06-02 17:41:34 +02:00
|
|
|
termios_printf ("just returning because archetype usecount is != 0");
|
|
|
|
return 0;
|
|
|
|
}
|
2005-08-17 18:10:48 +02:00
|
|
|
|
2006-06-02 17:41:34 +02:00
|
|
|
fhandler_tty_master *arch = (fhandler_tty_master *) archetype;
|
2006-06-12 16:56:31 +02:00
|
|
|
termios_printf ("closing from_master(%p)/to_master(%p) since we own them(%d)",
|
|
|
|
arch->from_master, arch->to_master, arch->dwProcessId);
|
2009-06-15 01:42:09 +02:00
|
|
|
if (cygwin_finished_initializing)
|
|
|
|
{
|
2010-04-19 21:52:43 +02:00
|
|
|
if (arch->master_ctl && get_ttyp ()->master_pid == myself->pid)
|
|
|
|
{
|
|
|
|
char buf[MAX_PATH];
|
|
|
|
pipe_request req = { (DWORD) -1 };
|
|
|
|
pipe_reply repl;
|
|
|
|
DWORD len;
|
|
|
|
|
|
|
|
__small_sprintf (buf, "\\\\.\\pipe\\cygwin-%S-tty%d-master-ctl",
|
|
|
|
&installation_key, get_unit ());
|
|
|
|
CallNamedPipe (buf, &req, sizeof req, &repl, sizeof repl, &len, 500);
|
|
|
|
CloseHandle (arch->master_ctl);
|
|
|
|
}
|
2009-06-15 01:42:09 +02:00
|
|
|
if (!ForceCloseHandle (arch->from_master))
|
|
|
|
termios_printf ("error closing from_master %p, %E", arch->from_master);
|
|
|
|
if (!ForceCloseHandle (arch->to_master))
|
|
|
|
termios_printf ("error closing from_master %p, %E", arch->to_master);
|
|
|
|
}
|
2006-06-02 17:41:34 +02:00
|
|
|
fhandler_tty_common::close ();
|
2005-08-17 18:10:48 +02:00
|
|
|
|
2006-06-03 22:32:07 +02:00
|
|
|
if (hExeced || get_ttyp ()->master_pid != myself->pid)
|
|
|
|
termios_printf ("not clearing: %d, master_pid %d", hExeced, get_ttyp ()->master_pid);
|
|
|
|
else
|
|
|
|
get_ttyp ()->set_master_closed ();
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-07-24 22:54:33 +02:00
|
|
|
ssize_t __stdcall
|
2000-02-17 20:38:33 +01:00
|
|
|
fhandler_pty_master::write (const void *ptr, size_t len)
|
|
|
|
{
|
2002-12-20 02:38:55 +01:00
|
|
|
int i;
|
2002-12-05 17:24:52 +01:00
|
|
|
char *p = (char *) ptr;
|
2002-12-27 04:50:29 +01:00
|
|
|
termios ti = tc->ti;
|
|
|
|
|
|
|
|
for (i = 0; i < (int) len; i++)
|
2002-12-20 02:38:55 +01:00
|
|
|
{
|
2002-12-27 04:50:29 +01:00
|
|
|
line_edit_status status = line_edit (p++, 1, ti);
|
2002-12-21 05:38:12 +01:00
|
|
|
if (status > line_edit_signalled)
|
|
|
|
{
|
|
|
|
if (status != line_edit_pipe_full)
|
|
|
|
i = -1;
|
|
|
|
break;
|
|
|
|
}
|
2002-12-20 02:38:55 +01:00
|
|
|
}
|
2002-12-05 17:24:52 +01:00
|
|
|
return i;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2002-12-14 05:01:32 +01:00
|
|
|
void __stdcall
|
|
|
|
fhandler_pty_master::read (void *ptr, size_t& len)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2003-09-07 20:27:54 +02:00
|
|
|
len = (size_t) process_slave_output ((char *) ptr, len, pktmode);
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
fhandler_pty_master::tcgetattr (struct termios *t)
|
|
|
|
{
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
*t = cygwin_shared->tty[get_unit ()]->ti;
|
2000-02-17 20:38:33 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2000-02-21 06:20:38 +01:00
|
|
|
fhandler_pty_master::tcsetattr (int, const struct termios *t)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
cygwin_shared->tty[get_unit ()]->ti = *t;
|
2000-02-17 20:38:33 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2003-09-18 20:54:48 +02:00
|
|
|
fhandler_pty_master::tcflush (int queue)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2003-09-18 20:54:48 +02:00
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
termios_printf ("tcflush(%d) handle %p", queue, get_handle ());
|
|
|
|
|
|
|
|
if (queue == TCIFLUSH || queue == TCIOFLUSH)
|
|
|
|
ret = process_slave_output (NULL, OUT_BUFFER_SIZE, 0);
|
|
|
|
else if (queue == TCIFLUSH || queue == TCIOFLUSH)
|
|
|
|
{
|
|
|
|
/* do nothing for now. */
|
|
|
|
}
|
|
|
|
|
|
|
|
termios_printf ("%d=tcflush(%d)", ret, queue);
|
|
|
|
return ret;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
fhandler_pty_master::ioctl (unsigned int cmd, void *arg)
|
|
|
|
{
|
|
|
|
switch (cmd)
|
|
|
|
{
|
|
|
|
case TIOCPKT:
|
2003-09-27 05:14:07 +02:00
|
|
|
pktmode = *(int *) arg;
|
2000-02-17 20:38:33 +01:00
|
|
|
break;
|
|
|
|
case TIOCGWINSZ:
|
2002-12-27 06:31:30 +01:00
|
|
|
*(struct winsize *) arg = get_ttyp ()->winsize;
|
2000-02-17 20:38:33 +01:00
|
|
|
break;
|
|
|
|
case TIOCSWINSZ:
|
2002-11-04 02:10:38 +01:00
|
|
|
if (get_ttyp ()->winsize.ws_row != ((struct winsize *) arg)->ws_row
|
|
|
|
|| get_ttyp ()->winsize.ws_col != ((struct winsize *) arg)->ws_col)
|
|
|
|
{
|
2003-09-27 05:14:07 +02:00
|
|
|
get_ttyp ()->winsize = *(struct winsize *) arg;
|
2004-01-19 06:46:54 +01:00
|
|
|
killsys (-get_ttyp ()->getpgid (), SIGWINCH);
|
2002-11-04 02:10:38 +01:00
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
break;
|
|
|
|
case FIONBIO:
|
2001-08-15 09:49:15 +02:00
|
|
|
set_nonblocking (*(int *) arg);
|
2000-02-17 20:38:33 +01:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
set_errno (EINVAL);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
char *
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
fhandler_pty_master::ptsname ()
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2007-11-28 17:45:34 +01:00
|
|
|
static char buf[TTY_NAME_MAX];
|
2000-02-17 20:38:33 +01:00
|
|
|
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
__small_sprintf (buf, "/dev/tty%d", get_unit ());
|
2000-02-17 20:38:33 +01:00
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2004-04-10 15:45:10 +02:00
|
|
|
fhandler_tty_common::set_close_on_exec (bool val)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2006-06-02 17:41:34 +02:00
|
|
|
// Cygwin processes will handle this specially on exec.
|
|
|
|
close_on_exec (val);
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2003-03-04 05:07:34 +01:00
|
|
|
void
|
|
|
|
fhandler_tty_slave::fixup_after_fork (HANDLE parent)
|
|
|
|
{
|
2006-06-02 17:41:34 +02:00
|
|
|
// fork_fixup (parent, inuse, "inuse");
|
2003-12-30 02:57:16 +01:00
|
|
|
// fhandler_tty_common::fixup_after_fork (parent);
|
2005-11-14 05:28:45 +01:00
|
|
|
report_tty_counts (this, "inherited", "");
|
2003-03-04 05:07:34 +01:00
|
|
|
}
|
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
void
|
2006-06-02 17:41:34 +02:00
|
|
|
fhandler_tty_slave::fixup_after_exec ()
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2006-06-03 08:35:10 +02:00
|
|
|
if (!close_on_exec ())
|
2006-06-02 17:41:34 +02:00
|
|
|
fixup_after_fork (NULL);
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
fhandler_tty_master::init_console ()
|
|
|
|
{
|
* devices.cc: New file.
* devices.gperf: New file.
* devices.shilka: New file.
* cygwin-gperf: New file.
* cygwin-shilka: New file.
* fhandler_fifo.cc: New file.
* fhandler_nodevice.cc : New file. Reorganize headers so that path.h precedes
fhandler.h throughout. Remove device argument and unit arguments from fhandler
constructors throughout. Remove pc arguments to fhandler functions and use
internal pc element instead, throughout. Use dev element in pc throughout.
Use major/minor elements rather than units and device numbers previously in
fhandler class. Use correct methods for fhandler file names rather than
directly accessing file name variables, throughout.
* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
* dcrt0.cc (dll_crt0_1): Call device::init.
* devices.h: Renumber devices based on more Linux-like major/minor numbers.
Add more devices. Declare standard device storage.
(device): Declare struct.
* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
* dtable.cc (dtable::get_debugger_info): Ditto.
(cygwin_attach_handle_to_fd): Ditto.
(dtable::release): Remove special FH_SOCKET case in favor of generic
"need_fixup_before" test.
(dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
to build standard fhandler.
(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name. Move
out of dtable class. Don't accept a path_conv argument. Just build it here
and pass it to:
(build_fh_pc): Renamed from dtable::build_fhandler. Move out of dtable class.
Use intrinsic device type in path_conv to create new fhandler.
(build_fh_dev): Renamed from dtable::build_fhandler. Move out of dtable class.
Simplify arguments to just take new 'device' type and a name. Just return
pointer to fhandler rather than trying to insert into dtable.
(dtable::dup_worker): Accommodate above build_fh name changes.
(dtable::find_fifo): New (currently broken) function.
(handle_to_fn): Use strechr for efficiency.
* dtable.h: Reflect above build_fh name changes and argument differences.
(fhandler_base *&operator []): Return self rather than copy of self.
* fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
path.
(fhandler_base::set_name): Ditto.
(fhandler_base::raw_read): Use method to access name.
(fhandler_base::write): Correctly use get_output_handle rather than get_handle.
(handler_base::device_access_denied): New function.
(fhandler_base::open): Eliminate pc argument and use pc element of
fhandler_base throughout.
(fhandler_base::fstat): Detect if device is based in filesystem and use
fstat_fs to calculate stat, if so.
(fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
just free appropriate component from pc.
(fhandler_base::opendir): Remove path_conv parameter.
* fhandler.h: Remove all device flags.
(fhandler_base::pc): New element.
(fhandler_base::set_name): Change argument to path_conv.
(fhandler_base::error): New function.
(fhandler_base::exists): New function.
(fhandler_base::pc_binmode): New function.
(fhandler_base::dev): New function.
(fhandler_base::open_fs): New function.
(fhandler_base::fstat_fs): New function.
(fhandler_base::fstat_by_name): New function.
(fhandler_base::fstat_by_handle): New function.
(fhandler_base::isfifo): New function.
(fhandler_base::is_slow): New function.
(fhandler_base::is_auto_device): New function.
(fhandler_base::is_fs_special): New function.
(fhandler_base::device_access_denied): New function.
(fhandler_base::operator DWORD&): New operator.
(fhandler_base::get_name): Return normalized path from pc.
(fhandler_base::get_win32_name): Return windows path from pc.
(fhandler_base::isdevice): Renamed from is_device.
(fhandler_base::get_native_name): Return device format.
(fhandler_fifo): New class.
(fhandler_nodevice): New class.
(select_stuff::device_specific): Remove array.
(select_stuff::device_specific_pipe): New class element.
(select_stuff::device_specific_socket): New class element.
(select_stuff::device_specific_serial): New class element.
(select_stuff::select_stuff): Initialize new elements.
* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
from fhandler_disk_file.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_base::fstat_by_name): Ditto.
(fhandler_disk_file::open): Move most functionality into
fhandler_base::open_fs.
(fhandler_base::open_fs): New function.
(fhandler_disk_file::close): Move most functionality into
fhandler_base::close_fs.
(fhandler_base::close_fs): New function.
* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
output.
* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
urandom device into appropriate place.
(fhandler_socket::accept): Reflect change in fdsock return value.
* fhandler_tty.cc: See "throughouts" above.
* net.cc: Accommodate fdsock change throughout.
(fdsock): Return success or failure, accept fd argument and device argument.
* path.cc (symlink_info::major): New element.
(symlink_info::minor): New element.
(symlink_info::parse_device): Declare new function.
(fs_info::update): Accommodate changes in path_conv class.
(path_conv::fillin): Ditto.
(path_conv::return_and_clear_normalized_path): Eliminate.
(path_conv::set_normalized_path): New function.
(path_conv::path_conv): Set info in dev element. Use path_conv methods Check
for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
where appropriate rather than direct access. Use set_normalized_path to set
normalized path.
(windows_device_names): Eliminate.
(get_dev): Ditto.
(get_raw_device_number): Ditto.
(get_device_number): Ditto.
(win32_device_name): Call new device name parser to do most of the heavy
lifting.
(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
(symlink_worker): Handle new device files.
(symlink_info::check): Ditto.
(symlink_info::parse_device): Define new function.
* path.h (executable_states): Move here from fhandler.h.
(fs_info): Rename variables to *_storage and create methods for accessing same.
(path_conv): Add dev element, remove devn and unit and adjust inline methods to
accommodate.
(set_normalized_path): Declare new function.
* pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
(_pinfo::commune_send): Ditto.
* pipe.cc (fhandler_pipe::close): check for existence of handle before closing
it.
(handler_pipe::create): Rename from make_pipe. Change arguments to accept
fhandler_pipe array. Accommodate fifos.
(pipe): Rework to deal with fhandler_pipe::create changes.
(_pipe): Ditto.
* select.cc: Use individual device_specific types throughout rather than
indexing with obsolete device number.
(set_bits): Use is_socket call rather than checking device number.
* shared_info.h (CURR_MOUNT_MAGIC): Update.
(conv_to_win32_path): Reflect addition of device argument.
* syscalls.cc (mknod_worker): New function.
(open): Use build_fh_name to build fhandler.
(chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(chmod_device): New function.
(chmod): Detect if this is an 'auto' device rather than an on-filesystem device
and handle appropriately. Use chmod_device to set mode of in-filesystem
devices.
(stat_worker): Eliminate path_conv argument. Call build_fh_name to construct
fhandler. Use fh->error() rather than pc->error to detect errors in fhandler
construction.
(access_worker): New function pulled from access. Accommodate in-filesystem
devices.
(access): Use access_worker.
(fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
device and handle appropriately.
(mknod_worker): New function.
(mknod32): New function.
(chroot): Free normalized path -- assuming it was actually cmalloced.
* tty.cc (create_tty_master): Tweak for new device class.
(tty::common_init): Ditto.
* winsup.h (stat_worker): Remove.
(symlink_worker): Declare.
* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
worry about pending_signals since sig_dispatch_pending should always do the
right thing now.
(sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
* pinfo.h: Move __SIG enum to sigproc.h.
(PICOM_FIFO): New enum element.
(_pinfo): Remove 'thread2signal' stuff throughout class.
(_pinfo::commune_send): Make varargs.
(_pinfo::sigtodo): Eliminate.
(_pinfo::thread2signal): Ditto.
* signal.cc (kill_worker): Eliminate call to setthread2signal.
* sigproc.cc (local_sigtodo): Eliminate.
(getlocal_sigtodo): Ditto.
(sigelem): New class.
(pending_signals): New class.
(sigqueue): New variable, start of sigqueue linked list.
(sigcatch_nonmain): Eliminate.
(sigcatch_main): Eliminate.
(sigcatch_nosync): Eliminate.
(sigcomplete_nonmain): Eliminate.
(pending_signals): Eliminate.
(sig_clear): Call signal thread to clear pending signals, unless already in
signal thread.
(sigpending): Call signal thread to get pending signals.
(sig_dispatch_pending): Eliminate use of pending_signals and just check
sigqueue.
(sigproc_terminate): Eliminate all of the obsolete semaphore stuff. Close
signal pipe handle.
(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
signals.
(getevent): Eliminate.
(pending_signals::add): New function.
(pending_signals::del): New function.
(pending_signals::next): New function.
(wait_sig): Eliminate all of the obsolete semaphore stuff. Use pipe to
communicate and maintain a linked list of signals.
* sigproc.h: Move __SIG defines here. Add __SIGPENDING.
(sig_dispatch_pending): Remove "C" specifier.
(sig_handle): Accept a mask argument.
* thread.cc: Remove signal handling considerations throughout.
2003-09-25 02:37:18 +02:00
|
|
|
console = (fhandler_console *) build_fh_dev (*console_dev, "/dev/ttym");
|
2000-02-17 20:38:33 +01:00
|
|
|
if (console == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
console->init (INVALID_HANDLE_VALUE, GENERIC_READ | GENERIC_WRITE, O_BINARY);
|
2005-11-14 05:28:45 +01:00
|
|
|
cygheap->manage_console_count ("fhandler_tty_master::init_console", -1, true);
|
2004-04-10 15:45:10 +02:00
|
|
|
console->uninterruptible_io (true);
|
2000-02-17 20:38:33 +01:00
|
|
|
return 0;
|
|
|
|
}
|
2006-06-02 17:41:34 +02:00
|
|
|
|
2010-04-19 21:52:43 +02:00
|
|
|
extern "C" BOOL WINAPI GetNamedPipeClientProcessId (HANDLE, PULONG);
|
|
|
|
|
|
|
|
/* This thread function handles the master control pipe. It waits for a
|
|
|
|
client to connect. Then it checks if the client process has permissions
|
|
|
|
to access the tty handles. If so, it opens the client process and
|
|
|
|
duplicates the handles into that process. If that fails, it sends a reply
|
|
|
|
with at least one handle set to NULL and an error code. Last but not
|
|
|
|
least, the client is disconnected and the thread waits for the next client.
|
|
|
|
|
|
|
|
A special case is when the master side of the tty is about to be closed.
|
|
|
|
The client side is the fhandler_pty_master::close function and it sends
|
|
|
|
a PID -1 in that case. On Vista and later a check is performed that the
|
|
|
|
request to leave really comes from the master process itself. On earlier
|
|
|
|
OSes there's no function to check for the PID of the client process so
|
|
|
|
we have to trust the client side.
|
|
|
|
|
|
|
|
Since there's
|
|
|
|
always only one pipe instance, there's a chance that clients have to
|
|
|
|
wait to connect to the master control pipe. Therefore the client calls
|
|
|
|
to CallNamedPipe should have a big enough timeout value. For now this
|
|
|
|
is 500ms. Hope that's enough. */
|
|
|
|
|
|
|
|
DWORD
|
|
|
|
fhandler_pty_master::pty_master_thread ()
|
|
|
|
{
|
|
|
|
bool exit = false;
|
|
|
|
GENERIC_MAPPING map = { EVENT_QUERY_STATE, EVENT_MODIFY_STATE, 0,
|
|
|
|
EVENT_QUERY_STATE | EVENT_MODIFY_STATE };
|
|
|
|
pipe_request req;
|
|
|
|
DWORD len;
|
|
|
|
security_descriptor sd;
|
|
|
|
HANDLE token;
|
|
|
|
PRIVILEGE_SET ps;
|
|
|
|
BOOL ret;
|
|
|
|
DWORD pid;
|
|
|
|
|
|
|
|
termios_printf ("Entered");
|
|
|
|
while (!exit && ConnectNamedPipe (master_ctl, NULL))
|
|
|
|
{
|
|
|
|
pipe_reply repl = { NULL, NULL, 0 };
|
|
|
|
bool deimp = false;
|
|
|
|
BOOL allow = FALSE;
|
|
|
|
ACCESS_MASK access = EVENT_MODIFY_STATE;
|
|
|
|
HANDLE client = NULL;
|
|
|
|
|
|
|
|
if (!ReadFile (master_ctl, &req, sizeof req, &len, NULL))
|
|
|
|
{
|
|
|
|
termios_printf ("ReadFile, %E");
|
|
|
|
goto reply;
|
|
|
|
}
|
|
|
|
/* This function is only available since Vista, unfortunately.
|
|
|
|
In earlier OSes we simply have to believe that the client
|
|
|
|
has no malicious intent (== sends arbitrary PIDs). */
|
|
|
|
if (!GetNamedPipeClientProcessId (master_ctl, &pid))
|
|
|
|
pid = req.pid;
|
|
|
|
if (get_object_sd (input_available_event, sd))
|
|
|
|
{
|
|
|
|
termios_printf ("get_object_sd, %E");
|
|
|
|
goto reply;
|
|
|
|
}
|
|
|
|
cygheap->user.deimpersonate ();
|
|
|
|
deimp = true;
|
|
|
|
if (!ImpersonateNamedPipeClient (master_ctl))
|
|
|
|
{
|
|
|
|
termios_printf ("ImpersonateNamedPipeClient, %E");
|
|
|
|
goto reply;
|
|
|
|
}
|
|
|
|
if (!OpenThreadToken (GetCurrentThread (), TOKEN_QUERY, TRUE, &token))
|
|
|
|
{
|
|
|
|
termios_printf ("OpenThreadToken, %E");
|
|
|
|
goto reply;
|
|
|
|
}
|
|
|
|
len = sizeof ps;
|
|
|
|
ret = AccessCheck (sd, token, access, &map, &ps, &len, &access, &allow);
|
|
|
|
CloseHandle (token);
|
|
|
|
if (!ret)
|
|
|
|
{
|
|
|
|
termios_printf ("AccessCheck, %E");
|
|
|
|
goto reply;
|
|
|
|
}
|
|
|
|
if (!RevertToSelf ())
|
|
|
|
{
|
|
|
|
termios_printf ("RevertToSelf, %E");
|
|
|
|
goto reply;
|
|
|
|
}
|
|
|
|
if (req.pid == (DWORD) -1) /* Request to finish thread. */
|
|
|
|
{
|
|
|
|
/* Pre-Vista: Just believe in the good of the client process.
|
|
|
|
Post-Vista: Check if the requesting process is the master
|
|
|
|
process itself. */
|
|
|
|
if (pid == (DWORD) -1 || pid == GetCurrentProcessId ())
|
|
|
|
exit = true;
|
|
|
|
goto reply;
|
|
|
|
}
|
|
|
|
if (allow)
|
|
|
|
{
|
|
|
|
client = OpenProcess (PROCESS_DUP_HANDLE, FALSE, pid);
|
|
|
|
if (!client)
|
|
|
|
{
|
|
|
|
termios_printf ("OpenProcess, %E");
|
|
|
|
goto reply;
|
|
|
|
}
|
|
|
|
if (!DuplicateHandle (GetCurrentProcess (), from_master,
|
|
|
|
client, &repl.from_master,
|
|
|
|
0, TRUE, DUPLICATE_SAME_ACCESS))
|
|
|
|
{
|
|
|
|
termios_printf ("DuplicateHandle (from_master), %E");
|
|
|
|
goto reply;
|
|
|
|
}
|
|
|
|
if (!DuplicateHandle (GetCurrentProcess (), to_master,
|
|
|
|
client, &repl.to_master,
|
|
|
|
0, TRUE, DUPLICATE_SAME_ACCESS))
|
|
|
|
{
|
|
|
|
termios_printf ("DuplicateHandle (to_master), %E");
|
|
|
|
goto reply;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
reply:
|
|
|
|
repl.error = GetLastError ();
|
|
|
|
if (client)
|
|
|
|
CloseHandle (client);
|
|
|
|
if (deimp)
|
|
|
|
cygheap->user.reimpersonate ();
|
|
|
|
sd.free ();
|
|
|
|
termios_printf ("Reply: from %p, to %p, error %lu",
|
|
|
|
repl.from_master, repl.to_master, repl.error );
|
|
|
|
if (!WriteFile (master_ctl, &repl, sizeof repl, &len, NULL))
|
|
|
|
termios_printf ("WriteFile, %E");
|
|
|
|
if (!DisconnectNamedPipe (master_ctl))
|
|
|
|
termios_printf ("DisconnectNamedPipe, %E");
|
|
|
|
}
|
|
|
|
termios_printf ("Leaving");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static DWORD WINAPI
|
|
|
|
pty_master_thread (VOID *arg)
|
|
|
|
{
|
|
|
|
return ((fhandler_pty_master *) arg)->pty_master_thread ();
|
|
|
|
}
|
2006-06-02 17:41:34 +02:00
|
|
|
|
|
|
|
bool
|
2006-06-03 23:44:01 +02:00
|
|
|
fhandler_pty_master::setup (bool ispty)
|
2006-06-02 17:41:34 +02:00
|
|
|
{
|
2008-03-22 22:04:16 +01:00
|
|
|
int res;
|
2010-04-19 21:52:43 +02:00
|
|
|
security_descriptor sd;
|
|
|
|
SECURITY_ATTRIBUTES sa = { sizeof (SECURITY_ATTRIBUTES), NULL, TRUE };
|
|
|
|
|
2006-06-03 23:44:01 +02:00
|
|
|
tty& t = *cygwin_shared->tty[get_unit ()];
|
|
|
|
|
2006-06-02 17:41:34 +02:00
|
|
|
tcinit (&t, true); /* Set termios information. Force initialization. */
|
|
|
|
|
|
|
|
const char *errstr = NULL;
|
|
|
|
DWORD pipe_mode = PIPE_NOWAIT;
|
|
|
|
|
|
|
|
/* Create communication pipes */
|
2008-03-22 22:04:16 +01:00
|
|
|
char pipename[sizeof("ttyNNNN-from-master")];
|
|
|
|
__small_sprintf (pipename, "tty%d-from-master", get_unit ());
|
2010-04-19 21:52:43 +02:00
|
|
|
res = fhandler_pipe::create_selectable (ispty ? &sec_none : &sec_none_nih,
|
|
|
|
from_master, get_output_handle (),
|
|
|
|
128 * 1024, pipename);
|
2008-03-22 22:04:16 +01:00
|
|
|
if (res)
|
2006-06-02 17:41:34 +02:00
|
|
|
{
|
|
|
|
errstr = "input pipe";
|
|
|
|
goto err;
|
|
|
|
}
|
2008-07-26 21:35:21 +02:00
|
|
|
|
|
|
|
if (!SetNamedPipeHandleState (get_output_handle (), &pipe_mode, NULL, NULL))
|
|
|
|
termios_printf ("can't set output_handle(%p) to non-blocking mode",
|
|
|
|
get_output_handle ());
|
2006-06-02 17:41:34 +02:00
|
|
|
|
2008-03-22 22:04:16 +01:00
|
|
|
__small_sprintf (pipename, "tty%d-to-master", get_unit ());
|
2010-04-19 21:52:43 +02:00
|
|
|
res = fhandler_pipe::create_selectable (ispty ? &sec_none : &sec_none_nih,
|
|
|
|
get_io_handle (), to_master,
|
|
|
|
128 * 1024, pipename);
|
2008-03-22 22:04:16 +01:00
|
|
|
if (res)
|
2006-06-02 17:41:34 +02:00
|
|
|
{
|
|
|
|
errstr = "output pipe";
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
need_nl = 0;
|
|
|
|
|
2010-04-19 21:52:43 +02:00
|
|
|
/* Create security attribute. Default permissions are 0620. */
|
|
|
|
sd.malloc (sizeof (SECURITY_DESCRIPTOR));
|
|
|
|
InitializeSecurityDescriptor (sd, SECURITY_DESCRIPTOR_REVISION);
|
|
|
|
if (!create_object_sd_from_attribute (NULL, myself->uid, myself->gid,
|
|
|
|
S_IFCHR | S_IRUSR | S_IWUSR | S_IWGRP,
|
|
|
|
sd))
|
|
|
|
sa.lpSecurityDescriptor = (PSECURITY_DESCRIPTOR) sd;
|
2006-06-02 17:41:34 +02:00
|
|
|
|
|
|
|
/* Create synchronisation events */
|
|
|
|
|
2006-06-03 23:44:01 +02:00
|
|
|
if (!ispty)
|
2006-06-02 17:41:34 +02:00
|
|
|
{
|
2010-04-19 21:52:43 +02:00
|
|
|
if (!(output_done_event = t.get_event (errstr = OUTPUT_DONE_EVENT, &sa)))
|
2006-06-02 17:41:34 +02:00
|
|
|
goto err;
|
2010-04-19 21:52:43 +02:00
|
|
|
if (!(ioctl_done_event = t.get_event (errstr = IOCTL_DONE_EVENT, &sa)))
|
2006-06-02 17:41:34 +02:00
|
|
|
goto err;
|
2010-04-19 21:52:43 +02:00
|
|
|
if (!(ioctl_request_event = t.get_event (errstr = IOCTL_REQUEST_EVENT,
|
|
|
|
&sa)))
|
2006-06-02 17:41:34 +02:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
2010-04-19 21:52:43 +02:00
|
|
|
/* Carefully check that the input_available_event didn't already exist.
|
|
|
|
This is a measure to make sure that the event security descriptor
|
|
|
|
isn't occupied by a malicious process. We must make sure that the
|
|
|
|
event's security descriptor is what we expect it to be. */
|
|
|
|
if (!(input_available_event = t.get_event (errstr = INPUT_AVAILABLE_EVENT,
|
|
|
|
&sa, TRUE))
|
|
|
|
|| GetLastError () == ERROR_ALREADY_EXISTS)
|
2006-06-02 17:41:34 +02:00
|
|
|
goto err;
|
|
|
|
|
2007-12-05 17:50:18 +01:00
|
|
|
char buf[MAX_PATH];
|
2006-06-02 17:41:34 +02:00
|
|
|
errstr = shared_name (buf, OUTPUT_MUTEX, t.ntty);
|
2010-04-19 21:52:43 +02:00
|
|
|
if (!(output_mutex = CreateMutex (&sa, FALSE, buf)))
|
2006-06-02 17:41:34 +02:00
|
|
|
goto err;
|
|
|
|
|
|
|
|
errstr = shared_name (buf, INPUT_MUTEX, t.ntty);
|
2010-04-19 21:52:43 +02:00
|
|
|
if (!(input_mutex = CreateMutex (&sa, FALSE, buf)))
|
2006-06-02 17:41:34 +02:00
|
|
|
goto err;
|
|
|
|
|
2010-04-19 21:52:43 +02:00
|
|
|
if (ispty)
|
|
|
|
{
|
|
|
|
/* Create master control pipe which allows the master to duplicate
|
|
|
|
the pty pipe handles to processes which deserve it. */
|
|
|
|
cygthread *h;
|
|
|
|
__small_sprintf (buf, "\\\\.\\pipe\\cygwin-%S-tty%d-master-ctl",
|
|
|
|
&installation_key, get_unit ());
|
|
|
|
master_ctl = CreateNamedPipe (buf, PIPE_ACCESS_DUPLEX,
|
|
|
|
PIPE_WAIT | PIPE_TYPE_MESSAGE
|
|
|
|
| PIPE_READMODE_MESSAGE, 1, 4096, 4096,
|
|
|
|
0, &sec_all_nih);
|
|
|
|
if (master_ctl == INVALID_HANDLE_VALUE)
|
|
|
|
{
|
|
|
|
errstr = "pty master control pipe";
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
h = new cygthread (::pty_master_thread, 0, this, "pty_master");
|
|
|
|
if (!h)
|
|
|
|
{
|
|
|
|
errstr = "pty master control thread";
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
h->zap_h ();
|
|
|
|
}
|
|
|
|
|
2006-06-02 17:41:34 +02:00
|
|
|
t.from_master = from_master;
|
|
|
|
t.to_master = to_master;
|
|
|
|
// /* screws up tty master */ ProtectHandle1INH (output_mutex, output_mutex);
|
|
|
|
// /* screws up tty master */ ProtectHandle1INH (input_mutex, input_mutex);
|
|
|
|
t.winsize.ws_col = 80;
|
|
|
|
t.winsize.ws_row = 25;
|
|
|
|
t.master_pid = myself->pid;
|
|
|
|
|
|
|
|
termios_printf ("tty%d opened - from_slave %p, to_slave %p", t.ntty,
|
|
|
|
get_io_handle (), get_output_handle ());
|
|
|
|
return true;
|
|
|
|
|
|
|
|
err:
|
|
|
|
__seterrno ();
|
|
|
|
close_maybe (get_io_handle ());
|
|
|
|
close_maybe (get_output_handle ());
|
|
|
|
close_maybe (output_done_event);
|
|
|
|
close_maybe (ioctl_done_event);
|
|
|
|
close_maybe (ioctl_request_event);
|
|
|
|
close_maybe (input_available_event);
|
|
|
|
close_maybe (output_mutex);
|
|
|
|
close_maybe (input_mutex);
|
2006-06-03 08:35:10 +02:00
|
|
|
close_maybe (from_master);
|
|
|
|
close_maybe (to_master);
|
2010-04-19 21:52:43 +02:00
|
|
|
close_maybe (master_ctl);
|
2006-06-02 17:41:34 +02:00
|
|
|
termios_printf ("tty%d open failed - failed to create %s", errstr);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
fhandler_pty_master::fixup_after_fork (HANDLE parent)
|
|
|
|
{
|
|
|
|
DWORD wpid = GetCurrentProcessId ();
|
|
|
|
fhandler_tty_master *arch = (fhandler_tty_master *) archetype;
|
|
|
|
if (arch->dwProcessId != wpid)
|
|
|
|
{
|
|
|
|
tty& t = *get_ttyp ();
|
2009-12-18 21:32:04 +01:00
|
|
|
if (!DuplicateHandle (parent, arch->from_master, GetCurrentProcess (),
|
2006-06-02 17:41:34 +02:00
|
|
|
&arch->from_master, 0, false, DUPLICATE_SAME_ACCESS))
|
|
|
|
system_printf ("couldn't duplicate from_parent(%p), %E", arch->from_master);
|
2009-12-18 21:32:04 +01:00
|
|
|
if (!DuplicateHandle (parent, arch->to_master, GetCurrentProcess (),
|
2006-06-02 17:41:34 +02:00
|
|
|
&arch->to_master, 0, false, DUPLICATE_SAME_ACCESS))
|
|
|
|
system_printf ("couldn't duplicate to_parent(%p), %E", arch->from_master);
|
|
|
|
if (myself->pid == t.master_pid)
|
|
|
|
{
|
|
|
|
t.from_master = arch->from_master;
|
|
|
|
t.to_master = arch->to_master;
|
|
|
|
}
|
|
|
|
arch->dwProcessId = wpid;
|
|
|
|
}
|
2006-06-03 09:17:53 +02:00
|
|
|
from_master = arch->from_master;
|
|
|
|
to_master = arch->to_master;
|
2006-06-02 17:41:34 +02:00
|
|
|
report_tty_counts (this, "inherited master", "");
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
fhandler_pty_master::fixup_after_exec ()
|
|
|
|
{
|
2006-06-03 08:35:10 +02:00
|
|
|
if (!close_on_exec ())
|
2006-06-02 17:41:34 +02:00
|
|
|
fixup_after_fork (spawn_info->parent);
|
2006-06-03 09:17:53 +02:00
|
|
|
else
|
|
|
|
from_master = to_master = NULL;
|
2006-06-02 17:41:34 +02:00
|
|
|
}
|