From 893ac8e03c21d246bbfc8d575a227d8c65cfae76 Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Sun, 3 Jul 2005 02:40:30 +0000
Subject: Replace valid memory checks with new myfault class "exception
 handling", almost everywhere.  Leave some thread.cc stuff alone for now. *
 cygtls.h: Kludge some definitions to avoid including a problematic windows
 header. (_cygtls::_myfault): New entry. (_cygtls::_myfault_errno): Ditto.
 (_cygtls::fault_guarded): New function. (_cygtls::setup_fault): Ditto.
 (_cygtls::return_from_fault): Ditto. (_cygtls::clear_fault): Ditto.
 (myfault): New class. * exceptions.cc (handle_exceptions): Handle case of
 guarded fault in system routine. * gendef: Add another entry point for setjmp
 that the compiler doesn't know about and won't complain about. *
 gentls_offsets: Just include windows.h rather than kludging a HANDLE def. *
 miscfuncs.cc (check_null_str): Delete. (check_null_empty_str): Ditto.
 (check_null_empty_str_errno): Ditto. (check_null_str_errno): Ditto.
 (__check_null_invalid_struct): Ditto. (__check_null_invalid_struct_errno):
 Ditto. (__check_invalid_read_ptr): Ditto. (__check_invalid_read_ptr_errno):
 Ditto. (dummytest): New function. (check_iovec_for_read): Delete.
 (chec_iovec): Rename from check_iovec_for_write.  Take a read/write
 parameter. * tlsoffsets.h: Regenerate. * winsup.h: Remove check_*
 declarations. (check_iovec_for_read): Delete declaration.  Turn into a define
 instead. (check_iovec_for_write): Ditto. (check_iovec): New declaration. *
 thread.h: Use ifdef guard name consistent with other header files.

---
 winsup/cygwin/environ.cc | 40 +++++++++++++++-------------------------
 1 file changed, 15 insertions(+), 25 deletions(-)

(limited to 'winsup/cygwin/environ.cc')

diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc
index ddd038285..099dcaee5 100644
--- a/winsup/cygwin/environ.cc
+++ b/winsup/cygwin/environ.cc
@@ -331,20 +331,18 @@ _addenv (const char *name, const char *value, int overwrite)
 extern "C" int
 putenv (char *str)
 {
-  int res;
-  if ((res = check_null_empty_str (str)))
+  myfault efault;
+  if (efault.faulted (EFAULT))
+    return -1;
+  if (*str)
     {
-      if (res == ENOENT)
-	return 0;
-      set_errno (res);
-      return  -1;
-    }
-  char *eq = strchr (str, '=');
-  if (eq)
-    return _addenv (str, eq + 1, -1);
+      char *eq = strchr (str, '=');
+      if (eq)
+	return _addenv (str, eq + 1, -1);
 
-  /* Remove str from the environment. */
-  unsetenv (str);
+      /* Remove str from the environment. */
+      unsetenv (str);
+    }
   return 0;
 }
 
@@ -353,19 +351,11 @@ putenv (char *str)
 extern "C" int
 setenv (const char *name, const char *value, int overwrite)
 {
-  int res;
-  if ((res = check_null_empty_str (value)) == EFAULT)
-    {
-      set_errno (res);
-      return  -1;
-    }
-  if ((res = check_null_empty_str (name)))
-    {
-      if (res == ENOENT)
-	return 0;
-      set_errno (res);
-      return  -1;
-    }
+  myfault efault;
+  if (efault.faulted (EFAULT))
+    return -1;
+  if (!*name)
+    return 0;
   if (*value == '=')
     value++;
   return _addenv (name, value, !!overwrite);
-- 
cgit v1.2.3