0
@@ -22,14 +22,14 @@ CGI := Object clone do(
0
   docSlot("parse", "Parses the QUERY_STRING environment variable (or standard input if there is no QUERY_STRING environment variable) and returns a Map containing key/value query value pairs.")
0
 
0
   isInWebScript := method(
0
-		System getenv("QUERY_STRING") != nil
0
+		System getEnvironmentVariable("QUERY_STRING") != nil
0
   )
0
 
0
   newSlot("postData")
0
 
0
   parse := method(
0
-		q := System getenv("QUERY_STRING")
0
-		contentLength := System getenv("CONTENT_LENGTH")
0
+		q := System getEnvironmentVariable("QUERY_STRING")
0
+		contentLength := System getEnvironmentVariable("CONTENT_LENGTH")
0
     if (q == nil, return Map clone)
0
 
0
     if (contentLength,
0
@@ -77,7 +77,7 @@ CGI := Object clone do(
0
         form atPut("imageMapX", kv at(0))
0
         form atPut("imageMapY", kv at(1))
0
       )
0
-			if(System getenv("REQUEST_METHOD") ?asLowercase == "post",
0
+			if(System getEnvironmentVariable("REQUEST_METHOD") ?asLowercase == "post",
0
         setPostData(File standardInput open contents)
0
       )
0
     )

0
@@ -3,8 +3,8 @@ AddonBuilder clone do(
0
   dependsOnBinding( "Box" )
0
 
0
   if(platform != "darwin",
0
-		GNUstepSystemRoot := System getenv("GNUSTEP_SYSTEM_ROOT") ifNilEval("/usr/GNUstep/System")
0
-		GNUstepLocalRoot := System getenv("GNUSTEP_LOCAL_ROOT") ifNilEval("/usr/GNUstep/Local")
0
+		GNUstepSystemRoot := System getEnvironmentVariable("GNUSTEP_SYSTEM_ROOT") ifNilEval("/usr/GNUstep/System")
0
+		GNUstepLocalRoot := System getEnvironmentVariable("GNUSTEP_LOCAL_ROOT") ifNilEval("/usr/GNUstep/Local")
0
     appendHeaderSearchPath(GNUstepSystemRoot .. "/Library/Headers")
0
     appendHeaderSearchPath(GNUstepLocalRoot .. "/Library/Headers")
0
     appendLibSearchPath(GNUstepSystemRoot .. "/Library/Libraries")

0
@@ -45,8 +45,8 @@ Socket do(
0
   port := method(ipAddress port)
0
 
0
   checkErrno := method(
0
-		//writeln("System errno = ", System errno)
0
-		Socket errno ifNonNil(setError("Socket errno: " .. System errno))
0
+		//writeln("System errorNumber = ", System errorNumber)
0
+		Socket errorNumber ifNonNil(setError("Socket errorNumber: " .. System errorNumber))
0
   )
0
 
0
   setupEvents := method(
0
@@ -56,14 +56,14 @@ Socket do(
0
 
0
   streamOpen := method(
0
     asyncStreamOpen
0
-		raiseOnError(checkErrno)
0
+		raiseOnError(checkErrorNumber)
0
     setupEvents
0
     true
0
   )
0
 
0
   udpOpen := method(
0
     asyncUdpOpen
0
-		checkErrno
0
+		checkErrorNumber
0
     setupEvents
0
     true
0
   )
0
@@ -86,9 +86,9 @@ Socket do(
0
         return(false)
0
       )
0
       didConnect = asyncConnect(ipAddress)
0
-			//checkErrno
0
+			//checkErrorNumber
0
     )
0
-		if(didConnect not and errno == "WSA Error 10022",
0
+		if(didConnect not and errorNumber == "WSA Error 10022",
0
       writeEvent waitOn(connectTimeout) ifFalse(
0
         setError("Connection timeout")
0
         return(false)
0
@@ -99,7 +99,7 @@ Socket do(
0
       didConnect = asyncConnect(ipAddress)
0
     )
0
     didConnect ifTrue(return(true))
0
-		checkErrno
0
+		checkErrorNumber
0
     false
0
   )
0
 
0
@@ -190,7 +190,7 @@ Socket do(
0
         //nil
0
       //)
0
       setErrorIfInvalid ifTrue(return(false))
0
-			//checkErrno
0
+			//checkErrorNumber
0
     )
0
     true
0
   )

0
@@ -114,7 +114,7 @@ IoSocket *IoSocket_proto(void *state)
0
     {"setSocketWriteLowWaterMark", IoSocket_setSocketWriteLowWaterMark},
0
 
0
     {"setNoDelay", IoSocket_setNoDelay},
0
-		{"errno", IoSocket_errnoDescription},
0
+		{"errorNumber", IoSocket_errorNumberDescription},
0
 
0
     {NULL, NULL}
0
     };
0
@@ -387,7 +387,7 @@ IoObject *IoSocket_setNoDelay(IoSocket *self, IoObject *locals, IoMessage *m)
0
 }
0
 
0
 
0
-IoObject *IoSocket_errnoDescription(IoSocket *self, IoObject *locals, IoMessage *m)
0
+IoObject *IoSocket_errorNumberDescription(IoSocket *self, IoObject *locals, IoMessage *m)
0
 {
0
   int err = SocketErrorStatus();
0
 #ifdef WIN32

0
@@ -68,6 +68,6 @@ IoObject *IoSocket_getSocketReadLowWaterMark(IoSocket *self, IoObject *locals, I
0
 IoObject *IoSocket_getSocketWriteLowWaterMark(IoSocket *self, IoObject *locals, IoMessage *m);
0
 
0
 IoObject *IoSocket_setNoDelay(IoSocket *self, IoObject *locals, IoMessage *m);
0
-IoObject *IoSocket_errnoDescription(IoSocket *self, IoObject *locals, IoMessage *m);
0
+IoObject *IoSocket_errorNumberDescription(IoSocket *self, IoObject *locals, IoMessage *m);
0
 
0
 #endif

0
@@ -285,7 +285,7 @@ int Socket_connectTo(Socket *self, IPAddress *address)
0
     return 1;
0
   }
0
 
0
-	//Socket_checkErrno(self);
0
+	//Socket_checkErrorNumber(self);
0
 
0
   return result;
0
 }
0
@@ -298,7 +298,7 @@ int Socket_bind(Socket *self, IPAddress *address)
0
 
0
   // returns 0 of ok, -1 on error
0
   r = bind(self->fd, IPAddress_sockaddr(address), IPAddress_size(address));
0
-	//if (r == -1) Socket_checkErrno(self);
0
+	//if (r == -1) Socket_checkErrorNumber(self);
0
   return r;
0
 }
0
 
0
@@ -310,7 +310,7 @@ int Socket_listen(Socket *self)
0
 
0
   // returns 0 of ok, -1 on error
0
   r = listen(self->fd, SOMAXCONN);
0
-	//if (r == -1) Socket_checkErrno(self);
0
+	//if (r == -1) Socket_checkErrorNumber(self);
0
   return r;
0
 }
0
 
0
@@ -335,7 +335,7 @@ Socket *Socket_accept(Socket *self, IPAddress *address)
0
     return socket;
0
   }
0
 
0
-	//Socket_checkErrno(self);
0
+	//Socket_checkErrorNumber(self);
0
 
0
   return NULL;
0
 }
0
@@ -369,7 +369,7 @@ ssize_t Socket_streamRead(Socket *self, UArray *buffer, size_t readSize)
0
     UArray_setSize_(buffer, originalSize);
0
   }
0
 
0
-	//if (bytesRead == -1) Socket_checkErrno(self);
0
+	//if (bytesRead == -1) Socket_checkErrorNumber(self);
0
   if ((bytesRead == 0 || SocketErrorStatus()) &&
0
     (SocketErrorStatus() != EINTR &&
0
     SocketErrorStatus() != EAGAIN &&
0
@@ -425,7 +425,7 @@ ssize_t Socket_streamWrite(Socket *self,
0
   {
0
     //printf("Socket_streamWrite() bytesSent %i errno %i - closing\n", bytesSent, errno);
0
     Socket_close(self);
0
-		//Socket_checkErrno(self);
0
+		//Socket_checkErrorNumber(self);
0
   }
0
 
0
   return bytesSent;
0
@@ -492,7 +492,7 @@ ssize_t Socket_udpWrite(Socket *self,
0
         IPAddress_sockaddr(address),
0
         IPAddress_size(address));
0
 
0
-	//if (bytesWritten < 0) Socket_checkErrno(self);
0
+	//if (bytesWritten < 0) Socket_checkErrorNumber(self);
0
 
0
   return bytesWritten;
0
 }

0
@@ -5,10 +5,10 @@ AddonBuilder := Object clone do(
0
   disable := method(isDisabled = true)
0
 
0
   platform := System platform split at(0) asLowercase
0
-	cflags := method(System getenv("CFLAGS") ifNilEval(""))
0
+	cflags := method(System getEnvironmentVariable("CFLAGS") ifNilEval(""))
0
   if (platform == "windows",
0
-		cc := method(System getenv("CC") ifNilEval(return "cl -nologo"))
0
-		cxx := method(System getenv("CXX") ifNilEval(return "cl -nologo"))
0
+		cc := method(System getEnvironmentVariable("CC") ifNilEval(return "cl -nologo"))
0
+		cxx := method(System getEnvironmentVariable("CXX") ifNilEval(return "cl -nologo"))
0
     ccOutFlag := "-Fo"
0
     linkdll := "link -link -nologo"
0
     linkDirPathFlag := "-libpath:"
0
@@ -19,8 +19,8 @@ AddonBuilder := Object clone do(
0
     arFlags := "-out:"
0
     ranlib := nil
0
   ,
0
-		cc := method(System getenv("CC") ifNilEval(return "cc"))
0
-		cxx := method(System getenv("CXX") ifNilEval(return "g++"))
0
+		cc := method(System getEnvironmentVariable("CC") ifNilEval(return "cc"))
0
+		cxx := method(System getEnvironmentVariable("CXX") ifNilEval(return "g++"))
0
     ccOutFlag := "-o "
0
     linkdll := cc
0
     linkDirPathFlag := "-L"
0
@@ -28,9 +28,9 @@ AddonBuilder := Object clone do(
0
     linkLibSuffix := ""
0
     linkOutFlag := "-o "
0
     linkLibSuffix := ""
0
-		ar := method(System getenv("AR") ifNilEval(return "ar"))
0
+		ar := method(System getEnvironmentVariable("AR") ifNilEval(return "ar"))
0
     arFlags := "rcu "
0
-		ranlib := method(System getenv("RANLIB") ifNilEval(return "ranlib"))
0
+		ranlib := method(System getEnvironmentVariable("RANLIB") ifNilEval(return "ranlib"))
0
   )
0
 
0
   supportedOnPlatform := true

0
@@ -1,6 +1,6 @@
0
 Project := Object clone do(
0
-	cc  := method(System getenv("CC")  ifNilEval(return "cc"))
0
-	cxx := method(System getenv("CXX") ifNilEval(return "g++"))
0
+	cc  := method(System getEnvironmentVariable("CC")  ifNilEval(return "cc"))
0
+	cxx := method(System getEnvironmentVariable("CXX") ifNilEval(return "g++"))
0
   platform := System platform split at(0) asLowercase
0
 
0
   systemCall := method(s,

0
@@ -251,7 +251,7 @@
0
           "foreach"
0
           "forward"
0
           "getSlot"
0
-				  "getenv"
0
+				  "getEnvironmentVariable"
0
           "hasSlot"
0
           "if"
0
           "ifFalse"

0
@@ -91,7 +91,7 @@
0
       <item> doString </item>
0
       <item> forward </item>
0
       <item> getSlot </item>
0
-			<item> getenv </item>
0
+			<item> getEnvironmentVariable </item>
0
       <item> hasSlot </item>
0
       <item> isActive </item>
0
       <item> isNil </item>

0
@@ -34,7 +34,7 @@ bitwiseOf bitwiseXor bitwiseComplement shiftLeft shiftRight \
0
 isAlphabetic isControlCharacter isDigit isGraph isLowerCase isUpperCase \
0
 isPrint isPunctuaction isSpace isHexDigit removeSlot slotNames perform \
0
 super break continue exit pause resume wait isActive activeCoroCount \
0
-collectGarbage do doString numberId getenv \
0
+collectGarbage do doString numberId getEnvironmentVariable \
0
 reverseFind beginsWith endsWith contains containsAny containsAnyCase \
0
 length split splitCount splitAt substring escape unescape append \
0
 insert removeFrom replace lower upper doFile join asBase fromBase \

0
@@ -32,7 +32,7 @@ syntax keyword xType true false nil Random BigNum Sequence
0
 syntax keyword xKeyword activate activeCoroCount and asString block break
0
 syntax keyword xKeyword catch clone collectGarbage compileString continue
0
 syntax keyword xKeyword do doFile doMessage doString else elseif exit for
0
-syntax keyword xKeyword foreach forward getSlot getenv hasSlot if ifFalse
0
+syntax keyword xKeyword foreach forward getSlot getEnvironmentVariable hasSlot if ifFalse
0
 syntax keyword xKeyword ifNil ifNilEval ifTrue isActive isNil isResumable list message
0
 syntax keyword xKeyword method or parent pass pause perform
0
 syntax keyword xKeyword performWithArgList print println proto raise raiseResumable

0
@@ -57,7 +57,7 @@
0
           "foreach" ,
0
           "forward" ,
0
           "getSlot" ,
0
-				  "getenv" ,
0
+				  "getEnvironmentVariable" ,
0
           "hasSlot" ,
0
           "if" ,
0
           "ifFalse" ,

0
@@ -25,7 +25,7 @@ CLI := Object clone do(
0
   )
0
 
0
   runIorc := method(
0
-		home := System getenv("HOME")
0
+		home := System getEnvironmentVariable("HOME")
0
     if(home,
0
       path := Path with(home, ".iorc")
0
       if(File with(path) exists,
0
@@ -35,7 +35,7 @@ CLI := Object clone do(
0
   )
0
 
0
   ioHistoryFile := method(
0
-		Path with(System getenv("HOME"), ".io_history")
0
+		Path with(System getEnvironmentVariable("HOME"), ".io_history")
0
   )
0
 
0
   saveHistory := method(

0
@@ -28,7 +28,7 @@ System ioDoc(
0
 #ifdef WIN32
0
 #include <windows.h>
0
 
0
-static void setenv(const char *varName, const char* value, int force)
0
+static void setEnvironmentVariable(const char *varName, const char* value, int force)
0
 {
0
   const char *safeValue;
0
   char *buf;
0
@@ -76,10 +76,10 @@ IoObject *IoSystem_proto(void *state)
0
 #if defined(_WIN32)
0
   {"shellExecute", IoObject_shellExecute},
0
 #endif
0
-	{"errno", IoObject_errnoDescription},
0
+	{"errorNumber", IoObject_errorNumberDescription},
0
   {"exit", IoObject_exit},
0
-	{"getenv", IoObject_getenv},
0
-	{"setenv", IoObject_setenv},
0
+	{"getEnvironmentVariable", IoObject_getEnvironmentVariable},
0
+	{"setEnvironmentVariable", IoObject_setEnvironmentVariable},
0
   {"system", IoObject_system},
0
   //{"memorySizeOfState", IoObject_memorySizeOfState},
0
   //{"compactState", IoObject_compactState},
0
@@ -120,7 +120,7 @@ IoObject *IoSystem_proto(void *state)
0
 }
0
 
0
 /*
0
-IoObject *IoObject_errno(IoObject *self, IoObject *locals, IoMessage *m)
0
+IoObject *IoObject_errorNumber(IoObject *self, IoObject *locals, IoMessage *m)
0
 {
0
   return IONUMBER(errno);
0
 }
0
@@ -137,10 +137,10 @@ IoObject *IoObject_shellExecute(IoObject *self, IoObject *locals, IoMessage *m)
0
 }
0
 #endif
0
 
0
-IoObject *IoObject_errnoDescription(IoObject *self, IoObject *locals, IoMessage *m)
0
+IoObject *IoObject_errorNumberDescription(IoObject *self, IoObject *locals, IoMessage *m)
0
 {
0
   /*#io
0
-	docSlot("errno", "Returns the C errno string.")
0
+	docSlot("errorNumber", "Returns the C errno string.")
0
   */
0
   return errno ? IOSYMBOL(strerror(errno)) : IONIL(self);
0
 }
0
@@ -164,12 +164,11 @@ control to the calling program (if any). ")
0
   return self;
0
 }
0
 
0
-IoObject *IoObject_getenv(IoObject *self, IoObject *locals, IoMessage *m)
0
+IoObject *IoObject_getEnvironmentVariable(IoObject *self, IoObject *locals, IoMessage *m)
0
 {
0
   /*#io
0
-	docSlot("getenv(nameString)",
0
-			"Returns a string with the value of the environment
0
-variable whose name is specified by nameString.")
0
+	docSlot("getEnvironmentVariable(nameString)",
0
+		   "Returns a string with the value of the environment variable whose name is specified by nameString.")
0
   */
0
 
0
   IoSymbol *key = IoMessage_locals_symbolArgAt_(m, locals, 0);
0
@@ -219,10 +218,10 @@ IoObject *IoObject_compactState(IoObject *self, IoObject *locals, IoMessage *m)
0
   return self;
0
 }
0
 
0
-IoObject *IoObject_setenv(IoObject *self, IoObject *locals, IoMessage *m)
0
+IoObject *IoObject_setEnvironmentVariable(IoObject *self, IoObject *locals, IoMessage *m)
0
 {
0
   /*#io
0
-	docSlot("setenv(keyString, valueString)", "Sets the environment variable keyString to the value valueString.")
0
+	docSlot("setEnvironmentVariable(keyString, valueString)", "Sets the environment variable keyString to the value valueString.")
0
   */
0
 
0
   // setenv() takes different args in different implementations

0
@@ -18,12 +18,12 @@ IoObject *IoSystem_proto(void *state);
0
 #if defined(_WIN32)
0
 IoObject *IoObject_shellExecute(IoObject *self, IoObject *locals, IoMessage *m);
0
 #endif
0
-IoObject *IoObject_errno(IoObject *self, IoObject *locals, IoMessage *m);
0
-IoObject *IoObject_errnoDescription(IoObject *self, IoObject *locals, IoMessage *m);
0
+IoObject *IoObject_errorNumber(IoObject *self, IoObject *locals, IoMessage *m);
0
+IoObject *IoObject_errorNumberDescription(IoObject *self, IoObject *locals, IoMessage *m);
0
 IoObject *IoObject_exit(IoObject *self, IoObject *locals, IoMessage *m);
0
 IoObject *IoObject_compileString(IoObject *self, IoObject *locals, IoMessage *m);
0
-IoObject *IoObject_getenv(IoObject *self, IoObject *locals, IoMessage *m);
0
-IoObject *IoObject_setenv(IoObject *self, IoObject *locals, IoMessage *m);
0
+IoObject *IoObject_getEnvironmentVariable(IoObject *self, IoObject *locals, IoMessage *m);
0
+IoObject *IoObject_setEnvironmentVariable(IoObject *self, IoObject *locals, IoMessage *m);
0
 IoObject *IoObject_system(IoObject *self, IoObject *locals, IoMessage *m);
0
 IoObject *IoObject_memorySizeOfState(IoObject *self, IoObject *locals, IoMessage *m);
0
 IoObject *IoObject_compactState(IoObject *self, IoObject *locals, IoMessage *m);