fixed too large malloc

[ppastats.git] / src / html.c

diff --git a/src/html.c b/src/html.c
index d82dcfa..c5a0a2d 100644 (file)
--- a/src/html.c
+++ b/src/html.c
@@ -1,21 +1,24 @@
 /*
-    Copyright (C) 2011 jeanfi@gmail.com
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301 USA
-*/
+ * Copyright (C) 2011-2012 jeanfi@gmail.com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+
+#include <libintl.h>
+#define _(String) gettext(String)
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -28,6 +31,7 @@
 
 #include "html.h"
 #include "io.h"
+#include "log.h"
 #include "lp.h"
 #include "lp_ws.h"
 #include "ppastats.h"
@@ -65,6 +69,10 @@
     <link type=\"text/css\" href=\"css/ppastats.css\" rel=\"stylesheet\" />\n\
     <link type=\"text/css\" href=\"css/jquery.jqplot.min.css\"\n\
          rel=\"stylesheet\" />\n\
+<!--[if lt IE 9]><script \
+language=\"javascript\" \
+type=\"text/javascript\" \
+src=\"js/excanvas.js\"></script><![endif]-->\n\
     <script type=\"text/javascript\" src=\"js/jquery.min.js\"></script>\n\
     <script type=\"text/javascript\"\n\
            src=\"js/jquery.jqplot.min.js\"></script>\n\
@@ -137,7 +145,6 @@ static char *path_new(const char *dir, const char *file, const char *suffixe)
 {
        char *path = malloc(strlen(dir)+1+
                            strlen(file)+
-                           strlen(".html")+
                            (suffixe ? strlen(suffixe) : 0) +
                            1);
 
@@ -381,7 +388,7 @@ version_to_html(struct ppa_stats *ppa,
        f = fopen(path, "w");
 
        if (!f) {
-               fprintf(stderr, "ERROR: failed to open: %s\n", path);
+               log_err(_("failed to open: %s"), path);
                return ;
        }
 
@@ -406,7 +413,7 @@ create_html(const char *path,
        f = fopen(path, "w");
 
        if (!f) {
-               fprintf(stderr, "ERROR: failed to open: %s\n", path);
+               log_err(_("failed to open: %s"), path);
                return ;
        }
 
@@ -436,8 +443,8 @@ index_to_html(struct ppa_stats *ppa, const char *dir)
 
        json = ppa_to_json(ppa);
        json_path = path_new(dir, "index", ".json");
-       if (debug)
-               printf("DEBUG: generating %s\n", json_path);
+
+       log_debug(_("generating %s"), json_path);
        json_object_to_file(json_path, json);
        json_object_put(json);
        free(json_path);
@@ -457,8 +464,8 @@ pkg_to_html(struct ppa_stats *ppa, struct package_stats *pkg, const char *dir)
 
        json_path = path_new(dir, pkg->name, ".json");
        json = pkg_to_json(ppa, pkg);
-       if (debug)
-               printf("DEBUG: generating %s\n", json_path);
+       log_debug(_("generating %s"), json_path);
+
        json_object_to_file(json_path, json);
        json_object_put(json);
        free(json_path);
@@ -470,8 +477,7 @@ pkg_to_html(struct ppa_stats *ppa, struct package_stats *pkg, const char *dir)
                        1);
        sprintf(script, "ppastats_pkg(\"%s%s\");", pkg->name, ".json");
 
-       if (debug)
-               printf("DEBUG: generating %s\n", path);
+       log_debug(_("generating %s"), path);
 
        create_html(path, pkg->name, HTML_PKG_TEMPLATE, script);
        free(path);
@@ -517,6 +523,7 @@ ppa_to_html(const char *owner,
                    "js/jqplot.dateAxisRenderer.min.js",
                    DEFAULT_WWW_DIR"/jquery.jqplot.min.js",
                    "js/jquery.jqplot.min.js",
+                   DEFAULT_WWW_DIR"/excanvas.js", "js/excanvas.js",
                    DEFAULT_WWW_DIR"/ppastats.css", "css/ppastats.css",
                    DEFAULT_WWW_DIR"/jquery.jqplot.min.css",
                    "css/jquery.jqplot.min.css" };
@@ -530,12 +537,10 @@ ppa_to_html(const char *owner,
                mkdir(css_dir, 0777);
                mkdir(js_dir, 0777);
 
-               for (i = 0; i < 6; i++) {
+               for (i = 0; i < 7; i++) {
                        f_dst = path_append(output_dir, www_files[2*i+1]);
 
-                       if (debug)
-                               printf("DEBUG: copying %s %s\n",
-                                      www_files[2*i], f_dst);
+                       log_debug(_("copying %s %s"), www_files[2*i], f_dst);
                        fcopy(www_files[2*i], f_dst);
 
                        free(f_dst);