Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6

[mv-sheeva.git] / tools / perf / util / exec_cmd.c

diff --git a/tools/perf/util/exec_cmd.c b/tools/perf/util/exec_cmd.c
index d39292263153021ac44a6f9b4e2779ce63478094..2745605dba11f4d334c15a294326aa0c7ac2bfc9 100644 (file)
--- a/tools/perf/util/exec_cmd.c
+++ b/tools/perf/util/exec_cmd.c
@@ -1,9 +1,11 @@
 #include "cache.h"
 #include "exec_cmd.h"
 #include "quote.h"
+
+#include <string.h>
+
 #define MAX_ARGS       32
 
-extern char **environ;
 static const char *argv_exec_path;
 static const char *argv0_path;
 
@@ -51,7 +53,7 @@ const char *perf_extract_argv0_path(const char *argv0)
                slash--;
 
        if (slash >= argv0) {
-               argv0_path = strndup(argv0, slash - argv0);
+               argv0_path = xstrndup(argv0, slash - argv0);
                return slash + 1;
        }