lib/standard: Added errno and strerror bindings to stdlib.

[nit.git] / lib / socket / socket_c.nit

diff --git a/lib/socket/socket_c.nit b/lib/socket/socket_c.nit
index 11f518e..11bda16 100644 (file)
--- a/lib/socket/socket_c.nit
+++ b/lib/socket/socket_c.nit
@@ -28,7 +28,6 @@ in "C Header" `{
        #include <arpa/inet.h>
        #include <netdb.h>
        #include <sys/poll.h>
-       #include <errno.h>
 
        typedef int S_DESCRIPTOR;
        typedef struct sockaddr_in S_ADDR_IN;
@@ -116,18 +115,23 @@ extern FFSocket `{ S_DESCRIPTOR* `}
        fun destroy `{ free(recv); `}
        fun close: Int `{ return close( *recv ); `}
        fun descriptor: Int `{ return *recv; `}
-       fun errno: Int `{ return errno; `}
 
        fun gethostbyname(n: String): FFSocketHostent import String.to_cstring `{ return gethostbyname(String_to_cstring(n)); `}
        fun connect(addrIn: FFSocketAddrIn): Int `{ return connect( *recv, (S_ADDR*)addrIn, sizeof(*addrIn) ); `}
        fun write(buffer: String): Int import String.to_cstring, String.length `{ return write(*recv, (char*)String_to_cstring(buffer), String_length(buffer)); `}
 
-       fun read: String import NativeString.to_s `{
-               char *c = (char*)malloc(1024);
-               int n = read(*recv, c, 1023);
-               if(n < 0) exit(-1);
-               c[n] = '\0';
-               return NativeString_to_s(c);
+       fun read: String import NativeString.to_s_with_length `{
+               static char c[1024];
+               int n = read(*recv, c, 1024);
+               if(n < 0) {
+                       free(c);
+                       return NativeString_to_s_with_length("",0);
+               }
+               char* ret = malloc(n + 1);
+               memcpy(ret, c, n);
+               ret[n] = '\0';
+               free(c);
+               return NativeString_to_s_with_length(ret, n);
        `}
 
        # Sets an option for the socket