aboutsummaryrefslogtreecommitdiffstats
path: root/scan-tree.c
diff options
context:
space:
mode:
authorGravatar Lars Hjemli <hjemli@gmail.com>2009-08-19 00:17:41 (JST)
committerGravatar Lars Hjemli <hjemli@gmail.com>2009-08-19 00:22:14 (JST)
commite16f1783346a090e4ea1194dcaae7f03e813f6a2 (patch)
tree268f5ba231895ba3a63071497764c64d44733da5 /scan-tree.c
parent523c133e2e5f7089a3d18ac23f2074b60991a7f0 (diff)
downloadcgit-e16f1783346a090e4ea1194dcaae7f03e813f6a2.zip
cgit-e16f1783346a090e4ea1194dcaae7f03e813f6a2.tar.gz
Add and use a common readfile() function
This function is used to read the full content of a textfile into a newly allocated buffer (with zerotermination). It replaces the earlier readfile() in scan-tree.c (which was rather error-prone[1]), and is reused by read_agefile() in ui-repolist.c. 1: No checks for EINTR and EAGAIN, fixed-size buffer Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'scan-tree.c')
-rw-r--r--scan-tree.c16
1 files changed, 2 insertions, 14 deletions
diff --git a/scan-tree.c b/scan-tree.c
index 47f3988..95dc65b 100644
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -35,25 +35,13 @@ static int is_git_dir(const char *path)
35 return 1; 35 return 1;
36} 36}
37 37
38char *readfile(const char *path)
39{
40 FILE *f;
41 static char buf[MAX_PATH];
42
43 if (!(f = fopen(path, "r")))
44 return NULL;
45 buf[0] = 0;
46 fgets(buf, MAX_PATH, f);
47 fclose(f);
48 return buf;
49}
50
51static void add_repo(const char *base, const char *path) 38static void add_repo(const char *base, const char *path)
52{ 39{
53 struct cgit_repo *repo; 40 struct cgit_repo *repo;
54 struct stat st; 41 struct stat st;
55 struct passwd *pwd; 42 struct passwd *pwd;
56 char *p; 43 char *p;
44 size_t size;
57 45
58 if (stat(path, &st)) { 46 if (stat(path, &st)) {
59 fprintf(stderr, "Error accessing %s: %s (%d)\n", 47 fprintf(stderr, "Error accessing %s: %s (%d)\n",
@@ -80,7 +68,7 @@ static void add_repo(const char *base, const char *path)
80 68
81 p = fmt("%s/description", path); 69 p = fmt("%s/description", path);
82 if (!stat(p, &st)) 70 if (!stat(p, &st))
83 repo->desc = xstrdup(readfile(p)); 71 readfile(p, &repo->desc, &size);
84 72
85 p = fmt("%s/README.html", path); 73 p = fmt("%s/README.html", path);
86 if (!stat(p, &st)) 74 if (!stat(p, &st))