aboutsummaryrefslogtreecommitdiff
path: root/winsup/cygwin/fhandler_console.cc
diff options
context:
space:
mode:
authorChristopher Faylor <me@cgf.cx>2001-03-05 06:28:25 +0000
committerChristopher Faylor <me@cgf.cx>2001-03-05 06:28:25 +0000
commit95a8465ba0fb3ea0fb9033e4823b1f65c4554f27 (patch)
tree1d9cd02f71759975598d27cf3728af23592c90b0 /winsup/cygwin/fhandler_console.cc
parent658b5db941bcace10daa2d17e8c1158030a4fc8c (diff)
downloadnewlib-95a8465ba0fb3ea0fb9033e4823b1f65c4554f27.zip
newlib-95a8465ba0fb3ea0fb9033e4823b1f65c4554f27.tar.gz
newlib-95a8465ba0fb3ea0fb9033e4823b1f65c4554f27.tar.bz2
* dlopen.c (dlopen): Return NULL when name is NULL (suggested by
chrisiasci@aol.com). * cygwin.din: Add a new, internally used export - _check_for_executable. * dcrt0.cc (dll_crt0_1): Set _check_for_executable for older binaries. Pass user_data to premain functions. * fhandler.cc (fhandler_disk_file::open): Only check for executable if the linked program is intereested in the executable bit. (fhandler_disk_file::check_execable_p): Delete. * fhandler.h (executable_states): New enumeration of various states of executable bit caring. (fhandler_base::set_execable_p): New method. * fhandler_termios.cc (fhandler_termios::line_edit): Flag when a signal has been sent to the tty. Return -1 when this is so. * fhandler_console.cc (fhandler_console::read): Return -1 when signal sending character encountered. * path.cc (path_conv::check): Record when path refers to a disk device. Move executable extension check here. (check_sysfile): Accomodate new EXEC path states. (has_suffix): Remove. (next_suffix): Remove. (class suffix_scan): New clas. (suffix_scan::has): New method. (suffix_scan:next): New method. (symlink_info::check): Use suffix_scan method to control for scanning for suffixes. * path.h (path_conv::exec_state): New method. * perprocess.h: Make "C" friendly. * include/cygwin/version.h: Define CYGWIN_VERSION_CHECK_FOR_S_IEXEC. Bump CYGWIN_VERSION_API_MINOR. * include/sys/cygwin.h: Change premain declarations. * winsup.h: Move __cplusplus test to after builtin defines.
Diffstat (limited to 'winsup/cygwin/fhandler_console.cc')
-rw-r--r--winsup/cygwin/fhandler_console.cc17
1 files changed, 13 insertions, 4 deletions
diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc
index 7ef1237..6e8c76c 100644
--- a/winsup/cygwin/fhandler_console.cc
+++ b/winsup/cygwin/fhandler_console.cc
@@ -178,8 +178,7 @@ fhandler_console::read (void *pv, size_t buflen)
case WAIT_OBJECT_0:
break;
case WAIT_OBJECT_0 + 1:
- set_sig_errno (EINTR);
- return -1;
+ goto sig_exit;
default:
__seterrno ();
return -1;
@@ -358,8 +357,14 @@ fhandler_console::read (void *pv, size_t buflen)
continue;
}
- if (toadd && line_edit (toadd, nread))
- break;
+ if (toadd)
+ {
+ int res = line_edit (toadd, nread);
+ if (res < 0)
+ goto sig_exit;
+ else if (res)
+ break;
+ }
#undef ich
}
@@ -374,6 +379,10 @@ fhandler_console::read (void *pv, size_t buflen)
#undef buf
return copied_chars;
+
+ sig_exit:
+ set_sig_errno (EINTR);
+ return -1;
}
void