1 files changed, 12 insertions, 6 deletions

diff --git a/tools/perf/perf.c b/tools/perf/perf.c
index a929618b8eb6..aaee0a782747 100644
--- a/tools/perf/perf.c
+++ b/tools/perf/perf.c
@@ -454,11 +454,12 @@ static void handle_internal_command(int argc, const char **argv)
 
 static void execv_dashed_external(const char **argv)
 {
-        struct strbuf cmd = STRBUF_INIT;
+        char *cmd;
         const char *tmp;
         int status;
 
-        strbuf_addf(&cmd, "perf-%s", argv[0]);
+        if (asprintf(&cmd, "perf-%s", argv[0]) < 0)
+                goto do_die;
 
         /*
          * argv[0] must be the perf command, but the argv array
@@ -467,7 +468,7 @@ static void execv_dashed_external(const char **argv)
          * restore it on error.
          */
         tmp = argv[0];
-        argv[0] = cmd.buf;
+        argv[0] = cmd;
 
         /*
          * if we fail because the command is not found, it is
@@ -475,15 +476,16 @@ static void execv_dashed_external(const char **argv)
          */
         status = run_command_v_opt(argv, 0);
         if (status != -ERR_RUN_COMMAND_EXEC) {
-                if (IS_RUN_COMMAND_ERR(status))
+                if (IS_RUN_COMMAND_ERR(status)) {
+do_die:
                         die("unable to run '%s'", argv[0]);
+                }
                 exit(-status);
         }
         errno = ENOENT; /* as if we called execvp */
 
         argv[0] = tmp;
-
-        strbuf_release(&cmd);
+        zfree(&cmd);
 }
 
 static int run_argv(int *argcp, const char ***argv)
@@ -546,6 +548,8 @@ int main(int argc, const char **argv)
 
         srandom(time(NULL));
 
+        perf_config(perf_default_config, NULL);
+
         /* get debugfs/tracefs mount point from /proc/mounts */
         tracing_path_mount();
 
@@ -613,6 +617,8 @@ int main(int argc, const char **argv)
          */
         pthread__block_sigwinch();
 
+        perf_debug_setup();
+
         while (1) {
                 static int done_help;
                 int was_alias = run_argv(&argc, &argv);