Zach Welch <zw@superlucidity.net> fix signed/unsigned comparisons

[fw/openocd] / src / openocd.c

diff --git a/src/openocd.c b/src/openocd.c
index 51e40537781e5e35b9d012519b0f6570c7903b51..084b8a1d05be6361d4ec36d57fac59131ca254ad 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -24,7 +24,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#define OPENOCD_VERSION "Open On-Chip Debugger " VERSION " (" PKGBLDDATE ") svn:" PKGBLDREV
+#define OPENOCD_VERSION "Open On-Chip Debugger " VERSION " (" PKGBLDDATE ") "RELSTR PKGBLDREV
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -35,6 +35,7 @@
 #include "jtag.h"
 #include "configuration.h"
 #include "xsvf.h"
+#include "svf.h"
 #include "target.h"
 #include "flash.h"
 #include "nand.h"
@@ -56,14 +57,6 @@
 #include <unistd.h>
 #include <errno.h>
 
-#ifdef _WIN32
-#include <malloc.h>
-#else
-#include <alloca.h>
-#endif
-
-#include "replacements.h"
-
 void print_version(void)
 {
        /* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
@@ -71,7 +64,7 @@ void print_version(void)
        /* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
        /* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
        /* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
-       LOG_OUTPUT( "$URL$\n");
+       LOG_OUTPUT("$URL$\n");
        /* DANGER!!! make sure that the line above does not appear in a patch, do not remove */
        /* DANGER!!! make sure that the line above does not appear in a patch, do not remove */
        /* DANGER!!! make sure that the line above does not appear in a patch, do not remove */
@@ -79,17 +72,12 @@ void print_version(void)
        /* DANGER!!! make sure that the line above does not appear in a patch, do not remove */
 }
 
-
-
-
-
-
-
-
-
 /* Give TELNET a way to find out what version this is */
 int handle_version_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
+       if (argc!=0)
+               return ERROR_COMMAND_SYNTAX_ERROR;
+
        command_print(cmd_ctx, OPENOCD_VERSION);
 
        return ERROR_OK;
@@ -126,9 +114,15 @@ static int log_target_callback_event_handler(struct target_s *target, enum targe
        return ERROR_OK;
 }
 
+int ioutil_init(struct command_context_s *cmd_ctx);
+
 /* OpenOCD can't really handle failure of this command. Patches welcome! :-) */
 int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
+
+       if (argc!=0)
+               return ERROR_COMMAND_SYNTAX_ERROR;
+
        int retval;
        static int initialized=0;
        if (initialized)
@@ -208,6 +202,7 @@ command_context_t *setup_command_handler(void)
        log_register_commands(cmd_ctx);
        jtag_register_commands(cmd_ctx);
        xsvf_register_commands(cmd_ctx);
+       svf_register_commands(cmd_ctx);
        target_register_commands(cmd_ctx);
        flash_register_commands(cmd_ctx);
        nand_register_commands(cmd_ctx);
@@ -228,6 +223,9 @@ command_context_t *setup_command_handler(void)
        return cmd_ctx;
 }
 
+int httpd_start(void);
+void httpd_stop(void);
+
 /* normally this is the main() function entry, but if OpenOCD is linked
  * into application, then this fn will not be invoked, but rather that
  * application will have it's own implementation of main(). */
@@ -240,7 +238,14 @@ int openocd_main(int argc, char *argv[])
 
        cmd_ctx = setup_command_handler();
 
-       LOG_OUTPUT( "\n\nBUGS? Read http://svn.berlios.de/svnroot/repos/openocd/trunk/BUGS\n\n\n");
+#if BUILD_IOUTIL
+       if (ioutil_init(cmd_ctx) != ERROR_OK)
+       {
+               return EXIT_FAILURE;
+       }
+#endif
+
+       LOG_OUTPUT("\n\nBUGS? Read http://svn.berlios.de/svnroot/repos/openocd/trunk/BUGS\n\n\n");
 
        print_version();
 
@@ -254,6 +259,11 @@ int openocd_main(int argc, char *argv[])
        if ( (ret != ERROR_OK) && (ret != ERROR_COMMAND_CLOSE_CONNECTION) )
                return EXIT_FAILURE;
 
+#if BUILD_HTTPD
+       if (httpd_start()!=ERROR_OK)
+               return EXIT_FAILURE;
+#endif
+
        if (ret != ERROR_COMMAND_CLOSE_CONNECTION)
        {
                command_context_mode(cmd_ctx, COMMAND_EXEC);
@@ -267,10 +277,15 @@ int openocd_main(int argc, char *argv[])
        /* shut server down */
        server_quit();
 
+#if BUILD_HTTPD
+       httpd_stop();
+#endif
+
        unregister_all_commands(cmd_ctx);
 
        /* free commandline interface */
        command_done(cmd_ctx);
 
+
        return EXIT_SUCCESS;
 }