From: Jean-Philippe Orsini Date: Wed, 7 Sep 2011 07:11:26 +0000 (+0000) Subject: moved path_append to io.c X-Git-Tag: v1.3.0~129 X-Git-Url: http://git.wpitchoune.net/gitweb/?p=ppastats.git;a=commitdiff_plain;h=df19eac22b08c4793607679e2ea471ae64b824fd moved path_append to io.c --- diff --git a/src/html.c b/src/html.c index 9eb0bcf..c0dd767 100644 --- a/src/html.c +++ b/src/html.c @@ -472,17 +472,6 @@ index_to_html(struct ppa_stats *ppa, const char *dir) free(path); } -static char *append_path(const char *odir, const char *name) -{ - char *dir; - - dir = malloc(strlen(odir)+1+strlen(name)+1); - - sprintf(dir, "%s/%s", odir, name); - - return dir; -} - void ppa_to_html(const char *owner, const char *ppa, @@ -507,14 +496,14 @@ ppa_to_html(const char *owner, "css/jquery.jqplot.min.css" }; if (install_static_files) { - css_dir = append_path(output_dir, "css"); - js_dir = append_path(output_dir, "js"); + css_dir = path_append(output_dir, "css"); + js_dir = path_append(output_dir, "js"); mkdir(css_dir, 0777); mkdir(js_dir, 0777); for (i = 0; i < 6; i++) { - f_dst = append_path(output_dir, www_files[2*i+1]); + f_dst = path_append(output_dir, www_files[2*i+1]); fcopy(www_files[2*i], f_dst); free(f_dst); diff --git a/src/io.c b/src/io.c index 2cce202..aeeed8c 100644 --- a/src/io.c +++ b/src/io.c @@ -19,6 +19,7 @@ #include #include +#include #include "io.h" @@ -75,3 +76,15 @@ int fcopy(const char *src, const char *dst) return ret; } + +char *path_append(const char *odir, const char *name) +{ + char *dir; + + dir = malloc(strlen(odir)+1+strlen(name)+1); + + sprintf(dir, "%s/%s", odir, name); + + return dir; +} + diff --git a/src/io.h b/src/io.h index b06709f..60f82b5 100644 --- a/src/io.h +++ b/src/io.h @@ -41,4 +41,6 @@ enum file_copy_code { */ int fcopy(const char *src, const char *dst); +char *path_append(const char *odir, const char *name); + #endif