checking in version 0.38test5.

Oops, I realize I forgot some more nice files, will add them and re-commit.

svn path=/trunk/; revision=2010

1 files changed, 119 insertions, 120 deletions

diff --git a/pd/src/u_pdreceive.c b/pd/src/u_pdreceive.c
index ad71f506..1feac305 100644
--- a/pd/src/u_pdreceive.c
+++ b/pd/src/u_pdreceive.c
@@ -11,15 +11,16 @@ standard output. */
 #include <stdio.h>
 #include <errno.h>
 #include <stdlib.h>
-#ifdef UNIX
-#include <sys/time.h>
-#include <unistd.h>
+#ifdef MSW
+#include <winsock.h>
+#else
 #include <sys/socket.h>
 #include <netinet/in.h>
+#include <netinet/tcp.h>
 #include <netdb.h>
+#include <stdio.h>
+#include <unistd.h>
 #define SOCKET_ERROR -1
-#else
-#include <winsock.h>
 #endif
 
 typedef struct _fdpoll
@@ -52,14 +53,14 @@ int main(int argc, char **argv)
     WSADATA nobby;
 #endif
     if (argc < 2 || sscanf(argv[1], "%d", &portno) < 1 || portno <= 0)
-    	goto usage;
+        goto usage;
     if (argc >= 3)
     {
-    	if (!strcmp(argv[2], "tcp"))
-	    protocol = SOCK_STREAM;
-	else if (!strcmp(argv[2], "udp"))
-	    protocol = SOCK_DGRAM;
-	else goto usage;
+        if (!strcmp(argv[2], "tcp"))
+            protocol = SOCK_STREAM;
+        else if (!strcmp(argv[2], "udp"))
+            protocol = SOCK_DGRAM;
+        else goto usage;
     }
     else protocol = SOCK_STREAM;
 #ifdef MSW
@@ -68,42 +69,42 @@ int main(int argc, char **argv)
     sockfd = socket(AF_INET, protocol, 0);
     if (sockfd < 0)
     {
-    	sockerror("socket()");
-    	exit(1);
+        sockerror("socket()");
+        exit(1);
     }
     maxfd = sockfd + 1;
     server.sin_family = AF_INET;
     server.sin_addr.s_addr = INADDR_ANY;
 
 #ifdef IRIX
-    	/* this seems to work only in IRIX but is unnecessary in
-	Linux.  Not sure what MSW needs in place of this. */
+        /* this seems to work only in IRIX but is unnecessary in
+        Linux.  Not sure what MSW needs in place of this. */
     if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, 0, 0) < 0)
-    	post("setsockopt failed\n");
+        fprintf(stderr, "setsockopt failed\n");
 #endif
 
-    	/* assign client port number */
+        /* assign client port number */
     server.sin_port = htons((unsigned short)portno);
 
-    	/* name the socket */
+        /* name the socket */
     if (bind(sockfd, (struct sockaddr *)&server, sizeof(server)) < 0)
     {
-    	sockerror("bind");
-	x_closesocket(sockfd);
-    	return (0);
+        sockerror("bind");
+        x_closesocket(sockfd);
+        return (0);
     }
     if (protocol == SOCK_STREAM)
     {
-	if (listen(sockfd, 5) < 0)
-	{
-    	    sockerror("listen");
-    	    x_closesocket(sockfd);
-	    exit(1);
-	}
+        if (listen(sockfd, 5) < 0)
+        {
+            sockerror("listen");
+            x_closesocket(sockfd);
+            exit(1);
+        }
     }
-    	/* now loop forever selecting on sockets */
+        /* now loop forever selecting on sockets */
     while (1)
-    	dopoll();
+        dopoll();
 
 usage:
     fprintf(stderr, "usage: pdreceive <portnumber> [udp|tcp]\n");
@@ -116,7 +117,7 @@ static void addport(int fd)
     int nfd = nfdpoll;
     t_fdpoll *fp;
     fdpoll = (t_fdpoll *)realloc(fdpoll,
-    	(nfdpoll+1) * sizeof(t_fdpoll));
+        (nfdpoll+1) * sizeof(t_fdpoll));
     fp = fdpoll + nfdpoll;
     fp->fdp_fd = fd;
     nfdpoll++;
@@ -124,8 +125,8 @@ static void addport(int fd)
     fp->fdp_inhead = fp->fdp_intail = 0;
     if (!(fp->fdp_inbuf = malloc(BUFSIZE)))
     {
-    	fprintf(stderr, "out of memory");
-	exit(1);
+        fprintf(stderr, "out of memory");
+        exit(1);
     }
     printf("number_connected %d;\n", nfdpoll);
 }
@@ -137,21 +138,21 @@ static void rmport(t_fdpoll *x)
     t_fdpoll *fp;
     for (i = nfdpoll, fp = fdpoll; i--; fp++)
     {
-    	if (fp == x)
-    	{
-	    x_closesocket(fp->fdp_fd);
-    	    free(fp->fdp_inbuf);
-    	    while (i--)
-    	    {
-    	    	fp[0] = fp[1];
-    	    	fp++;
-    	    }
-	    fdpoll = (t_fdpoll *)realloc(fdpoll,
-    		(nfdpoll-1) * sizeof(t_fdpoll));
-	    nfdpoll--;
-    	    printf("number_connected %d;\n", nfdpoll);
-	    return;
-    	}
+        if (fp == x)
+        {
+            x_closesocket(fp->fdp_fd);
+            free(fp->fdp_inbuf);
+            while (i--)
+            {
+                fp[0] = fp[1];
+                fp++;
+            }
+            fdpoll = (t_fdpoll *)realloc(fdpoll,
+                (nfdpoll-1) * sizeof(t_fdpoll));
+            nfdpoll--;
+            printf("number_connected %d;\n", nfdpoll);
+            return;
+        }
     }
     fprintf(stderr, "warning: item removed from poll list but not found");
 }
@@ -160,7 +161,7 @@ static void doconnect(void)
 {
     int fd = accept(sockfd, 0, 0);
     if (fd < 0)
-    	perror("accept");
+        perror("accept");
     else addport(fd);
 }
 
@@ -170,22 +171,22 @@ static void udpread(void)
     int ret = recv(sockfd, buf, BUFSIZE, 0);
     if (ret < 0)
     {
-	sockerror("recv (udp)");
-	x_closesocket(sockfd);
-	exit(1);
+        sockerror("recv (udp)");
+        x_closesocket(sockfd);
+        exit(1);
     }
     else if (ret > 0)
     {
-#ifdef UNIX
-    	if (write(1, buf, ret) < ret)
-	{
-	    perror("write");
-	    exit(1);
-	}
+#ifdef MSW
+        int j;
+        for (j = 0; j < ret; j++)
+            putchar(buf[j]);
 #else
-	int j;
-	for (j = 0; j < ret; j++)
-	    putchar(buf[j]);
+        if (write(1, buf, ret) < ret)
+        {
+            perror("write");
+            exit(1);
+        }
 #endif
     }
 }
@@ -198,30 +199,30 @@ static int tcpmakeoutput(t_fdpoll *x)
     int intail = x->fdp_intail;
     char *inbuf = x->fdp_inbuf;
     if (intail == inhead)
-    	return (0);
+        return (0);
     for (indx = intail; indx != inhead; indx = (indx+1)&(BUFSIZE-1))
     {
-    	    /* search for a semicolon.   */
-    	char c = *bp++ = inbuf[indx];
-    	if (c == ';')
-    	{
-    	    intail = (indx+1)&(BUFSIZE-1);
-	    if (inbuf[intail] == '\n')
-	    	intail = (intail+1)&(BUFSIZE-1);
-	    *bp++ = '\n';
-#ifdef UNIX
-	    write(1, messbuf, bp - messbuf);
+            /* search for a semicolon.   */
+        char c = *bp++ = inbuf[indx];
+        if (c == ';')
+        {
+            intail = (indx+1)&(BUFSIZE-1);
+            if (inbuf[intail] == '\n')
+                intail = (intail+1)&(BUFSIZE-1);
+            *bp++ = '\n';
+#ifdef MSW
+            {
+                int j;
+                for (j = 0; j < bp - messbuf; j++)
+                    putchar(messbuf[j]);
+            }
 #else
-	    {
-	    	int j;
-		for (j = 0; j < bp - messbuf; j++)
-		    putchar(messbuf[j]);
-	    }
+            write(1, messbuf, bp - messbuf);
 #endif
-	    x->fdp_inhead = inhead;
-    	    x->fdp_intail = intail;
-    	    return (1);
-    	}
+            x->fdp_inhead = inhead;
+            x->fdp_intail = intail;
+            return (1);
+        }
     }
     return (0);
 }
@@ -229,35 +230,35 @@ static int tcpmakeoutput(t_fdpoll *x)
 static void tcpread(t_fdpoll *x)
 {
     int readto =
-	(x->fdp_inhead >= x->fdp_intail ? BUFSIZE : x->fdp_intail-1);
+        (x->fdp_inhead >= x->fdp_intail ? BUFSIZE : x->fdp_intail-1);
     int ret;
 
-    	/* the input buffer might be full.  If so, drop the whole thing */
+        /* the input buffer might be full.  If so, drop the whole thing */
     if (readto == x->fdp_inhead)
     {
-    	fprintf(stderr, "pd: dropped message from gui\n");
-    	x->fdp_inhead = x->fdp_intail = 0;
-    	readto = BUFSIZE;
+        fprintf(stderr, "pd: dropped message from gui\n");
+        x->fdp_inhead = x->fdp_intail = 0;
+        readto = BUFSIZE;
     }
     else
     {
-	ret = recv(x->fdp_fd, x->fdp_inbuf + x->fdp_inhead,
-	    readto - x->fdp_inhead, 0);
-	if (ret < 0)
-	{
-	    sockerror("recv (tcp)");
-	    rmport(x);
-	}
-	else if (ret == 0)
-	     rmport(x);
-	else
-	{
-    	    x->fdp_inhead += ret;
-    	    if (x->fdp_inhead >= BUFSIZE)
-	    	x->fdp_inhead = 0;
-    	    while (tcpmakeoutput(x))
-	    	;
-	}
+        ret = recv(x->fdp_fd, x->fdp_inbuf + x->fdp_inhead,
+            readto - x->fdp_inhead, 0);
+        if (ret < 0)
+        {
+            sockerror("recv (tcp)");
+            rmport(x);
+        }
+        else if (ret == 0)
+             rmport(x);
+        else
+        {
+            x->fdp_inhead += ret;
+            if (x->fdp_inhead >= BUFSIZE)
+                x->fdp_inhead = 0;
+            while (tcpmakeoutput(x))
+                ;
+        }
     }
 }
 
@@ -273,26 +274,26 @@ static void dopoll(void)
     FD_SET(sockfd, &readset);
     if (protocol == SOCK_STREAM)
     {
-    	for (fp = fdpoll, i = nfdpoll; i--; fp++)
-    	    FD_SET(fp->fdp_fd, &readset);
+        for (fp = fdpoll, i = nfdpoll; i--; fp++)
+            FD_SET(fp->fdp_fd, &readset);
     }
     if (select(maxfd+1, &readset, &writeset, &exceptset, 0) < 0)
     {
-    	perror("select");
-	exit(1);
+        perror("select");
+        exit(1);
     }
     if (protocol == SOCK_STREAM)
     {
-	for (i = 0; i < nfdpoll; i++)
-    	    if (FD_ISSET(fdpoll[i].fdp_fd, &readset))
-    	    	tcpread(&fdpoll[i]);
-    	if (FD_ISSET(sockfd, &readset))
-	    doconnect();
+        for (i = 0; i < nfdpoll; i++)
+            if (FD_ISSET(fdpoll[i].fdp_fd, &readset))
+                tcpread(&fdpoll[i]);
+        if (FD_ISSET(sockfd, &readset))
+            doconnect();
     }
     else
     {
-    	if (FD_ISSET(sockfd, &readset))
-    	    udpread();
+        if (FD_ISSET(sockfd, &readset))
+            udpread();
     }
 }
 
@@ -304,11 +305,10 @@ static void sockerror(char *s)
     if (err == 10054) return;
     else if (err == 10044)
     {
-    	fprintf(stderr,
-	    "Warning: you might not have TCP/IP \"networking\" turned on\n");
+        fprintf(stderr,
+            "Warning: you might not have TCP/IP \"networking\" turned on\n");
     }
-#endif
-#ifdef UNIX
+#else
     int err = errno;
 #endif
     fprintf(stderr, "%s: %s (%d)\n", s, strerror(err), err);
@@ -316,10 +316,9 @@ static void sockerror(char *s)
 
 static void x_closesocket(int fd)
 {
-#ifdef UNIX
-    close(fd);
-#endif
 #ifdef MSW
     closesocket(fd);
+#else
+    close(fd);
 #endif
 }