Andreas Fritiofson <andreas.fritiofson@gmail.com> UTF8 fixes

[openocd.git] / src / helper / command.c

diff --git a/src/helper/command.c b/src/helper/command.c
index e83910541180c886ab59641b4a8aa0c697a65e81..2737a7b23f7d26f2ce43a9d37a6c37bdb185d126 100644 (file)
--- a/src/helper/command.c
+++ b/src/helper/command.c
@@ -2,7 +2,7 @@
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *

- *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                 *

  *   oyvind.harboe@zylin.com                                               *
  *                                                                         *
  *   Copyright (C) 2008, Duane Ellis                                       *
  *   oyvind.harboe@zylin.com                                               *
  *                                                                         *
  *   Copyright (C) 2008, Duane Ellis                                       *


@@ -54,7 +54,7 @@ int run_command(command_context_t *context, command_t *c, char *words[], int num
 
 static void tcl_output(void *privData, const char *file, int line, const char *function, const char *string)
 {
 
 static void tcl_output(void *privData, const char *file, int line, const char *function, const char *string)
 {

-       Jim_Obj *tclOutput=(Jim_Obj *)privData;
+       Jim_Obj *tclOutput = (Jim_Obj *)privData;

 
        Jim_AppendString(interp, tclOutput, string, strlen(string));
 }
 
        Jim_AppendString(interp, tclOutput, string, strlen(string));
 }


@@ -108,7 +108,7 @@ static int script_command(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
        for (i = 0; i < argc; i++)
        {
                int len;
        for (i = 0; i < argc; i++)
        {
                int len;

-               const char *w=Jim_GetString(argv[i], &len);
+               const char *w = Jim_GetString(argv[i], &len);

                if (*w=='#')
                {
                        /* hit an end of line comment */
                if (*w=='#')
                {
                        /* hit an end of line comment */


@@ -228,26 +228,26 @@ command_t* register_command(command_context_t *context, command_t *parent, char
        /* maximum of two levels :-) */
        if (c->parent != NULL)
        {
        /* maximum of two levels :-) */
        if (c->parent != NULL)
        {

-               t1=c->parent->name;
+               t1 = c->parent->name;

                t2="_";
        }
                t2="_";
        }

-       t3=c->name;
-       const char *full_name=alloc_printf("ocd_%s%s%s", t1, t2, t3);
+       t3 = c->name;
+       const char *full_name = alloc_printf("ocd_%s%s%s", t1, t2, t3);

        Jim_CreateCommand(interp, full_name, script_command, c, NULL);
        free((void *)full_name);
 
        /* we now need to add an overrideable proc */
        Jim_CreateCommand(interp, full_name, script_command, c, NULL);
        free((void *)full_name);
 
        /* we now need to add an overrideable proc */

-       const char *override_name=alloc_printf("proc %s%s%s {args} {if {[catch {eval ocd_%s%s%s $args}]==0} {return \"\"} else { return -code error }", t1, t2, t3, t1, t2, t3);
-       Jim_Eval_Named(interp, override_name, __THIS__FILE__, __LINE__ );
+       const char *override_name = alloc_printf("proc %s%s%s {args} {if {[catch {eval ocd_%s%s%s $args}]==0} {return \"\"} else { return -code error }", t1, t2, t3, t1, t2, t3);
+       Jim_Eval_Named(interp, override_name, __THIS__FILE__, __LINE__);

        free((void *)override_name);
 
        /* accumulate help text in Tcl helptext list.  */
        free((void *)override_name);
 
        /* accumulate help text in Tcl helptext list.  */

-       Jim_Obj *helptext=Jim_GetGlobalVariableStr(interp, "ocd_helptext", JIM_ERRMSG);
+       Jim_Obj *helptext = Jim_GetGlobalVariableStr(interp, "ocd_helptext", JIM_ERRMSG);

        if (Jim_IsShared(helptext))
                helptext = Jim_DuplicateObj(interp, helptext);
        if (Jim_IsShared(helptext))
                helptext = Jim_DuplicateObj(interp, helptext);

-       Jim_Obj *cmd_entry=Jim_NewListObj(interp, NULL, 0);
+       Jim_Obj *cmd_entry = Jim_NewListObj(interp, NULL, 0);

 
 

-       Jim_Obj *cmd_list=Jim_NewListObj(interp, NULL, 0);
+       Jim_Obj *cmd_list = Jim_NewListObj(interp, NULL, 0);

 
        /* maximum of two levels :-) */
        if (c->parent != NULL)
 
        /* maximum of two levels :-) */
        if (c->parent != NULL)


@@ -348,8 +348,8 @@ int unregister_command(command_context_t *context, char *name)
 
 void command_output_text(command_context_t *context, const char *data)
 {
 
 void command_output_text(command_context_t *context, const char *data)
 {

-       if ( context && context->output_handler && data  ){
-               context->output_handler( context, data );
+       if (context && context->output_handler && data) {
+               context->output_handler(context, data);

        }
 }
 
        }
 }
 


@@ -404,8 +404,8 @@ void command_print(command_context_t *context, const char *format, ...)
 
 int run_command(command_context_t *context, command_t *c, char *words[], int num_words)
 {
 
 int run_command(command_context_t *context, command_t *c, char *words[], int num_words)
 {

-       int start_word=0;
-       if (!((context->mode == COMMAND_CONFIG) || (c->mode == COMMAND_ANY) || (c->mode == context->mode) ))
+       int start_word = 0;
+       if (!((context->mode == COMMAND_CONFIG) || (c->mode == COMMAND_ANY) || (c->mode == context->mode)))

        {
                /* Config commands can not run after the config stage */
                LOG_ERROR("Command '%s' only runs during configuration stage", c->name);
        {
                /* Config commands can not run after the config stage */
                LOG_ERROR("Command '%s' only runs during configuration stage", c->name);


@@ -422,10 +422,10 @@ int run_command(command_context_t *context, command_t *c, char *words[], int num
                /* maximum of two levels :-) */
                if (c->parent != NULL)
                {
                /* maximum of two levels :-) */
                if (c->parent != NULL)
                {

-                       t1=c->parent->name;
+                       t1 = c->parent->name;

                        t2=" ";
                }
                        t2=" ";
                }

-               t3=c->name;
+               t3 = c->name;

                command_run_linef(context, "help {%s%s%s}", t1, t2, t3);
        }
        else if (retval == ERROR_COMMAND_CLOSE_CONNECTION)
                command_run_linef(context, "help {%s%s%s}", t1, t2, t3);
        }
        else if (retval == ERROR_COMMAND_CLOSE_CONNECTION)


@@ -450,7 +450,7 @@ int command_run_line(command_context_t *context, char *line)
         * results
         */
        /* run the line thru a script engine */
         * results
         */
        /* run the line thru a script engine */

-       int retval=ERROR_FAIL;
+       int retval = ERROR_FAIL;

        int retcode;
        /* Beware! This code needs to be reentrant. It is also possible
         * for OpenOCD commands to be invoked directly from Tcl. This would
        int retcode;
        /* Beware! This code needs to be reentrant. It is also possible
         * for OpenOCD commands to be invoked directly from Tcl. This would


@@ -466,7 +466,7 @@ int command_run_line(command_context_t *context, char *line)
                retcode = Jim_SetAssocData(interp, "retval", NULL, &retval);
                if (retcode == JIM_OK)
                {
                retcode = Jim_SetAssocData(interp, "retval", NULL, &retval);
                if (retcode == JIM_OK)
                {

-                       retcode = Jim_Eval_Named(interp, line, __THIS__FILE__, __LINE__ );
+                       retcode = Jim_Eval_Named(interp, line, __THIS__FILE__, __LINE__);

 
                        Jim_DeleteAssocData(interp, "retval");
                }
 
                        Jim_DeleteAssocData(interp, "retval");
                }


@@ -492,37 +492,37 @@ int command_run_line(command_context_t *context, char *line)
                int reslen;
 
                result = Jim_GetString(Jim_GetResult(interp), &reslen);
                int reslen;
 
                result = Jim_GetString(Jim_GetResult(interp), &reslen);

-               if (reslen>0)
+               if (reslen > 0)

                {
                        int i;
                {
                        int i;

-                       char buff[256+1];
+                       char buff[256 + 1];

                        for (i = 0; i < reslen; i += 256)
                        {
                                int chunk;
                                chunk = reslen - i;
                                if (chunk > 256)
                                        chunk = 256;
                        for (i = 0; i < reslen; i += 256)
                        {
                                int chunk;
                                chunk = reslen - i;
                                if (chunk > 256)
                                        chunk = 256;

-                               strncpy(buff, result+i, chunk);
+                               strncpy(buff, result + i, chunk);

                                buff[chunk] = 0;
                                LOG_USER_N("%s", buff);
                        }
                        LOG_USER_N("%s", "\n");
                }
                                buff[chunk] = 0;
                                LOG_USER_N("%s", buff);
                        }
                        LOG_USER_N("%s", "\n");
                }

-               retval=ERROR_OK;
+               retval = ERROR_OK;

        }
        return retval;
 }
 
 int command_run_linef(command_context_t *context, const char *format, ...)
 {
        }
        return retval;
 }
 
 int command_run_linef(command_context_t *context, const char *format, ...)
 {

-       int retval=ERROR_FAIL;
+       int retval = ERROR_FAIL;

        char *string;
        va_list ap;
        va_start(ap, format);
        string = alloc_vprintf(format, ap);
        if (string != NULL)
        {
        char *string;
        va_list ap;
        va_start(ap, format);
        string = alloc_vprintf(format, ap);
        if (string != NULL)
        {

-               retval=command_run_line(context, string);
+               retval = command_run_line(context, string);

        }
        va_end(ap);
        return retval;
        }
        va_end(ap);
        return retval;


@@ -599,7 +599,7 @@ static size_t openocd_jim_fwrite(const void *_ptr, size_t size, size_t n, void *
        }
        /* GRR we must chunk - not null terminated */
        while (nbytes) {
        }
        /* GRR we must chunk - not null terminated */
        while (nbytes) {

-               char chunk[128+1];
+               char chunk[128 + 1];

                int x;
 
                x = nbytes;
                int x;
 
                x = nbytes;


@@ -673,7 +673,7 @@ static int jim_capture(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 
        log_add_callback(tcl_output, tclOutput);
 
 
        log_add_callback(tcl_output, tclOutput);
 

-       retcode = Jim_Eval_Named(interp, str, __THIS__FILE__, __LINE__ );
+       retcode = Jim_Eval_Named(interp, str, __THIS__FILE__, __LINE__);

 
        log_remove_callback(tcl_output, tclOutput);
 
 
        log_remove_callback(tcl_output, tclOutput);
 


@@ -704,7 +704,7 @@ command_context_t* command_init()
        Jim_RegisterCoreCommands(interp);
 #endif
 
        Jim_RegisterCoreCommands(interp);
 #endif
 

-#if defined( _MSC_VER )
+#if defined(_MSC_VER)

        /* WinXX - is generic, the forward
         * looking problem is this:
         *
        /* WinXX - is generic, the forward
         * looking problem is this:
         *


@@ -713,18 +713,18 @@ command_context_t* command_init()
         * "winxx" is generic.
         */
        HostOs = "winxx";
         * "winxx" is generic.
         */
        HostOs = "winxx";

-#elif defined( __LINUX__)
+#elif defined(__LINUX__)

        HostOs = "linux";
        HostOs = "linux";

-#elif defined( __DARWIN__ )
+#elif defined(__DARWIN__)

        HostOs = "darwin";
        HostOs = "darwin";

-#elif defined( __CYGWIN__ )
+#elif defined(__CYGWIN__)

        HostOs = "cygwin";
        HostOs = "cygwin";

-#elif defined( __MINGW32__ )
+#elif defined(__MINGW32__)

        HostOs = "mingw32";
 #else
        HostOs = "other";
 #endif
        HostOs = "mingw32";
 #else
        HostOs = "other";
 #endif

-       Jim_SetGlobalVariableStr( interp, "ocd_HOSTOS", Jim_NewStringObj( interp, HostOs , strlen(HostOs)) );
+       Jim_SetGlobalVariableStr(interp, "ocd_HOSTOS", Jim_NewStringObj(interp, HostOs , strlen(HostOs)));

 
        Jim_CreateCommand(interp, "ocd_find", jim_find, NULL, NULL);
        Jim_CreateCommand(interp, "echo", jim_echo, NULL, NULL);
 
        Jim_CreateCommand(interp, "ocd_find", jim_find, NULL, NULL);
        Jim_CreateCommand(interp, "echo", jim_echo, NULL, NULL);


@@ -825,7 +825,7 @@ void process_jim_events(void)
        if (!recursion)
        {
                recursion++;
        if (!recursion)
        {
                recursion++;

-               Jim_ProcessEvents (interp, JIM_ALL_EVENTS|JIM_DONT_WAIT);
+               Jim_ProcessEvents (interp, JIM_ALL_EVENTS | JIM_DONT_WAIT);

                recursion--;
        }
 #endif
                recursion--;
        }
 #endif


@@ -837,13 +837,13 @@ void register_jim(struct command_context_s *cmd_ctx, const char *name, int (*cmd
 
        /* FIX!!! it would be prettier to invoke add_help_text...
         * accumulate help text in Tcl helptext list.  */
 
        /* FIX!!! it would be prettier to invoke add_help_text...
         * accumulate help text in Tcl helptext list.  */

-       Jim_Obj *helptext=Jim_GetGlobalVariableStr(interp, "ocd_helptext", JIM_ERRMSG);
+       Jim_Obj *helptext = Jim_GetGlobalVariableStr(interp, "ocd_helptext", JIM_ERRMSG);

        if (Jim_IsShared(helptext))
                helptext = Jim_DuplicateObj(interp, helptext);
 
        if (Jim_IsShared(helptext))
                helptext = Jim_DuplicateObj(interp, helptext);
 

-       Jim_Obj *cmd_entry=Jim_NewListObj(interp, NULL, 0);
+       Jim_Obj *cmd_entry = Jim_NewListObj(interp, NULL, 0);

 
 

-       Jim_Obj *cmd_list=Jim_NewListObj(interp, NULL, 0);
+       Jim_Obj *cmd_list = Jim_NewListObj(interp, NULL, 0);

        Jim_ListAppendElement(interp, cmd_list, Jim_NewStringObj(interp, name, -1));
 
        Jim_ListAppendElement(interp, cmd_entry, cmd_list);
        Jim_ListAppendElement(interp, cmd_list, Jim_NewStringObj(interp, name, -1));
 
        Jim_ListAppendElement(interp, cmd_entry, cmd_list);


@@ -854,7 +854,7 @@ void register_jim(struct command_context_s *cmd_ctx, const char *name, int (*cmd
 /* return global variable long value or 0 upon failure */
 long jim_global_long(const char *variable)
 {
 /* return global variable long value or 0 upon failure */
 long jim_global_long(const char *variable)
 {

-       Jim_Obj *objPtr=Jim_GetGlobalVariableStr(interp, variable, JIM_ERRMSG);
+       Jim_Obj *objPtr = Jim_GetGlobalVariableStr(interp, variable, JIM_ERRMSG);

        long t;
        if (Jim_GetLong(interp, objPtr, &t) == JIM_OK)
        {
        long t;
        if (Jim_GetLong(interp, objPtr, &t) == JIM_OK)
        {


@@ -867,15 +867,27 @@ long jim_global_long(const char *variable)
        int parse##name(const char *str, type *ul) \
        { \
                if (!*str) \
        int parse##name(const char *str, type *ul) \
        { \
                if (!*str) \

+               { \
+                       LOG_ERROR("Invalid command argument"); \

                        return ERROR_COMMAND_ARGUMENT_INVALID; \
                        return ERROR_COMMAND_ARGUMENT_INVALID; \

+               } \

                char *end; \
                *ul = func(str, &end, 0); \
                if (*end) \
                char *end; \
                *ul = func(str, &end, 0); \
                if (*end) \

+               { \
+                       LOG_ERROR("Invalid command argument"); \

                        return ERROR_COMMAND_ARGUMENT_INVALID; \
                        return ERROR_COMMAND_ARGUMENT_INVALID; \

+               } \

                if ((max == *ul) && (ERANGE == errno)) \
                if ((max == *ul) && (ERANGE == errno)) \

+               { \
+                       LOG_ERROR("Argument overflow"); \

                        return ERROR_COMMAND_ARGUMENT_OVERFLOW; \
                        return ERROR_COMMAND_ARGUMENT_OVERFLOW; \

+               } \

                if (min && (min == *ul) && (ERANGE == errno)) \
                if (min && (min == *ul) && (ERANGE == errno)) \

+               { \
+                       LOG_ERROR("Argument underflow"); \

                        return ERROR_COMMAND_ARGUMENT_UNDERFLOW; \
                        return ERROR_COMMAND_ARGUMENT_UNDERFLOW; \

+               } \

                return ERROR_OK; \
        }
 DEFINE_PARSE_NUM_TYPE(_ulong, unsigned long , strtoul, 0, ULONG_MAX)
                return ERROR_OK; \
        }
 DEFINE_PARSE_NUM_TYPE(_ulong, unsigned long , strtoul, 0, ULONG_MAX)


@@ -896,7 +908,7 @@ DEFINE_PARSE_NUM_TYPE(_llong, long long, strtoll, LLONG_MIN, LLONG_MAX)
                        return ERROR_COMMAND_ARGUMENT_UNDERFLOW; \
                *ul = n; \
                return ERROR_OK; \
                        return ERROR_COMMAND_ARGUMENT_UNDERFLOW; \
                *ul = n; \
                return ERROR_OK; \

-       }       
+       }

 
 #define DEFINE_PARSE_ULONG(name, type, min, max) \
        DEFINE_PARSE_WRAPPER(name, type, min, max, unsigned long, _ulong)
 
 #define DEFINE_PARSE_ULONG(name, type, min, max) \
        DEFINE_PARSE_WRAPPER(name, type, min, max, unsigned long, _ulong)