bootchart: use conf-parser & CamelCase names in .conf

[elogind.git] / src / bootchart / svg.c

diff --git a/src/bootchart/svg.c b/src/bootchart/svg.c
index 6ad7348ecbe76ff7302821c614fa7809bed31af1..414d7af9b98451584362f367c397c53e4ebe505c 100644 (file)
--- a/src/bootchart/svg.c
+++ b/src/bootchart/svg.c
@@ -28,6 +28,8 @@
 #include <limits.h>
 #include <unistd.h>
 #include <sys/utsname.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 
 #include "bootchart.h"
 #include "util.h"
@@ -138,7 +140,7 @@ static void svg_header(void)
 }
 
 
-static void svg_title(void)
+static void svg_title(const char *build)
 {
         char cmdline[256] = "";
         char filename[PATH_MAX];
@@ -147,14 +149,15 @@ static void svg_title(void)
         char model[256] = "Unknown";
         char date[256] = "Unknown";
         char cpu[256] = "Unknown";
-        char build[256] = "Unknown";
         char *c;
         FILE *f;
         time_t t;
+        int fd;
         struct utsname uts;
 
         /* grab /proc/cmdline */
-        f = fopen("/proc/cmdline", "r");
+        fd = openat(procfd, "cmdline", O_RDONLY);
+        f = fdopen(fd, "r");
         if (f) {
                 if (!fgets(cmdline, 255, f))
                         sprintf(cmdline, "Unknown");
@@ -167,8 +170,9 @@ static void svg_title(void)
                 strncpy(rootbdev, &c[10], 3);
                 rootbdev[3] = '\0';
         }
-        sprintf(filename, "/sys/block/%s/device/model", rootbdev);
-        f = fopen(filename, "r");
+        sprintf(filename, "block/%s/device/model", rootbdev);
+        fd = openat(sysfd, filename, O_RDONLY);
+        f = fdopen(fd, "r");
         if (f) {
                 if (!fgets(model, 255, f))
                         fprintf(stderr, "Error reading disk model for %s\n", rootbdev);
@@ -184,7 +188,8 @@ static void svg_title(void)
         strftime(date, sizeof(date), "%a, %d %b %Y %H:%M:%S %z", localtime(&t));
 
         /* CPU type */
-        f = fopen("/proc/cpuinfo", "r");
+        fd = openat(procfd, "cpuinfo", O_RDONLY);
+        f = fdopen(fd, "r");
         if (f) {
                 while (fgets(buf, 255, f)) {
                         if (strstr(buf, "model name")) {
@@ -195,14 +200,6 @@ static void svg_title(void)
                 fclose(f);
         }
 
-        /* Build - 1st line from /etc/system-release */
-        f = fopen("/etc/system-release", "r");
-        if (f) {
-                if (fgets(buf, 255, f))
-                        strncpy(build, buf, 255);
-                fclose(f);
-        }
-
         svg("<text class=\"t1\" x=\"0\" y=\"30\">Bootchart for %s - %s</text>\n",
             uts.nodename, date);
         svg("<text class=\"t2\" x=\"20\" y=\"50\">System: %s %s %s %s</text>\n",
@@ -1047,7 +1044,7 @@ static void svg_top_ten_pss(void)
 }
 
 
-void svg_do(void)
+void svg_do(const char *build)
 {
         struct ps_struct *ps;
 
@@ -1100,7 +1097,7 @@ void svg_do(void)
         svg("</g>\n\n");
 
         svg("<g transform=\"translate(10,  0)\">\n");
-        svg_title();
+        svg_title(build);
         svg("</g>\n\n");
 
         svg("<g transform=\"translate(10,200)\">\n");