From 56b5feb639f51385da560289e1c1e65512fb3f67 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Sat, 27 Dec 2003 00:25:02 +0000 Subject: * exceptions.cc (try_to_debug): Fix off-by-one problem when resetting environment variable after error_start detected. * fhandler_tty_slave.cc (fhandler_tty_slave::close): Clarify debug message. * syscalls.cc (setsid): Don't increment usecount here, since it will be automatically decremented on close. --- winsup/cygwin/exceptions.cc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'winsup/cygwin/exceptions.cc') diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc index 228d2c8e2..97955307b 100644 --- a/winsup/cygwin/exceptions.cc +++ b/winsup/cygwin/exceptions.cc @@ -350,12 +350,15 @@ try_to_debug (bool waitloop) char* rawenv = GetEnvironmentStrings () ; for (char* p = rawenv; *p != '\0'; p = strchr (p, '\0') + 1) { - if (strncmp (p, "CYGWIN=", sizeof ("CYGWIN=") - 1) == 0) + if (strncmp (p, "CYGWIN=", strlen ("CYGWIN=")) == 0) { char* q = strstr (p, "error_start") ; /* replace 'error_start=...' with '_rror_start=...' */ - if (q) *q = '_' ; - SetEnvironmentVariable ("CYGWIN", p + sizeof ("CYGWIN=")) ; + if (q) + { + *q = '_' ; + SetEnvironmentVariable ("CYGWIN", p + strlen ("CYGWIN=")) ; + } break ; } } -- cgit v1.2.3