Merged rev 215 changes from /branches/xscale-ixp-be into trunk:

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

diff --git a/src/server/server.c b/src/server/server.c
index 951be45053b4159764affb5985a50da7863f3318..98b1fb1d4a95c0a4fbb4a06224146f611825ab85 100644 (file)
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -301,7 +301,7 @@ int server_loop(command_context_t *command_context)
                                FD_ZERO(&read_fds);
                        else
                        {
-                               ERROR("error during select: %d", strerror(errno));
+                               ERROR("error during select: %s", strerror(errno));
                                exit(-1);
                        }
 #else
@@ -323,13 +323,6 @@ int server_loop(command_context_t *command_context)
                        /* do regular tasks after at most 100ms */
                        tv.tv_sec = 0;
                        tv.tv_usec = 10000;
-                               
-#if 0
-                       if (shutdown_openocd)
-                               return ERROR_COMMAND_CLOSE_CONNECTION;
-                       
-                       handle_target();
-#endif
                }
                
                for (service = services; service; service = service->next)
@@ -382,6 +375,13 @@ int server_loop(command_context_t *command_context)
                                shutdown_openocd = 1;
                        }
                }
+#else
+               MSG msg;
+               while (PeekMessage(&msg,NULL,0,0,PM_REMOVE))
+               {
+                       if (msg.message == WM_QUIT)
+                               shutdown_openocd = 1;
+               }
 #endif
        }
        
@@ -394,6 +394,10 @@ BOOL WINAPI ControlHandler(DWORD dwCtrlType)
     shutdown_openocd = 1;
     return TRUE;
 }
+
+void sig_handler(int sig) {
+    shutdown_openocd = 1;
+}
 #endif
 
 int server_init()
@@ -411,6 +415,11 @@ int server_init()
        }
 
        SetConsoleCtrlHandler( ControlHandler, TRUE );
+
+       signal(SIGINT, sig_handler);
+       signal(SIGTERM, sig_handler);
+       signal(SIGBREAK, sig_handler);
+       signal(SIGABRT, sig_handler);
 #endif