do not extern 'interp' from command.c

[fw/openocd] / src / helper / log.c

diff --git a/src/helper/log.c b/src/helper/log.c
index caaed42322d2f75733f70823a9f0778659e7d20e..3067ecc56180fadcdbbc797c784cdecb0147eceb 100644 (file)
--- a/src/helper/log.c
+++ b/src/helper/log.c
@@ -316,31 +316,53 @@ COMMAND_HANDLER(handle_log_output_command)
        return ERROR_OK;
 }
 
+static struct command_registration log_command_handlers[] = {
+       {
+               .name = "log_output",
+               .handler = &handle_log_output_command,
+               .mode = COMMAND_ANY,
+               .help = "redirect logging to a file (default: stderr)",
+               .usage = "<file_name>",
+       },
+       {
+               .name = "debug_level",
+               .handler = &handle_debug_level_command,
+               .mode = COMMAND_ANY,
+               .help = "sets the verbosity level of debugging output",
+               .usage = "<level:0-3>",
+       },
+       COMMAND_REGISTRATION_DONE
+};
+
 int log_register_commands(struct command_context *cmd_ctx)
 {
-       start = timeval_ms();
-       register_command(cmd_ctx, NULL, "log_output", handle_log_output_command,
-               COMMAND_ANY, "redirect logging to <file> (default: stderr)");
-       register_command(cmd_ctx, NULL, "debug_level", handle_debug_level_command,
-               COMMAND_ANY, "adjust debug level <0-3>");
-
-       return ERROR_OK;
+       return register_commands(cmd_ctx, NULL, log_command_handlers);
 }
 
-int log_init(struct command_context *cmd_ctx)
+void log_init(void)
 {
-       /* set defaults for daemon configuration, if not set by cmdline or cfgfile */
+       /* set defaults for daemon configuration,
+        * if not set by cmdline or cfgfile */
        if (debug_level == -1)
                debug_level = LOG_LVL_INFO;
 
-       if (log_output == NULL)
+       char *debug_env = getenv("OPENOCD_DEBUG_LEVEL");
+       if (NULL != debug_env)
        {
-               log_output = stderr;
+               int value;
+               int retval = parse_int(debug_env, &value);
+               if (ERROR_OK == retval &&
+                               debug_level >= LOG_LVL_SILENT &&
+                               debug_level <= LOG_LVL_DEBUG)
+               {
+                       debug_level = value;
+               }
        }
 
-       start = last_time = timeval_ms();
+       if (log_output == NULL)
+               log_output = stderr;
 
-       return ERROR_OK;
+       start = last_time = timeval_ms();
 }
 
 int set_log_output(struct command_context *cmd_ctx, FILE *output)
@@ -395,37 +417,26 @@ int log_remove_callback(log_callback_fn fn, void *priv)
 /* return allocated string w/printf() result */
 char *alloc_vprintf(const char *fmt, va_list ap)
 {
-       /* no buffer at the beginning, force realloc to do the job */
-       char *string = NULL;
-
-       /* start with buffer size suitable for typical messages */
-       int size = 128;
-
-       for (;;)
-       {
-               char *t = string;
-               va_list ap_copy;
-               int ret;
-               string = realloc(string, size);
-               if (string == NULL)
-               {
-                       if (t != NULL)
-                               free(t);
-                       return NULL;
-               }
+       va_list ap_copy;
+       int len;
+       char *string;
 
-               va_copy(ap_copy, ap);
+       /* determine the length of the buffer needed */
+       va_copy(ap_copy, ap);
+       len = vsnprintf(NULL, 0, fmt, ap_copy);
+       va_end(ap_copy);
 
-               ret = vsnprintf(string, size, fmt, ap_copy);
-               /* NB! The result of the vsnprintf() might be an *EMPTY* string! */
-               if ((ret >= 0) && ((ret + 1) < size))
-                       break;
+       /* allocate and make room for terminating zero. */
+       /* FIXME: The old version always allocated at least one byte extra and
+        * other code depend on that. They should be probably be fixed, but for
+        * now reserve the extra byte. */
+       string = malloc(len + 2);
+       if (string == NULL)
+               return NULL;
 
-               /* there was just enough or not enough space, allocate more in the next round */
-               size *= 2; /* double the buffer size */
-       }
+       /* do the real work */
+       vsnprintf(string, len + 1, fmt, ap);
 
-       /* the returned buffer is by principle guaranteed to be at least one character longer */
        return string;
 }