httpd: fix warnings, more robust error handling, improved MIME handling

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

diff --git a/src/server/server.c b/src/server/server.c
index d2596112151058082132d82a6784114406b917f0..05018694bc375ecf433cc33a4b94c415681ab3c8 100644 (file)
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -41,7 +41,6 @@ service_t *services = NULL;
 
 /* shutdown_openocd == 1: exit the main event loop, and quit the debugger */
 static int shutdown_openocd = 0;
-int handle_shutdown_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 
 /* set when using pipes rather than tcp */
 int server_use_pipes = 0;
@@ -534,18 +533,41 @@ int server_quit(void)
        return ERROR_OK;
 }
 
+/* tell the server we want to shut down */
+static int handle_shutdown_command(struct command_context_s *cmd_ctx,
+               char *cmd, char **args, int argc)
+{
+       shutdown_openocd = 1;
+
+       return ERROR_COMMAND_CLOSE_CONNECTION;
+}
+
 int server_register_commands(command_context_t *context)
 {
-       register_command(context, NULL, "shutdown", handle_shutdown_command,
-                                        COMMAND_ANY, "shut the server down");
+       register_command(context, NULL, "shutdown",
+                       handle_shutdown_command, COMMAND_ANY,
+                       "shut the server down");
 
        return ERROR_OK;
 }
 
-/* tell the server we want to shut down */
-int handle_shutdown_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
-{
-       shutdown_openocd = 1;
 
-       return ERROR_COMMAND_CLOSE_CONNECTION;
+int server_port_command(struct command_context_s *cmd_ctx,
+               char *cmd, char **args, int argc, unsigned short *out)
+{
+       switch (argc) {
+       case 0:
+               command_print(cmd_ctx, "%d", *out);
+               break;
+       case 1:
+       {
+               uint16_t port;
+               COMMAND_PARSE_NUMBER(u16, args[0], port);
+               *out = port;
+               break;
+       }
+       default:
+               return ERROR_INVALID_ARGUMENTS;
+       }
+       return ERROR_OK;
 }