1 files changed, 59 insertions, 7 deletions

diff --git a/tools/perf/util/util.c b/tools/perf/util/util.c
index 6d17b18e915d..28a0a89c1f73 100644
--- a/tools/perf/util/util.c
+++ b/tools/perf/util/util.c
@@ -1,7 +1,7 @@
 #include "../perf.h"
 #include "util.h"
 #include <sys/mman.h>
-#ifdef BACKTRACE_SUPPORT
+#ifdef HAVE_BACKTRACE_SUPPORT
 #include <execinfo.h>
 #endif
 #include <stdio.h>
@@ -55,17 +55,20 @@ int mkdir_p(char *path, mode_t mode)
         return (stat(path, &st) && mkdir(path, mode)) ? -1 : 0;
 }
 
-static int slow_copyfile(const char *from, const char *to)
+static int slow_copyfile(const char *from, const char *to, mode_t mode)
 {
-        int err = 0;
+        int err = -1;
         char *line = NULL;
         size_t n;
         FILE *from_fp = fopen(from, "r"), *to_fp;
+        mode_t old_umask;
 
         if (from_fp == NULL)
                 goto out;
 
+        old_umask = umask(mode ^ 0777);
         to_fp = fopen(to, "w");
+        umask(old_umask);
         if (to_fp == NULL)
                 goto out_fclose_from;
 
@@ -82,7 +85,7 @@ out:
         return err;
 }
 
-int copyfile(const char *from, const char *to)
+int copyfile_mode(const char *from, const char *to, mode_t mode)
 {
         int fromfd, tofd;
         struct stat st;
@@ -93,13 +96,13 @@ int copyfile(const char *from, const char *to)
                 goto out;
 
         if (st.st_size == 0) /* /proc? do it slowly... */
-                return slow_copyfile(from, to);
+                return slow_copyfile(from, to, mode);
 
         fromfd = open(from, O_RDONLY);
         if (fromfd < 0)
                 goto out;
 
-        tofd = creat(to, 0755);
+        tofd = creat(to, mode);
         if (tofd < 0)
                 goto out_close_from;
 
@@ -121,6 +124,11 @@ out:
         return err;
 }
 
+int copyfile(const char *from, const char *to)
+{
+        return copyfile_mode(from, to, 0755);
+}
+
 unsigned long convert_unit(unsigned long value, char *unit)
 {
         *unit = ' ';
@@ -204,7 +212,7 @@ int hex2u64(const char *ptr, u64 *long_val)
 }
 
 /* Obtain a backtrace and print it to stdout. */
-#ifdef BACKTRACE_SUPPORT
+#ifdef HAVE_BACKTRACE_SUPPORT
 void dump_stack(void)
 {
         void *array[16];
@@ -361,3 +369,47 @@ int parse_nsec_time(const char *str, u64 *ptime)
         *ptime = time_sec * NSEC_PER_SEC + time_nsec;
         return 0;
 }
+
+unsigned long parse_tag_value(const char *str, struct parse_tag *tags)
+{
+        struct parse_tag *i = tags;
+
+        while (i->tag) {
+                char *s;
+
+                s = strchr(str, i->tag);
+                if (s) {
+                        unsigned long int value;
+                        char *endptr;
+
+                        value = strtoul(str, &endptr, 10);
+                        if (s != endptr)
+                                break;
+
+                        if (value > ULONG_MAX / i->mult)
+                                break;
+                        value *= i->mult;
+                        return value;
+                }
+                i++;
+        }
+
+        return (unsigned long) -1;
+}
+
+int filename__read_int(const char *filename, int *value)
+{
+        char line[64];
+        int fd = open(filename, O_RDONLY), err = -1;
+
+        if (fd < 0)
+                return -1;
+
+        if (read(fd, line, sizeof(line)) > 0) {
+                *value = atoi(line);
+                err = 0;
+        }
+
+        close(fd);
+        return err;
+}