--- lbbs/src/netio.c	2004/10/21 17:28:46	1.2
+++ lbbs/src/netio.c	2005/03/20 17:37:14	1.4
@@ -16,71 +16,73 @@
  ***************************************************************************/
 
 #include "common.h"
+#include <string.h>
+#include <sys/socket.h>
 
 char
-s_getc(int socket)
+s_getc (int socket)
 {
   char c;
-  if (recv(socket,&c,1,0)>0)
+  if (recv (socket, &c, 1, 0) > 0)
     return c;
   else
     return '\0';
 }
 
 int
-s_putc(int socket, char c)
+s_putc (int socket, char c)
 {
   int ret;
-  
+
   ret = send (socket, &c, 1, 0);
-  
+
   return ret;
 }
 
 int
-s_receive(int socket, char* buffer, int buffer_length, char end_str[])
+s_receive (int socket, char *buffer, int buffer_length, char end_str[])
 {
   char buf_str[2048];
-  int buf_read,total_read;
+  int buf_read, total_read;
   int buf_len = 2047;
 
-  if (buf_len+1 > buffer_length)
-    buf_len = buffer_length -1;
+  if (buf_len + 1 > buffer_length)
+    buf_len = buffer_length - 1;
 
   total_read = 0;
-  strcpy(buffer,"");
-  while((buf_read = recv(socket,buf_str,buf_len,0)) > 0)
-  {
-    buf_str[buf_read] = '\0';
-    total_read += buf_read;
-    strcat(buffer,buf_str);
-
-    buf_len = buffer_length - total_read - 1;
-    if (buf_len+1 > buffer_length)
-      buf_len = buffer_length -1;
-
-    if (strcmp((buffer + total_read - strlen(end_str)), end_str) == 0)
-      break;
-    //different line-end symbol in different OS
-    if (strcmp(end_str,"\r") == 0)
+  strcpy (buffer, "");
+  while ((buf_read = recv (socket, buf_str, buf_len, 0)) > 0)
     {
-      if (strcmp((buffer + total_read - 2), "\r\n") == 0)
-        break;
+      buf_str[buf_read] = '\0';
+      total_read += buf_read;
+      strcat (buffer, buf_str);
+
+      buf_len = buffer_length - total_read - 1;
+      if (buf_len + 1 > buffer_length)
+	buf_len = buffer_length - 1;
+
+      if (strcmp ((buffer + total_read - strlen (end_str)), end_str) == 0)
+	break;
+      //different line-end symbol in different OS
+      if (strcmp (end_str, "\r") == 0)
+	{
+	  if (strcmp ((buffer + total_read - 2), "\r\n") == 0)
+	    break;
+	}
     }
-  }
 
   return total_read;
 }
 
 int
-s_send(int socket, const char* in_str)
+s_send (int socket, const char *in_str)
 {
   int ret;
 
-  if (in_str != NULL && strlen(in_str) > 0)
-  {
-    ret = send(socket, in_str, strlen(in_str), 0);
-  }
-  
+  if (in_str != NULL && strlen (in_str) > 0)
+    {
+      ret = send (socket, in_str, strlen (in_str), 0);
+    }
+
   return ret;
 }