Index: /trunk/Ohana/src/libkapa/src/KapaOpen.c
===================================================================
--- /trunk/Ohana/src/libkapa/src/KapaOpen.c	(revision 27987)
+++ /trunk/Ohana/src/libkapa/src/KapaOpen.c	(revision 27988)
@@ -31,8 +31,8 @@
   if (status == -1) {
     if (errno == EADDRINUSE) {
-	close (InitSocket);
-	Address[0].sin_port ++;
-	if (Address[0].sin_port > MY_PORT_MAX) exit (2);
-	goto retry_server;
+        close (InitSocket);
+        Address[0].sin_port ++;
+        if (Address[0].sin_port > MY_PORT_MAX) exit (2);
+        goto retry_server;
     }
     perror ("bind: ");
@@ -69,4 +69,5 @@
 
   /* do I need to clear rfds on each pass? */
+  FD_ZERO(&rfds);
   FD_SET (InitSocket, &rfds);
   status = select (InitSocket + 1, &rfds, NULL, NULL, &wait);
@@ -98,7 +99,7 @@
 
   for (i = 0; i < Nvalid; i++) {
-    /* valid IP addresses may be machines (120.90.121.142) or 
+    /* valid IP addresses may be machines (120.90.121.142) or
        class C networks (120.90.121.0) */
-       
+
     /* for machine, address must match */
     if ((0xff & (VALID[i] >> 24)) != 0) {
@@ -138,8 +139,8 @@
   test = TRUE;
   test &= (status == 4);
-  test &= ((ip1 > 0) && (ip1 < 256)); 
-  test &= ((ip2 > 0) && (ip2 < 256)); 
-  test &= ((ip3 > 0) && (ip3 < 256)); 
-  test &= ((ip4 >=0) && (ip4 < 256)); 
+  test &= ((ip1 > 0) && (ip1 < 256));
+  test &= ((ip2 > 0) && (ip2 < 256));
+  test &= ((ip3 > 0) && (ip3 < 256));
+  test &= ((ip4 >=0) && (ip4 < 256));
   if (!test) {
     fprintf (stderr, "invalid IP address %s\n", string);
@@ -205,5 +206,5 @@
 
   // the client uses a BLOCKing socket by default
-  fcntl (InitSocket, F_SETFL, !O_NONBLOCK); 
+  fcntl (InitSocket, F_SETFL, !O_NONBLOCK);
   return (InitSocket);
 }
@@ -211,5 +212,5 @@
 int KapaOpen (char *kapa_exec, char *kapa_name) {
 
-  // kapa_exec may be kapa://host, in which case we attempt to connect to an 
+  // kapa_exec may be kapa://host, in which case we attempt to connect to an
   // already running kapa, or the program path, in which case we are supposed
   // to launch it locally, then connect to it.
@@ -265,10 +266,10 @@
   unlink (socket_name);
 
-  strcpy (Address.sun_path, socket_name); 
-  Address.sun_family = AF_UNIX; 
-  InitSocket = socket (AF_UNIX, SOCK_STREAM, 0); 
+  strcpy (Address.sun_path, socket_name);
+  Address.sun_family = AF_UNIX;
+  InitSocket = socket (AF_UNIX, SOCK_STREAM, 0);
   status = bind (InitSocket, (struct sockaddr *) &Address, sizeof (Address));
   status = listen (InitSocket, 1);
-  
+
   if (name == NULL) {
     sprintf (temp, "%s -socket %s &", kapa_exec, socket_name);
@@ -282,5 +283,5 @@
 
   AddressLength =  sizeof (Address);
-  fcntl (InitSocket, F_SETFL, O_NONBLOCK); 
+  fcntl (InitSocket, F_SETFL, O_NONBLOCK);
 
 # define NTRY 500
@@ -297,5 +298,5 @@
 
   // the client uses a BLOCKing socket by default
-  fcntl (fd, F_SETFL, !O_NONBLOCK); 
+  fcntl (fd, F_SETFL, !O_NONBLOCK);
   return (fd);
 }
@@ -317,5 +318,5 @@
 
   // the server uses an unblocked socket
-  fcntl (sock, F_SETFL, O_NONBLOCK);  
+  fcntl (sock, F_SETFL, O_NONBLOCK);
   unlink (sockpath);
   return (sock);