Michael Bruck:

[openocd.git] / src / server / server.c

diff --git a/src/server/server.c b/src/server/server.c
index b0ad834ab6b15b79842455f008100a9c8db15e2f..4e8ddc692e6b861f204d43d7680487880e157607 100644 (file)
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -88,7 +88,7 @@ int remove_connection(service_t *service, connection_t *connection)
        connection_t *c;
        
        /* find connection */
-       while(c = *p)
+       while((c = *p))
        {               
                if (c->fd == connection->fd)
                {       
@@ -166,11 +166,11 @@ int add_service(char *name, enum connection_type type, unsigned short port, int
 
 int remove_service(unsigned short port)
 {
-       service_t **p = services;
+       service_t **p = &services;
        service_t *c;
        
        /* find service */
-       while(c = *p)
+       while((c = *p))
        {               
                if (c->port == port)
                {       
@@ -277,7 +277,9 @@ int server_loop(command_context_t *command_context)
                FD_SET(fileno(stdin), &read_fds);
 #endif
 
-               if ((retval = select(fd_max + 1, &read_fds, NULL, NULL, &tv)) == -1)
+               retval = select(fd_max + 1, &read_fds, NULL, NULL, &tv);
+               
+               if (retval == -1)
                {
 #ifdef _WIN32
 
@@ -293,7 +295,9 @@ int server_loop(command_context_t *command_context)
 #else
 
                        if (errno == EINTR)
+                       {
                                FD_ZERO(&read_fds);
+                       }
                        else
                        {
                                ERROR("error during select: %s", strerror(errno));
@@ -309,6 +313,7 @@ int server_loop(command_context_t *command_context)
                        /* do regular tasks after at most 100ms */
                        tv.tv_sec = 0;
                        tv.tv_usec = 10000;
+                       FD_ZERO(&read_fds); /* eCos leaves read_fds unchanged in this case!  */
                }
                
                for (service = services; service; service = service->next)
@@ -318,7 +323,9 @@ int server_loop(command_context_t *command_context)
                                && (FD_ISSET(service->fd, &read_fds))) 
                        {
                                if (service->max_connections > 0)
+                               {
                                        add_connection(service, command_context);
+                               }
                                else
                                {
                                        struct sockaddr_in sin;