forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

perf tools: Remove subcmd dependencies on strbuf

Browse source 
Introduce and use new astrcat() and astrcatf() functions which replace
the strbuf functionality for subcmd.

For now they duplicate strbuf's die-on-allocation-error policy.

Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/957d207e1254406fa11fc2e405e75a7e405aad8f.1450193761.git.jpoimboe@redhat.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Josh Poimboeuf 2015-12-15 09:39:36 -06:00 • committed by Arnaldo Carvalho de Melo
parent 096d35585b
commit 901421a5bd
4 changed files with 66 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

27
tools/perf/util/exec_cmd.c
View file

@ -4,6 +4,7 @@
#include "subcmd-config.h"
#include <string.h>
#include "subcmd-util.h"
#define MAX_ARGS 32
@ -21,14 +22,14 @@ void exec_cmd_init(const char *exec_name, const char *prefix,
char *system_path(const char *path)
{
struct strbuf d = STRBUF_INIT;
char *buf = NULL;
if (is_absolute_path(path))
return strdup(path);
strbuf_addf(&d, "%s/%s", subcmd_config.prefix, path);
path = strbuf_detach(&d, NULL);
return (char *)path;
astrcatf(&buf, "%s/%s", subcmd_config.prefix, path);
return buf;
}
const char *perf_extract_argv0_path(const char *argv0)
@ -75,22 +76,22 @@ char *perf_exec_path(void)
return system_path(subcmd_config.exec_path);
}
static void add_path(struct strbuf *out, const char *path)
static void add_path(char **out, const char *path)
{
if (path && *path) {
if (is_absolute_path(path))
strbuf_addstr(out, path);
astrcat(out, path);
else
strbuf_addstr(out, make_nonrelative_path(path));
astrcat(out, make_nonrelative_path(path));
strbuf_addch(out, PATH_SEP);
astrcat(out, ":");
}
}
void setup_path(void)
{
const char *old_path = getenv("PATH");
struct strbuf new_path = STRBUF_INIT;
char *new_path = NULL;
char *tmp = perf_exec_path();
add_path(&new_path, tmp);
@ -98,13 +99,13 @@ void setup_path(void)
free(tmp);
if (old_path)
strbuf_addstr(&new_path, old_path);
astrcat(&new_path, old_path);
else
strbuf_addstr(&new_path, "/usr/local/bin:/usr/bin:/bin");
astrcat(&new_path, "/usr/local/bin:/usr/bin:/bin");
setenv("PATH", new_path.buf, 1);
setenv("PATH", new_path, 1);
strbuf_release(&new_path);
free(new_path);
}
static const char **prepare_perf_cmd(const char **argv)