* wildmat.c, braindamage.c: added

[citadel.git] / webcit / tcp_sockets.c

diff --git a/webcit/tcp_sockets.c b/webcit/tcp_sockets.c
index 017e1ea73e70b0e5c85e36f4a84e2aa7e602a6cd..bafeea9b5bef56578c1e0105764f50586037dfdd 100644 (file)
--- a/webcit/tcp_sockets.c
+++ b/webcit/tcp_sockets.c
@@ -32,10 +32,11 @@ extern int errno;
 int serv_sock;
 
 
-RETSIGTYPE timeout(int signum) {
+RETSIGTYPE timeout(int signum)
+{
        fprintf(stderr, "Connection timed out.\n");
        exit(3);
-       }
+}
 
 int connectsock(char *host, char *service, char *protocol)
 {
@@ -43,62 +44,54 @@ int connectsock(char *host, char *service, char *protocol)
        struct servent *pse;
        struct protoent *ppe;
        struct sockaddr_in sin;
-       int s,type;
+       int s, type;
 
-       bzero((char *)&sin,sizeof(sin));
+       bzero((char *) &sin, sizeof(sin));
        sin.sin_family = AF_INET;
 
-       pse=getservbyname(service,protocol);
+       pse = getservbyname(service, protocol);
        if (pse) {
                sin.sin_port = pse->s_port;
-               }
-       else if ((sin.sin_port = htons((u_short)atoi(service))) == 0) {
+       } else if ((sin.sin_port = htons((u_short) atoi(service))) == 0) {
                fprintf(stderr, "Can't get %s service entry\n", service);
-               return(-1);
-               }
-       
-       phe=gethostbyname(host);
+               return (-1);
+       }
+       phe = gethostbyname(host);
        if (phe) {
-               bcopy(phe->h_addr,(char *)&sin.sin_addr,phe->h_length);
-               }
-       else if ((sin.sin_addr.s_addr = inet_addr(host))==INADDR_NONE) {
+               bcopy(phe->h_addr, (char *) &sin.sin_addr, phe->h_length);
+       } else if ((sin.sin_addr.s_addr = inet_addr(host)) == INADDR_NONE) {
                fprintf(stderr, "Can't get %s host entry: %s\n",
-                       host,strerror(errno));
-               return(-1);
-               }
-
-       if ((ppe=getprotobyname(protocol))==0) {
+                       host, strerror(errno));
+               return (-1);
+       }
+       if ((ppe = getprotobyname(protocol)) == 0) {
                fprintf(stderr, "Can't get %s protocol entry: %s\n",
-                       protocol,strerror(errno));
-               return(-1);
-               }
-
-       if (!strcmp(protocol,"udp"))
+                       protocol, strerror(errno));
+               return (-1);
+       }
+       if (!strcmp(protocol, "udp"))
                type = SOCK_DGRAM;
        else
                type = SOCK_STREAM;
 
-       s = socket(PF_INET,type,ppe->p_proto);
-       if (s<0) {
+       s = socket(PF_INET, type, ppe->p_proto);
+       if (s < 0) {
                fprintf(stderr, "Can't create socket: %s\n", strerror(errno));
-               return(-1);
-               }
-
-
-       signal(SIGALRM,timeout);
+               return (-1);
+       }
+       signal(SIGALRM, timeout);
        alarm(30);
 
-       if (connect(s,(struct sockaddr *)&sin,sizeof(sin))<0) {
-               fprintf(stderr,"can't connect to %s.%s: %s\n",
-                       host,service,strerror(errno));
-               return(-1);
-               }
-
+       if (connect(s, (struct sockaddr *) &sin, sizeof(sin)) < 0) {
+               fprintf(stderr, "can't connect to %s.%s: %s\n",
+                       host, service, strerror(errno));
+               return (-1);
+       }
        alarm(0);
-       signal(SIGALRM,SIG_IGN);
+       signal(SIGALRM, SIG_IGN);
 
-       return(s);
-       }
+       return (s);
+}
 
 
 
@@ -108,21 +101,21 @@ int connectsock(char *host, char *service, char *protocol)
  */
 void serv_read(char *buf, int bytes)
 {
-        int len,rlen;
+       int len, rlen;
 
-        len = 0;
-        while(len<bytes) {
-                rlen = read(serv_sock,&buf[len],bytes-len);
-                if (rlen<1) {
-                        fprintf(stderr, "Server connection broken: %s\n",
+       len = 0;
+       while (len < bytes) {
+               rlen = read(serv_sock, &buf[len], bytes - len);
+               if (rlen < 1) {
+                       fprintf(stderr, "Server connection broken: %s\n",
                                strerror(errno));
-                        connected = 0;
+                       connected = 0;
                        logged_in = 0;
                        return;
-                        }
-                len = len + rlen;
-                }
-        }
+               }
+               len = len + rlen;
+       }
+}
 
 
 /*
@@ -130,19 +123,19 @@ void serv_read(char *buf, int bytes)
  */
 void serv_gets(char *strbuf)
 {
-       int ch,len;
+       int ch, len;
        char buf[2];
 
        len = 0;
-       strcpy(strbuf,"");
+       strcpy(strbuf, "");
        do {
                serv_read(&buf[0], 1);
                ch = buf[0];
                strbuf[len++] = ch;
-               } while((ch!=10)&&(ch!=13)&&(ch!=0)&&(len<255));
-       strbuf[len-1] = 0;
+       } while ((ch != 10) && (ch != 13) && (ch != 0) && (len < 255));
+       strbuf[len - 1] = 0;
        /* fprintf(stderr, ">%s\n", strbuf); */
-       }
+}
 
 
 
@@ -151,21 +144,21 @@ void serv_gets(char *strbuf)
  */
 void serv_write(char *buf, int nbytes)
 {
-        int bytes_written = 0;
-        int retval;
-        while (bytes_written < nbytes) {
-                retval = write(serv_sock, &buf[bytes_written],
-                        nbytes - bytes_written);
-                if (retval < 1) {
-                        fprintf(stderr, "Server connection broken: %s\n",
+       int bytes_written = 0;
+       int retval;
+       while (bytes_written < nbytes) {
+               retval = write(serv_sock, &buf[bytes_written],
+                              nbytes - bytes_written);
+               if (retval < 1) {
+                       fprintf(stderr, "Server connection broken: %s\n",
                                strerror(errno));
-                        connected = 0;
+                       connected = 0;
                        logged_in = 0;
                        return;
-                        }
-                bytes_written = bytes_written + retval;
-                }
-        }
+               }
+               bytes_written = bytes_written + retval;
+       }
+}
 
 
 /*
@@ -175,25 +168,24 @@ void serv_puts(char *string)
 {
        char buf[256];
 
-       sprintf(buf,"%s\n", string);
+       sprintf(buf, "%s\n", string);
        serv_write(buf, strlen(buf));
-       }
+}
 
 
 /*
  * convenience function to send stuff to the server
  */
-void serv_printf(const char *format, ...) {   
-        va_list arg_ptr;   
+void serv_printf(const char *format,...)
+{
+       va_list arg_ptr;
        char buf[256];
 
-               va_start(arg_ptr, format);   
-               vsprintf(buf, format, arg_ptr);   
-               va_end(arg_ptr);   
+       va_start(arg_ptr, format);
+       vsprintf(buf, format, arg_ptr);
+       va_end(arg_ptr);
 
        strcat(buf, "\n");
        serv_write(buf, strlen(buf));
        /* fprintf(stderr, "<%s", buf); */
-       }
-
-
+}