summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2009-08-18 15:21:52 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-08-18 15:21:52 (UTC)
commit523c133e2e5f7089a3d18ac23f2074b60991a7f0 (patch) (unidiff)
treec6469d87baa282052884fcb02ab04c91b6d8783b
parent73b54f7d7e21fbb15c50e21eafe1737df96b2073 (diff)
parent011f2e9bdddcbfe65da397629bca87d167313a28 (diff)
downloadcgit-523c133e2e5f7089a3d18ac23f2074b60991a7f0.zip
cgit-523c133e2e5f7089a3d18ac23f2074b60991a7f0.tar.gz
cgit-523c133e2e5f7089a3d18ac23f2074b60991a7f0.tar.bz2
Merge branch 'stable'
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--scan-tree.c1
-rw-r--r--ui-repolist.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/scan-tree.c b/scan-tree.c
index cdafb02..47f3988 100644
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -33,24 +33,25 @@ static int is_git_dir(const char *path)
33 return 0; 33 return 0;
34 34
35 return 1; 35 return 1;
36} 36}
37 37
38char *readfile(const char *path) 38char *readfile(const char *path)
39{ 39{
40 FILE *f; 40 FILE *f;
41 static char buf[MAX_PATH]; 41 static char buf[MAX_PATH];
42 42
43 if (!(f = fopen(path, "r"))) 43 if (!(f = fopen(path, "r")))
44 return NULL; 44 return NULL;
45 buf[0] = 0;
45 fgets(buf, MAX_PATH, f); 46 fgets(buf, MAX_PATH, f);
46 fclose(f); 47 fclose(f);
47 return buf; 48 return buf;
48} 49}
49 50
50static void add_repo(const char *base, const char *path) 51static void add_repo(const char *base, const char *path)
51{ 52{
52 struct cgit_repo *repo; 53 struct cgit_repo *repo;
53 struct stat st; 54 struct stat st;
54 struct passwd *pwd; 55 struct passwd *pwd;
55 char *p; 56 char *p;
56 57
diff --git a/ui-repolist.c b/ui-repolist.c
index 25f076f..6d2f93f 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -14,24 +14,25 @@
14 14
15#include "cgit.h" 15#include "cgit.h"
16#include "html.h" 16#include "html.h"
17#include "ui-shared.h" 17#include "ui-shared.h"
18 18
19time_t read_agefile(char *path) 19time_t read_agefile(char *path)
20{ 20{
21 FILE *f; 21 FILE *f;
22 static char buf[64], buf2[64]; 22 static char buf[64], buf2[64];
23 23
24 if (!(f = fopen(path, "r"))) 24 if (!(f = fopen(path, "r")))
25 return -1; 25 return -1;
26 buf[0] = 0;
26 if (fgets(buf, sizeof(buf), f) == NULL) 27 if (fgets(buf, sizeof(buf), f) == NULL)
27 return -1; 28 return -1;
28 fclose(f); 29 fclose(f);
29 if (parse_date(buf, buf2, sizeof(buf2))) 30 if (parse_date(buf, buf2, sizeof(buf2)))
30 return strtoul(buf2, NULL, 10); 31 return strtoul(buf2, NULL, 10);
31 else 32 else
32 return 0; 33 return 0;
33} 34}
34 35
35static int get_repo_modtime(const struct cgit_repo *repo, time_t *mtime) 36static int get_repo_modtime(const struct cgit_repo *repo, time_t *mtime)
36{ 37{
37 char *path; 38 char *path;