2000-02-17 20:38:33 +01:00
|
|
|
/* fhandler_serial.cc
|
|
|
|
|
2003-01-10 13:32:49 +01:00
|
|
|
Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 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 <unistd.h>
|
|
|
|
#include <stdlib.h>
|
2000-08-22 05:58:47 +02:00
|
|
|
#include "cygerrno.h"
|
2001-07-26 21:22:24 +02:00
|
|
|
#include "security.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 "path.h"
|
2000-08-22 07:10:20 +02:00
|
|
|
#include "fhandler.h"
|
|
|
|
#include "sigproc.h"
|
|
|
|
#include "pinfo.h"
|
2000-09-07 18:23:51 +02:00
|
|
|
#include <sys/termios.h>
|
2002-11-06 02:50:32 +01:00
|
|
|
#include <ddk/ntddser.h>
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
/**********************************************************************/
|
|
|
|
/* fhandler_serial */
|
|
|
|
|
* 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_serial::fhandler_serial ()
|
|
|
|
: fhandler_base (), vmin_ (0), vtime_ (0), pgrp_ (myself->pgid)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
set_need_fork_fixup ();
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
fhandler_serial::overlapped_setup ()
|
|
|
|
{
|
|
|
|
memset (&io_status, 0, sizeof (io_status));
|
|
|
|
io_status.hEvent = CreateEvent (&sec_none_nih, TRUE, FALSE, NULL);
|
|
|
|
ProtectHandle (io_status.hEvent);
|
|
|
|
overlapped_armed = 0;
|
|
|
|
}
|
|
|
|
|
2002-12-14 05:01:32 +01:00
|
|
|
void
|
|
|
|
fhandler_serial::raw_read (void *ptr, size_t& ulen)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
int tot;
|
|
|
|
DWORD n;
|
|
|
|
HANDLE w4[2];
|
2002-11-06 00:15:04 +01:00
|
|
|
size_t minchars = vmin_ ?: ulen;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
w4[0] = io_status.hEvent;
|
|
|
|
w4[1] = signal_arrived;
|
|
|
|
|
|
|
|
debug_printf ("ulen %d, vmin_ %d, vtime_ %d, hEvent %p", ulen, vmin_, vtime_,
|
|
|
|
io_status.hEvent);
|
|
|
|
if (!overlapped_armed)
|
|
|
|
{
|
|
|
|
(void) SetCommMask (get_handle (), EV_RXCHAR);
|
|
|
|
ResetEvent (io_status.hEvent);
|
|
|
|
}
|
|
|
|
|
2002-11-06 02:50:32 +01:00
|
|
|
for (n = 0, tot = 0; ulen; ulen -= n, ptr = (char *) ptr + n)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
COMSTAT st;
|
|
|
|
DWORD inq = 1;
|
|
|
|
|
|
|
|
n = 0;
|
|
|
|
|
|
|
|
if (!vtime_ && !vmin_)
|
|
|
|
inq = ulen;
|
|
|
|
else if (vtime_)
|
|
|
|
{
|
|
|
|
inq = ulen; // non-interruptible -- have to use kernel timeouts
|
|
|
|
// also note that this is not strictly correct.
|
|
|
|
// if vmin > ulen then things won't work right.
|
|
|
|
overlapped_armed = -1;
|
|
|
|
}
|
2000-12-20 06:57:59 +01:00
|
|
|
|
|
|
|
if (!ClearCommError (get_handle (), &ev, &st))
|
|
|
|
goto err;
|
|
|
|
else if (ev)
|
|
|
|
termios_printf ("error detected %x", ev);
|
|
|
|
else if (st.cbInQue)
|
|
|
|
inq = st.cbInQue;
|
|
|
|
else if (!overlapped_armed)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2002-11-06 00:15:04 +01:00
|
|
|
if ((size_t) tot >= minchars)
|
2000-02-17 20:38:33 +01:00
|
|
|
break;
|
|
|
|
else if (WaitCommEvent (get_handle (), &ev, &io_status))
|
|
|
|
{
|
|
|
|
debug_printf ("WaitCommEvent succeeded: ev %x", ev);
|
|
|
|
if (!ev)
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
else if (GetLastError () != ERROR_IO_PENDING)
|
|
|
|
goto err;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
overlapped_armed = 1;
|
|
|
|
switch (WaitForMultipleObjects (2, w4, FALSE, INFINITE))
|
|
|
|
{
|
|
|
|
case WAIT_OBJECT_0:
|
|
|
|
if (!GetOverlappedResult (get_handle (), &io_status, &n, FALSE))
|
|
|
|
goto err;
|
|
|
|
debug_printf ("n %d, ev %x", n, ev);
|
|
|
|
break;
|
|
|
|
case WAIT_OBJECT_0 + 1:
|
|
|
|
tot = -1;
|
|
|
|
PurgeComm (get_handle (), PURGE_RXABORT);
|
|
|
|
overlapped_armed = 0;
|
|
|
|
set_sig_errno (EINTR);
|
|
|
|
goto out;
|
|
|
|
default:
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
overlapped_armed = 0;
|
|
|
|
ResetEvent (io_status.hEvent);
|
|
|
|
if (inq > ulen)
|
|
|
|
inq = ulen;
|
|
|
|
debug_printf ("inq %d", inq);
|
2002-07-22 16:30:30 +02:00
|
|
|
if (ReadFile (get_handle (), ptr, min (inq, ulen), &n, &io_status))
|
2000-02-17 20:38:33 +01:00
|
|
|
/* Got something */;
|
|
|
|
else if (GetLastError () != ERROR_IO_PENDING)
|
|
|
|
goto err;
|
|
|
|
else if (!GetOverlappedResult (get_handle (), &io_status, &n, TRUE))
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
tot += n;
|
|
|
|
debug_printf ("vtime_ %d, vmin_ %d, n %d, tot %d", vtime_, vmin_, n, tot);
|
|
|
|
if (vtime_ || !vmin_ || !n)
|
|
|
|
break;
|
|
|
|
continue;
|
|
|
|
|
|
|
|
err:
|
|
|
|
debug_printf ("err %E");
|
2004-01-23 16:22:48 +01:00
|
|
|
if (GetLastError () != ERROR_OPERATION_ABORTED)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
2004-01-23 16:22:48 +01:00
|
|
|
PurgeComm (get_handle (), PURGE_RXABORT);
|
2000-02-17 20:38:33 +01:00
|
|
|
tot = -1;
|
|
|
|
__seterrno ();
|
|
|
|
break;
|
|
|
|
}
|
2004-01-23 16:22:48 +01:00
|
|
|
|
|
|
|
n = 0;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
out:
|
2002-12-14 05:01:32 +01:00
|
|
|
ulen = tot;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Cover function to WriteFile to provide Posix interface and semantics
|
|
|
|
(as much as possible). */
|
|
|
|
int
|
|
|
|
fhandler_serial::raw_write (const void *ptr, size_t len)
|
|
|
|
{
|
|
|
|
DWORD bytes_written;
|
2001-01-30 02:52:29 +01:00
|
|
|
OVERLAPPED write_status;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2001-01-30 02:52:29 +01:00
|
|
|
memset (&write_status, 0, sizeof (write_status));
|
|
|
|
write_status.hEvent = CreateEvent (&sec_none_nih, TRUE, FALSE, NULL);
|
|
|
|
ProtectHandle (write_status.hEvent);
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
for (;;)
|
|
|
|
{
|
2002-07-22 16:30:30 +02:00
|
|
|
if (WriteFile (get_handle (), ptr, len, &bytes_written, &write_status))
|
2000-02-17 20:38:33 +01:00
|
|
|
break;
|
|
|
|
|
|
|
|
switch (GetLastError ())
|
|
|
|
{
|
2003-02-01 05:48:03 +01:00
|
|
|
case ERROR_OPERATION_ABORTED:
|
2004-01-23 16:22:48 +01:00
|
|
|
DWORD ev;
|
|
|
|
if (!ClearCommError (get_handle (), &ev, NULL))
|
|
|
|
goto err;
|
|
|
|
if (ev)
|
|
|
|
termios_printf ("error detected %x", ev);
|
2003-02-01 05:48:03 +01:00
|
|
|
continue;
|
|
|
|
case ERROR_IO_PENDING:
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
goto err;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
2001-01-30 02:52:29 +01:00
|
|
|
if (!GetOverlappedResult (get_handle (), &write_status, &bytes_written, TRUE))
|
2000-02-17 20:38:33 +01:00
|
|
|
goto err;
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2002-07-22 16:30:30 +02:00
|
|
|
ForceCloseHandle (write_status.hEvent);
|
2001-06-26 16:47:48 +02:00
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
return bytes_written;
|
|
|
|
|
|
|
|
err:
|
|
|
|
__seterrno ();
|
2002-07-22 16:30:30 +02:00
|
|
|
ForceCloseHandle (write_status.hEvent);
|
2000-02-17 20:38:33 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
fhandler_serial::dump (void)
|
|
|
|
{
|
|
|
|
paranoid_printf ("here");
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
fhandler_serial::init (HANDLE f, DWORD flags, mode_t bin)
|
|
|
|
{
|
* 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
|
|
|
(void) open (flags, bin & (O_BINARY | O_TEXT));
|
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_serial::open (int flags, mode_t mode)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
int res;
|
|
|
|
COMMTIMEOUTS to;
|
|
|
|
extern BOOL reset_com;
|
|
|
|
|
|
|
|
syscall_printf ("fhandler_serial::open (%s, %p, %p)",
|
|
|
|
get_name (), flags, mode);
|
|
|
|
|
* 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 (!fhandler_base::open (flags, mode))
|
2000-02-17 20:38:33 +01:00
|
|
|
return 0;
|
2001-10-29 06:28:24 +01:00
|
|
|
|
|
|
|
res = 1;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
(void) SetCommMask (get_handle (), EV_RXCHAR);
|
|
|
|
|
|
|
|
set_r_no_interrupt (1); // Handled explicitly in read code
|
|
|
|
|
|
|
|
overlapped_setup ();
|
|
|
|
|
|
|
|
memset (&to, 0, sizeof (to));
|
|
|
|
(void) SetCommTimeouts (get_handle (), &to);
|
|
|
|
|
|
|
|
/* Reset serial port to known state of 9600-8-1-no flow control
|
|
|
|
on open for better behavior under Win 95.
|
|
|
|
|
|
|
|
FIXME: This should only be done when explicitly opening the com
|
|
|
|
port. It should not be reset if an fd is inherited.
|
|
|
|
Using __progname in this way, to determine how far along in the
|
|
|
|
initialization we are, is really a terrible kludge and should
|
|
|
|
be fixed ASAP.
|
|
|
|
*/
|
|
|
|
extern char *__progname;
|
|
|
|
if (reset_com && __progname)
|
|
|
|
{
|
|
|
|
DCB state;
|
|
|
|
GetCommState (get_handle (), &state);
|
|
|
|
syscall_printf ("setting initial state on %s (reset_com %d)",
|
|
|
|
get_name (), reset_com);
|
|
|
|
state.BaudRate = CBR_9600;
|
|
|
|
state.ByteSize = 8;
|
|
|
|
state.StopBits = ONESTOPBIT;
|
|
|
|
state.Parity = NOPARITY; /* FIXME: correct default? */
|
|
|
|
state.fBinary = TRUE; /* binary xfer */
|
|
|
|
state.EofChar = 0; /* no end-of-data in binary mode */
|
|
|
|
state.fNull = FALSE; /* don't discard nulls in binary mode */
|
|
|
|
state.fParity = FALSE; /* ignore parity errors */
|
|
|
|
state.fErrorChar = FALSE;
|
|
|
|
state.fTXContinueOnXoff = TRUE; /* separate TX and RX flow control */
|
|
|
|
state.fOutX = FALSE; /* disable transmission flow control */
|
|
|
|
state.fInX = FALSE; /* disable reception flow control */
|
|
|
|
state.XonChar = 0x11;
|
|
|
|
state.XoffChar = 0x13;
|
|
|
|
state.fOutxDsrFlow = FALSE; /* disable DSR flow control */
|
|
|
|
state.fRtsControl = RTS_CONTROL_ENABLE; /* ignore lead control except
|
|
|
|
DTR */
|
|
|
|
state.fOutxCtsFlow = FALSE; /* disable output flow control */
|
|
|
|
state.fDtrControl = DTR_CONTROL_ENABLE; /* assert DTR */
|
|
|
|
state.fDsrSensitivity = FALSE; /* don't assert DSR */
|
|
|
|
state.fAbortOnError = TRUE;
|
|
|
|
if (!SetCommState (get_handle (), &state))
|
|
|
|
system_printf ("couldn't set initial state for %s, %E", get_name ());
|
|
|
|
}
|
|
|
|
|
2002-07-22 11:11:45 +02:00
|
|
|
/* setting rts and dtr to known state so that ioctl() function with
|
2002-07-22 16:30:30 +02:00
|
|
|
request TIOCMGET could return correct value of RTS and DTR lines.
|
2002-07-22 11:11:45 +02:00
|
|
|
Important only for Win 9x systems */
|
2002-07-22 16:30:30 +02:00
|
|
|
|
2002-07-24 13:01:37 +02:00
|
|
|
if (!wincap.supports_reading_modem_output_lines ())
|
2002-07-22 16:30:30 +02:00
|
|
|
{
|
|
|
|
if (EscapeCommFunction (get_handle (), SETDTR) == 0)
|
|
|
|
system_printf ("couldn't set initial state of DTR for %s, %E", get_name ());
|
|
|
|
if (EscapeCommFunction (get_handle (), SETRTS) == 0)
|
|
|
|
system_printf ("couldn't set initial state of RTS for %s, %E", get_name ());
|
|
|
|
|
|
|
|
/* even though one of above functions fail I have to set rts and dtr
|
|
|
|
variables to initial value. */
|
|
|
|
rts = TIOCM_RTS;
|
|
|
|
dtr = TIOCM_DTR;
|
|
|
|
}
|
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
SetCommMask (get_handle (), EV_RXCHAR);
|
2001-04-24 04:07:58 +02:00
|
|
|
set_open_status ();
|
2000-02-17 20:38:33 +01:00
|
|
|
syscall_printf ("%p = fhandler_serial::open (%s, %p, %p)",
|
|
|
|
res, get_name (), flags, mode);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
fhandler_serial::close ()
|
|
|
|
{
|
|
|
|
(void) ForceCloseHandle (io_status.hEvent);
|
|
|
|
return fhandler_base::close ();
|
|
|
|
}
|
|
|
|
|
|
|
|
/* tcsendbreak: POSIX 7.2.2.1 */
|
|
|
|
/* Break for 250-500 milliseconds if duration == 0 */
|
|
|
|
/* Otherwise, units for duration are undefined */
|
|
|
|
int
|
|
|
|
fhandler_serial::tcsendbreak (int duration)
|
|
|
|
{
|
2000-08-08 22:46:47 +02:00
|
|
|
unsigned int sleeptime = 300000;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
if (duration > 0)
|
|
|
|
sleeptime *= duration;
|
|
|
|
|
|
|
|
if (SetCommBreak (get_handle ()) == 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
/* FIXME: need to send zero bits during duration */
|
|
|
|
usleep (sleeptime);
|
|
|
|
|
|
|
|
if (ClearCommBreak (get_handle ()) == 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
syscall_printf ("0 = fhandler_serial:tcsendbreak (%d)", duration);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* tcdrain: POSIX 7.2.2.1 */
|
|
|
|
int
|
|
|
|
fhandler_serial::tcdrain (void)
|
|
|
|
{
|
|
|
|
if (FlushFileBuffers (get_handle ()) == 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* tcflow: POSIX 7.2.2.1 */
|
|
|
|
int
|
|
|
|
fhandler_serial::tcflow (int action)
|
|
|
|
{
|
|
|
|
DWORD win32action = 0;
|
|
|
|
DCB dcb;
|
|
|
|
char xchar;
|
2002-07-22 16:30:30 +02:00
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
termios_printf ("action %d", action);
|
|
|
|
|
|
|
|
switch (action)
|
|
|
|
{
|
2003-02-01 05:48:03 +01:00
|
|
|
case TCOOFF:
|
|
|
|
win32action = SETXOFF;
|
|
|
|
break;
|
|
|
|
case TCOON:
|
|
|
|
win32action = SETXON;
|
|
|
|
break;
|
|
|
|
case TCION:
|
|
|
|
case TCIOFF:
|
|
|
|
if (GetCommState (get_handle (), &dcb) == 0)
|
2000-02-17 20:38:33 +01:00
|
|
|
return -1;
|
2003-02-01 05:48:03 +01:00
|
|
|
if (action == TCION)
|
|
|
|
xchar = (dcb.XonChar ? dcb.XonChar : 0x11);
|
|
|
|
else
|
|
|
|
xchar = (dcb.XoffChar ? dcb.XoffChar : 0x13);
|
|
|
|
if (TransmitCommChar (get_handle (), xchar) == 0)
|
|
|
|
return -1;
|
|
|
|
return 0;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return -1;
|
|
|
|
break;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if (EscapeCommFunction (get_handle (), win32action) == 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2002-07-22 11:11:45 +02:00
|
|
|
|
|
|
|
/* ioctl: */
|
|
|
|
int
|
|
|
|
fhandler_serial::ioctl (unsigned int cmd, void *buffer)
|
|
|
|
{
|
2002-11-04 05:09:14 +01:00
|
|
|
int res = 0;
|
|
|
|
|
|
|
|
# define ibuffer ((int) buffer)
|
|
|
|
# define ipbuffer (*(int *) buffer)
|
2002-07-22 11:11:45 +02:00
|
|
|
|
|
|
|
DWORD ev;
|
|
|
|
COMSTAT st;
|
2002-11-07 19:47:21 +01:00
|
|
|
if (!ClearCommError (get_handle (), &ev, &st))
|
2002-11-06 00:15:04 +01:00
|
|
|
{
|
|
|
|
__seterrno ();
|
|
|
|
res = -1;
|
|
|
|
}
|
2002-11-04 05:09:14 +01:00
|
|
|
else
|
|
|
|
switch (cmd)
|
|
|
|
{
|
|
|
|
case TCFLSH:
|
|
|
|
res = tcflush (ibuffer);
|
|
|
|
break;
|
|
|
|
case TIOCMGET:
|
|
|
|
DWORD modem_lines;
|
2002-11-06 00:15:04 +01:00
|
|
|
if (!GetCommModemStatus (get_handle (), &modem_lines))
|
2002-11-04 05:09:14 +01:00
|
|
|
{
|
|
|
|
__seterrno ();
|
|
|
|
res = -1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2002-11-06 02:50:32 +01:00
|
|
|
ipbuffer = 0;
|
2002-11-04 05:09:14 +01:00
|
|
|
if (modem_lines & MS_CTS_ON)
|
2002-11-06 02:50:32 +01:00
|
|
|
ipbuffer |= TIOCM_CTS;
|
2002-11-04 05:09:14 +01:00
|
|
|
if (modem_lines & MS_DSR_ON)
|
2002-11-06 02:50:32 +01:00
|
|
|
ipbuffer |= TIOCM_DSR;
|
2002-11-04 05:09:14 +01:00
|
|
|
if (modem_lines & MS_RING_ON)
|
2002-11-06 02:50:32 +01:00
|
|
|
ipbuffer |= TIOCM_RI;
|
2002-11-04 05:09:14 +01:00
|
|
|
if (modem_lines & MS_RLSD_ON)
|
2002-11-06 02:50:32 +01:00
|
|
|
ipbuffer |= TIOCM_CD;
|
|
|
|
|
|
|
|
DWORD cb;
|
|
|
|
DWORD mcr;
|
|
|
|
if (!DeviceIoControl (get_handle (), IOCTL_SERIAL_GET_DTRRTS,
|
|
|
|
NULL, 0, &mcr, 4, &cb, 0) || cb != 4)
|
|
|
|
ipbuffer |= rts | dtr;
|
2002-11-04 05:09:14 +01:00
|
|
|
else
|
|
|
|
{
|
|
|
|
if (mcr & 2)
|
2002-11-06 02:50:32 +01:00
|
|
|
ipbuffer |= TIOCM_RTS;
|
2002-11-04 05:09:14 +01:00
|
|
|
if (mcr & 1)
|
2002-11-06 02:50:32 +01:00
|
|
|
ipbuffer |= TIOCM_DTR;
|
2002-11-04 05:09:14 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case TIOCMSET:
|
|
|
|
if (ipbuffer & TIOCM_RTS)
|
|
|
|
{
|
|
|
|
if (EscapeCommFunction (get_handle (), SETRTS))
|
|
|
|
rts = TIOCM_RTS;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
__seterrno ();
|
|
|
|
res = -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (EscapeCommFunction (get_handle (), CLRRTS))
|
|
|
|
rts = 0;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
__seterrno ();
|
|
|
|
res = -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (ipbuffer & TIOCM_DTR)
|
|
|
|
{
|
|
|
|
if (EscapeCommFunction (get_handle (), SETDTR))
|
|
|
|
dtr = TIOCM_DTR;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
__seterrno ();
|
|
|
|
res = -1;
|
|
|
|
}
|
|
|
|
}
|
2002-11-06 02:50:32 +01:00
|
|
|
else if (EscapeCommFunction (get_handle (), CLRDTR))
|
|
|
|
dtr = 0;
|
2002-11-04 05:09:14 +01:00
|
|
|
else
|
|
|
|
{
|
2002-11-06 02:50:32 +01:00
|
|
|
__seterrno ();
|
|
|
|
res = -1;
|
2002-11-04 05:09:14 +01:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case TIOCINQ:
|
|
|
|
if (ev & CE_FRAME || ev & CE_IOE || ev & CE_OVERRUN || ev & CE_RXOVER
|
|
|
|
|| ev & CE_RXPARITY)
|
|
|
|
{
|
|
|
|
set_errno (EINVAL); /* FIXME: Use correct errno */
|
|
|
|
res = -1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
ipbuffer = st.cbInQue;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
set_errno (ENOSYS);
|
|
|
|
res = -1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
termios_printf ("%d = ioctl (%p, %p)", res, cmd, buffer);
|
|
|
|
# undef ibuffer
|
|
|
|
# undef ipbuffer
|
|
|
|
return res;
|
2002-07-22 16:30:30 +02:00
|
|
|
}
|
2002-07-22 11:11:45 +02:00
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
/* tcflush: POSIX 7.2.2.1 */
|
|
|
|
int
|
|
|
|
fhandler_serial::tcflush (int queue)
|
|
|
|
{
|
2003-12-11 19:07:42 +01:00
|
|
|
DWORD flags;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2003-12-11 19:07:42 +01:00
|
|
|
switch (queue)
|
|
|
|
{
|
|
|
|
case TCOFLUSH:
|
|
|
|
flags = PURGE_TXABORT | PURGE_TXCLEAR;
|
|
|
|
break;
|
|
|
|
case TCIFLUSH:
|
|
|
|
flags = PURGE_RXABORT | PURGE_RXCLEAR;
|
|
|
|
break;
|
|
|
|
case TCIOFLUSH:
|
|
|
|
flags = PURGE_TXABORT | PURGE_TXCLEAR | PURGE_RXABORT | PURGE_RXCLEAR;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
termios_printf ("Invalid tcflush queue %d", queue);
|
|
|
|
set_errno (EINVAL);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!PurgeComm (get_handle (), flags))
|
|
|
|
{
|
|
|
|
__seterrno ();
|
|
|
|
return -1;
|
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* tcsetattr: POSIX 7.2.1.1 */
|
|
|
|
int
|
|
|
|
fhandler_serial::tcsetattr (int action, const struct termios *t)
|
|
|
|
{
|
|
|
|
/* Possible actions:
|
|
|
|
TCSANOW: immediately change attributes.
|
|
|
|
TCSADRAIN: flush output, then change attributes.
|
|
|
|
TCSAFLUSH: flush output and discard input, then change attributes.
|
|
|
|
*/
|
|
|
|
|
2003-12-07 23:37:12 +01:00
|
|
|
bool dropDTR = false;
|
2000-02-17 20:38:33 +01:00
|
|
|
COMMTIMEOUTS to;
|
|
|
|
DCB ostate, state;
|
|
|
|
unsigned int ovtime = vtime_, ovmin = vmin_;
|
2003-02-01 05:48:03 +01:00
|
|
|
int tmpDtr, tmpRts, res;
|
|
|
|
res = tmpDtr = tmpRts = 0;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
termios_printf ("action %d", action);
|
|
|
|
if ((action == TCSADRAIN) || (action == TCSAFLUSH))
|
|
|
|
{
|
|
|
|
FlushFileBuffers (get_handle ());
|
|
|
|
termios_printf ("flushed file buffers");
|
|
|
|
}
|
|
|
|
if (action == TCSAFLUSH)
|
|
|
|
PurgeComm (get_handle (), (PURGE_RXABORT | PURGE_RXCLEAR));
|
|
|
|
|
|
|
|
/* get default/last comm state */
|
|
|
|
if (!GetCommState (get_handle (), &ostate))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
state = ostate;
|
|
|
|
|
|
|
|
/* -------------- Set baud rate ------------------ */
|
|
|
|
/* FIXME: WIN32 also has 14400, 56000, 128000, and 256000.
|
|
|
|
Unix also has 230400. */
|
|
|
|
|
|
|
|
switch (t->c_ospeed)
|
|
|
|
{
|
2003-02-01 05:48:03 +01:00
|
|
|
case B0:
|
|
|
|
/* Drop DTR - but leave DCB-resident bitrate as-is since
|
|
|
|
0 is an invalid bitrate in Win32 */
|
2003-12-07 23:37:12 +01:00
|
|
|
dropDTR = true;
|
2003-02-01 05:48:03 +01:00
|
|
|
break;
|
|
|
|
case B110:
|
|
|
|
state.BaudRate = CBR_110;
|
|
|
|
break;
|
|
|
|
case B300:
|
|
|
|
state.BaudRate = CBR_300;
|
|
|
|
break;
|
|
|
|
case B600:
|
|
|
|
state.BaudRate = CBR_600;
|
|
|
|
break;
|
|
|
|
case B1200:
|
|
|
|
state.BaudRate = CBR_1200;
|
|
|
|
break;
|
|
|
|
case B2400:
|
|
|
|
state.BaudRate = CBR_2400;
|
|
|
|
break;
|
|
|
|
case B4800:
|
|
|
|
state.BaudRate = CBR_4800;
|
|
|
|
break;
|
|
|
|
case B9600:
|
|
|
|
state.BaudRate = CBR_9600;
|
|
|
|
break;
|
|
|
|
case B19200:
|
|
|
|
state.BaudRate = CBR_19200;
|
|
|
|
break;
|
|
|
|
case B38400:
|
|
|
|
state.BaudRate = CBR_38400;
|
|
|
|
break;
|
|
|
|
case B57600:
|
|
|
|
state.BaudRate = CBR_57600;
|
|
|
|
break;
|
|
|
|
case B115200:
|
|
|
|
state.BaudRate = CBR_115200;
|
|
|
|
break;
|
|
|
|
case B230400:
|
|
|
|
state.BaudRate = 230400 /* CBR_230400 - not defined */;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
/* Unsupported baud rate! */
|
|
|
|
termios_printf ("Invalid t->c_ospeed %d", t->c_ospeed);
|
|
|
|
set_errno (EINVAL);
|
|
|
|
return -1;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* -------------- Set byte size ------------------ */
|
|
|
|
|
|
|
|
switch (t->c_cflag & CSIZE)
|
|
|
|
{
|
2003-02-01 05:48:03 +01:00
|
|
|
case CS5:
|
|
|
|
state.ByteSize = 5;
|
|
|
|
break;
|
|
|
|
case CS6:
|
|
|
|
state.ByteSize = 6;
|
|
|
|
break;
|
|
|
|
case CS7:
|
|
|
|
state.ByteSize = 7;
|
|
|
|
break;
|
|
|
|
case CS8:
|
|
|
|
state.ByteSize = 8;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
/* Unsupported byte size! */
|
|
|
|
termios_printf ("Invalid t->c_cflag byte size %d",
|
|
|
|
t->c_cflag & CSIZE);
|
|
|
|
set_errno (EINVAL);
|
|
|
|
return -1;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* -------------- Set stop bits ------------------ */
|
|
|
|
|
|
|
|
if (t->c_cflag & CSTOPB)
|
|
|
|
state.StopBits = TWOSTOPBITS;
|
|
|
|
else
|
|
|
|
state.StopBits = ONESTOPBIT;
|
|
|
|
|
|
|
|
/* -------------- Set parity ------------------ */
|
|
|
|
|
|
|
|
if (t->c_cflag & PARENB)
|
|
|
|
state.Parity = (t->c_cflag & PARODD) ? ODDPARITY : EVENPARITY;
|
|
|
|
else
|
|
|
|
state.Parity = NOPARITY;
|
|
|
|
|
|
|
|
state.fBinary = TRUE; /* Binary transfer */
|
2000-09-03 06:16:35 +02:00
|
|
|
state.EofChar = 0; /* No end-of-data in binary mode */
|
2000-02-17 20:38:33 +01:00
|
|
|
state.fNull = FALSE; /* Don't discard nulls in binary mode */
|
|
|
|
|
|
|
|
/* -------------- Parity errors ------------------ */
|
|
|
|
/* fParity combines the function of INPCK and NOT IGNPAR */
|
|
|
|
|
|
|
|
if ((t->c_iflag & INPCK) && !(t->c_iflag & IGNPAR))
|
|
|
|
state.fParity = TRUE; /* detect parity errors */
|
|
|
|
else
|
|
|
|
state.fParity = FALSE; /* ignore parity errors */
|
|
|
|
|
|
|
|
/* Only present in Win32, Unix has no equivalent */
|
|
|
|
state.fErrorChar = FALSE;
|
|
|
|
state.ErrorChar = 0;
|
|
|
|
|
|
|
|
/* -------------- Set software flow control ------------------ */
|
|
|
|
/* Set fTXContinueOnXoff to FALSE. This prevents the triggering of a
|
|
|
|
premature XON when the remote device interprets a received character
|
|
|
|
as XON (same as IXANY on the remote side). Otherwise, a TRUE
|
|
|
|
value separates the TX and RX functions. */
|
|
|
|
|
|
|
|
state.fTXContinueOnXoff = TRUE; /* separate TX and RX flow control */
|
|
|
|
|
|
|
|
/* Transmission flow control */
|
|
|
|
if (t->c_iflag & IXON)
|
|
|
|
state.fOutX = TRUE; /* enable */
|
|
|
|
else
|
|
|
|
state.fOutX = FALSE; /* disable */
|
|
|
|
|
|
|
|
/* Reception flow control */
|
|
|
|
if (t->c_iflag & IXOFF)
|
|
|
|
state.fInX = TRUE; /* enable */
|
|
|
|
else
|
|
|
|
state.fInX = FALSE; /* disable */
|
|
|
|
|
|
|
|
/* XoffLim and XonLim are left at default values */
|
|
|
|
|
|
|
|
state.XonChar = (t->c_cc[VSTART] ? t->c_cc[VSTART] : 0x11);
|
|
|
|
state.XoffChar = (t->c_cc[VSTOP] ? t->c_cc[VSTOP] : 0x13);
|
|
|
|
|
|
|
|
/* -------------- Set hardware flow control ------------------ */
|
|
|
|
|
|
|
|
/* Disable DSR flow control */
|
|
|
|
state.fOutxDsrFlow = FALSE;
|
|
|
|
|
|
|
|
/* Some old flavors of Unix automatically enabled hardware flow
|
|
|
|
control when software flow control was not enabled. Since newer
|
|
|
|
Unices tend to require explicit setting of hardware flow-control,
|
|
|
|
this is what we do. */
|
|
|
|
|
|
|
|
/* RTS/CTS flow control */
|
|
|
|
if (t->c_cflag & CRTSCTS)
|
|
|
|
{ /* enable */
|
|
|
|
state.fOutxCtsFlow = TRUE;
|
|
|
|
state.fRtsControl = RTS_CONTROL_HANDSHAKE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{ /* disable */
|
|
|
|
state.fRtsControl = RTS_CONTROL_ENABLE;
|
|
|
|
state.fOutxCtsFlow = FALSE;
|
2002-07-22 11:11:45 +02:00
|
|
|
tmpRts = TIOCM_RTS;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if (t->c_cflag & CRTSXOFF)
|
|
|
|
state.fRtsControl = RTS_CONTROL_HANDSHAKE;
|
|
|
|
|
|
|
|
/* -------------- DTR ------------------ */
|
|
|
|
/* Assert DTR on device open */
|
|
|
|
|
|
|
|
state.fDtrControl = DTR_CONTROL_ENABLE;
|
|
|
|
|
|
|
|
/* -------------- DSR ------------------ */
|
|
|
|
/* Assert DSR at the device? */
|
|
|
|
|
|
|
|
if (t->c_cflag & CLOCAL)
|
|
|
|
state.fDsrSensitivity = FALSE; /* no */
|
|
|
|
else
|
|
|
|
state.fDsrSensitivity = TRUE; /* yes */
|
|
|
|
|
|
|
|
/* -------------- Error handling ------------------ */
|
|
|
|
/* Since read/write operations terminate upon error, we
|
|
|
|
will use ClearCommError() to resume. */
|
|
|
|
|
|
|
|
state.fAbortOnError = TRUE;
|
|
|
|
|
2003-02-01 05:48:03 +01:00
|
|
|
if ((memcmp (&ostate, &state, sizeof (state)) != 0)
|
|
|
|
&& !SetCommState (get_handle (), &state))
|
|
|
|
{
|
|
|
|
/* SetCommState() failed, usually due to invalid DCB param.
|
|
|
|
Keep track of this so we can set errno to EINVAL later
|
|
|
|
and return failure */
|
|
|
|
termios_printf ("SetCommState() failed, %E");
|
|
|
|
__seterrno ();
|
|
|
|
res = -1;
|
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
set_r_binary ((t->c_iflag & IGNCR) ? 0 : 1);
|
|
|
|
set_w_binary ((t->c_oflag & ONLCR) ? 0 : 1);
|
|
|
|
|
2003-12-07 23:37:12 +01:00
|
|
|
if (dropDTR)
|
2002-07-22 11:11:45 +02:00
|
|
|
{
|
|
|
|
EscapeCommFunction (get_handle (), CLRDTR);
|
|
|
|
tmpDtr = 0;
|
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
else
|
|
|
|
{
|
|
|
|
/* FIXME: Sometimes when CLRDTR is set, setting
|
|
|
|
state.fDtrControl = DTR_CONTROL_ENABLE will fail. This
|
|
|
|
is a problem since a program might want to change some
|
|
|
|
parameters while DTR is still down. */
|
|
|
|
|
|
|
|
EscapeCommFunction (get_handle (), SETDTR);
|
2002-07-22 11:11:45 +02:00
|
|
|
tmpDtr = TIOCM_DTR;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
2002-07-22 16:30:30 +02:00
|
|
|
|
2002-07-22 11:11:45 +02:00
|
|
|
rts = tmpRts;
|
|
|
|
dtr = tmpDtr;
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2003-02-01 05:48:03 +01:00
|
|
|
/* The following documentation on was taken from "Linux Serial Programming
|
2000-02-17 20:38:33 +01:00
|
|
|
HOWTO". It explains how MIN (t->c_cc[VMIN] || vmin_) and TIME
|
|
|
|
(t->c_cc[VTIME] || vtime_) is to be used.
|
|
|
|
|
|
|
|
In non-canonical input processing mode, input is not assembled into
|
|
|
|
lines and input processing (erase, kill, delete, etc.) does not
|
|
|
|
occur. Two parameters control the behavior of this mode: c_cc[VTIME]
|
|
|
|
sets the character timer, and c_cc[VMIN] sets the minimum number of
|
|
|
|
characters to receive before satisfying the read.
|
|
|
|
|
|
|
|
If MIN > 0 and TIME = 0, MIN sets the number of characters to receive
|
|
|
|
before the read is satisfied. As TIME is zero, the timer is not used.
|
|
|
|
|
|
|
|
If MIN = 0 and TIME > 0, TIME serves as a timeout value. The read will
|
|
|
|
be satisfied if a single character is read, or TIME is exceeded (t =
|
|
|
|
TIME *0.1 s). If TIME is exceeded, no character will be returned.
|
|
|
|
|
|
|
|
If MIN > 0 and TIME > 0, TIME serves as an inter-character timer. The
|
|
|
|
read will be satisfied if MIN characters are received, or the time
|
|
|
|
between two characters exceeds TIME. The timer is restarted every time
|
|
|
|
a character is received and only becomes active after the first
|
|
|
|
character has been received.
|
|
|
|
|
|
|
|
If MIN = 0 and TIME = 0, read will be satisfied immediately. The
|
|
|
|
number of characters currently available, or the number of characters
|
|
|
|
requested will be returned. According to Antonino (see contributions),
|
|
|
|
you could issue a fcntl(fd, F_SETFL, FNDELAY); before reading to get
|
|
|
|
the same result.
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (t->c_lflag & ICANON)
|
|
|
|
{
|
2002-11-06 00:15:04 +01:00
|
|
|
vmin_ = 0;
|
2000-02-17 20:38:33 +01:00
|
|
|
vtime_ = 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
vtime_ = t->c_cc[VTIME] * 100;
|
|
|
|
vmin_ = t->c_cc[VMIN];
|
|
|
|
}
|
|
|
|
|
2002-09-30 06:35:18 +02:00
|
|
|
debug_printf ("vtime %d, vmin %d", vtime_, vmin_);
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2003-02-01 05:48:03 +01:00
|
|
|
if (ovmin != vmin_ || ovtime != vtime_)
|
|
|
|
{
|
|
|
|
memset (&to, 0, sizeof (to));
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2003-02-01 05:48:03 +01:00
|
|
|
if ((vmin_ > 0) && (vtime_ == 0))
|
|
|
|
{
|
|
|
|
/* Returns immediately with whatever is in buffer on a ReadFile();
|
|
|
|
or blocks if nothing found. We will keep calling ReadFile(); until
|
|
|
|
vmin_ characters are read */
|
|
|
|
to.ReadIntervalTimeout = to.ReadTotalTimeoutMultiplier = MAXDWORD;
|
|
|
|
to.ReadTotalTimeoutConstant = MAXDWORD - 1;
|
|
|
|
}
|
|
|
|
else if ((vmin_ == 0) && (vtime_ > 0))
|
|
|
|
{
|
|
|
|
/* set timeoout constant appropriately and we will only try to
|
|
|
|
read one character in ReadFile() */
|
|
|
|
to.ReadTotalTimeoutConstant = vtime_;
|
|
|
|
to.ReadIntervalTimeout = to.ReadTotalTimeoutMultiplier = MAXDWORD;
|
|
|
|
}
|
|
|
|
else if ((vmin_ > 0) && (vtime_ > 0))
|
|
|
|
{
|
|
|
|
/* time applies to the interval time for this case */
|
|
|
|
to.ReadIntervalTimeout = vtime_;
|
|
|
|
}
|
|
|
|
else if ((vmin_ == 0) && (vtime_ == 0))
|
|
|
|
{
|
|
|
|
/* returns immediately with whatever is in buffer as per
|
|
|
|
Time-Outs docs in Win32 SDK API docs */
|
|
|
|
to.ReadIntervalTimeout = MAXDWORD;
|
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2003-02-01 05:48:03 +01:00
|
|
|
debug_printf ("ReadTotalTimeoutConstant %d, ReadIntervalTimeout %d, ReadTotalTimeoutMultiplier %d",
|
2003-03-09 21:31:07 +01:00
|
|
|
to.ReadTotalTimeoutConstant, to.ReadIntervalTimeout, to.ReadTotalTimeoutMultiplier);
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2003-02-01 05:48:03 +01:00
|
|
|
if (!SetCommTimeouts(get_handle (), &to))
|
|
|
|
{
|
|
|
|
/* SetCommTimeouts() failed. Keep track of this so we
|
|
|
|
can set errno to EINVAL later and return failure */
|
|
|
|
termios_printf ("SetCommTimeouts() failed, %E");
|
|
|
|
__seterrno ();
|
|
|
|
res = -1;
|
|
|
|
}
|
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
|
2003-02-01 05:48:03 +01:00
|
|
|
return res;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* tcgetattr: POSIX 7.2.1.1 */
|
|
|
|
int
|
|
|
|
fhandler_serial::tcgetattr (struct termios *t)
|
|
|
|
{
|
|
|
|
DCB state;
|
|
|
|
|
|
|
|
/* Get current Win32 comm state */
|
|
|
|
if (GetCommState (get_handle (), &state) == 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
/* for safety */
|
|
|
|
memset (t, 0, sizeof (*t));
|
|
|
|
|
|
|
|
/* -------------- Baud rate ------------------ */
|
|
|
|
|
2003-02-01 05:48:03 +01:00
|
|
|
/* If DTR is NOT set, return B0 as our speed */
|
|
|
|
if (dtr != TIOCM_DTR)
|
|
|
|
t->c_cflag = t->c_ospeed = t->c_ispeed = B0;
|
|
|
|
else
|
|
|
|
switch (state.BaudRate)
|
|
|
|
{
|
2000-02-17 20:38:33 +01:00
|
|
|
case CBR_110:
|
|
|
|
t->c_cflag = t->c_ospeed = t->c_ispeed = B110;
|
|
|
|
break;
|
|
|
|
case CBR_300:
|
|
|
|
t->c_cflag = t->c_ospeed = t->c_ispeed = B300;
|
|
|
|
break;
|
|
|
|
case CBR_600:
|
|
|
|
t->c_cflag = t->c_ospeed = t->c_ispeed = B600;
|
|
|
|
break;
|
|
|
|
case CBR_1200:
|
|
|
|
t->c_cflag = t->c_ospeed = t->c_ispeed = B1200;
|
|
|
|
break;
|
|
|
|
case CBR_2400:
|
|
|
|
t->c_cflag = t->c_ospeed = t->c_ispeed = B2400;
|
|
|
|
break;
|
|
|
|
case CBR_4800:
|
|
|
|
t->c_cflag = t->c_ospeed = t->c_ispeed = B4800;
|
|
|
|
break;
|
|
|
|
case CBR_9600:
|
|
|
|
t->c_cflag = t->c_ospeed = t->c_ispeed = B9600;
|
|
|
|
break;
|
|
|
|
case CBR_19200:
|
|
|
|
t->c_cflag = t->c_ospeed = t->c_ispeed = B19200;
|
|
|
|
break;
|
|
|
|
case CBR_38400:
|
|
|
|
t->c_cflag = t->c_ospeed = t->c_ispeed = B38400;
|
|
|
|
break;
|
|
|
|
case CBR_57600:
|
|
|
|
t->c_cflag = t->c_ospeed = t->c_ispeed = B57600;
|
|
|
|
break;
|
|
|
|
case CBR_115200:
|
|
|
|
t->c_cflag = t->c_ospeed = t->c_ispeed = B115200;
|
|
|
|
break;
|
2003-01-09 09:22:05 +01:00
|
|
|
case 230400: /* CBR_230400 - not defined */
|
|
|
|
t->c_cflag = t->c_ospeed = t->c_ispeed = B230400;
|
|
|
|
break;
|
2000-02-17 20:38:33 +01:00
|
|
|
default:
|
|
|
|
/* Unsupported baud rate! */
|
|
|
|
termios_printf ("Invalid baud rate %d", state.BaudRate);
|
|
|
|
set_errno (EINVAL);
|
|
|
|
return -1;
|
2003-02-01 05:48:03 +01:00
|
|
|
}
|
2000-02-17 20:38:33 +01:00
|
|
|
|
|
|
|
/* -------------- Byte size ------------------ */
|
|
|
|
|
|
|
|
switch (state.ByteSize)
|
|
|
|
{
|
2003-02-01 05:48:03 +01:00
|
|
|
case 5:
|
|
|
|
t->c_cflag |= CS5;
|
|
|
|
break;
|
|
|
|
case 6:
|
|
|
|
t->c_cflag |= CS6;
|
|
|
|
break;
|
|
|
|
case 7:
|
|
|
|
t->c_cflag |= CS7;
|
|
|
|
break;
|
|
|
|
case 8:
|
|
|
|
t->c_cflag |= CS8;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
/* Unsupported byte size! */
|
|
|
|
termios_printf ("Invalid byte size %d", state.ByteSize);
|
|
|
|
set_errno (EINVAL);
|
|
|
|
return -1;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* -------------- Stop bits ------------------ */
|
|
|
|
|
|
|
|
if (state.StopBits == TWOSTOPBITS)
|
|
|
|
t->c_cflag |= CSTOPB;
|
|
|
|
|
|
|
|
/* -------------- Parity ------------------ */
|
|
|
|
|
|
|
|
if (state.Parity == ODDPARITY)
|
|
|
|
t->c_cflag |= (PARENB | PARODD);
|
|
|
|
if (state.Parity == EVENPARITY)
|
|
|
|
t->c_cflag |= PARENB;
|
|
|
|
|
|
|
|
/* -------------- Parity errors ------------------ */
|
|
|
|
|
|
|
|
/* fParity combines the function of INPCK and NOT IGNPAR */
|
2003-12-07 23:37:12 +01:00
|
|
|
if (state.fParity)
|
2000-02-17 20:38:33 +01:00
|
|
|
t->c_iflag |= INPCK;
|
|
|
|
else
|
|
|
|
t->c_iflag |= IGNPAR; /* not necessarily! */
|
|
|
|
|
|
|
|
/* -------------- Software flow control ------------------ */
|
|
|
|
|
|
|
|
/* transmission flow control */
|
|
|
|
if (state.fOutX)
|
|
|
|
t->c_iflag |= IXON;
|
|
|
|
|
|
|
|
/* reception flow control */
|
|
|
|
if (state.fInX)
|
|
|
|
t->c_iflag |= IXOFF;
|
|
|
|
|
|
|
|
t->c_cc[VSTART] = (state.XonChar ? state.XonChar : 0x11);
|
|
|
|
t->c_cc[VSTOP] = (state.XoffChar ? state.XoffChar : 0x13);
|
|
|
|
|
|
|
|
/* -------------- Hardware flow control ------------------ */
|
|
|
|
/* Some old flavors of Unix automatically enabled hardware flow
|
|
|
|
control when software flow control was not enabled. Since newer
|
|
|
|
Unices tend to require explicit setting of hardware flow-control,
|
|
|
|
this is what we do. */
|
|
|
|
|
|
|
|
/* Input flow-control */
|
2003-12-07 23:37:12 +01:00
|
|
|
if ((state.fRtsControl == RTS_CONTROL_HANDSHAKE) && state.fOutxCtsFlow)
|
2000-02-17 20:38:33 +01:00
|
|
|
t->c_cflag |= CRTSCTS;
|
|
|
|
if (state.fRtsControl == RTS_CONTROL_HANDSHAKE)
|
|
|
|
t->c_cflag |= CRTSXOFF;
|
|
|
|
|
|
|
|
/* -------------- CLOCAL --------------- */
|
|
|
|
/* DSR is only lead toggled only by CLOCAL. Check it to see if
|
|
|
|
CLOCAL was called. */
|
|
|
|
/* FIXME: If tcsetattr() hasn't been called previously, this may
|
|
|
|
give a false CLOCAL. */
|
|
|
|
|
2003-12-07 23:37:12 +01:00
|
|
|
if (!state.fDsrSensitivity)
|
2000-02-17 20:38:33 +01:00
|
|
|
t->c_cflag |= CLOCAL;
|
|
|
|
|
|
|
|
/* FIXME: need to handle IGNCR */
|
|
|
|
#if 0
|
|
|
|
if (!get_r_binary ())
|
|
|
|
t->c_iflag |= IGNCR;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
if (!get_w_binary ())
|
|
|
|
t->c_oflag |= ONLCR;
|
|
|
|
|
2002-11-15 03:12:36 +01:00
|
|
|
t->c_cc[VTIME] = vtime_ / 100;
|
|
|
|
t->c_cc[VMIN] = vmin_;
|
|
|
|
|
2000-02-17 20:38:33 +01:00
|
|
|
debug_printf ("vmin_ %d, vtime_ %d", vmin_, vtime_);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
fhandler_serial::fixup_after_fork (HANDLE parent)
|
|
|
|
{
|
|
|
|
if (get_close_on_exec ())
|
2003-02-04 04:01:17 +01:00
|
|
|
fhandler_base::fixup_after_fork (parent);
|
2000-02-17 20:38:33 +01:00
|
|
|
overlapped_setup ();
|
|
|
|
debug_printf ("io_status.hEvent %p", io_status.hEvent);
|
|
|
|
}
|
|
|
|
|
2000-09-03 06:16:35 +02:00
|
|
|
void
|
|
|
|
fhandler_serial::fixup_after_exec (HANDLE)
|
2000-02-17 20:38:33 +01:00
|
|
|
{
|
|
|
|
overlapped_setup ();
|
|
|
|
debug_printf ("io_status.hEvent %p", io_status.hEvent);
|
2000-09-03 06:16:35 +02:00
|
|
|
return;
|
2000-02-17 20:38:33 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
fhandler_serial::dup (fhandler_base *child)
|
|
|
|
{
|
|
|
|
fhandler_serial *fhc = (fhandler_serial *) child;
|
|
|
|
overlapped_setup ();
|
|
|
|
fhc->vmin_ = vmin_;
|
|
|
|
fhc->vtime_ = vtime_;
|
|
|
|
return fhandler_base::dup (child);
|
|
|
|
}
|