diff options
Diffstat (limited to 'scan-tree.c')
-rw-r--r-- | scan-tree.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/scan-tree.c b/scan-tree.c index 47f3988..4da21a4 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 | ||
38 | char *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 | |||
51 | static void add_repo(const char *base, const char *path) | 38 | static 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", |
@@ -76,11 +64,14 @@ static void add_repo(const char *base, const char *path) | |||
76 | repo = cgit_add_repo(xstrdup(p)); | 64 | repo = cgit_add_repo(xstrdup(p)); |
77 | repo->name = repo->url; | 65 | repo->name = repo->url; |
78 | repo->path = xstrdup(path); | 66 | repo->path = xstrdup(path); |
67 | p = (pwd && pwd->pw_gecos) ? strchr(pwd->pw_gecos, ',') : NULL; | ||
68 | if (p) | ||
69 | *p = '\0'; | ||
79 | repo->owner = (pwd ? xstrdup(pwd->pw_gecos ? pwd->pw_gecos : pwd->pw_name) : ""); | 70 | repo->owner = (pwd ? xstrdup(pwd->pw_gecos ? pwd->pw_gecos : pwd->pw_name) : ""); |
80 | 71 | ||
81 | p = fmt("%s/description", path); | 72 | p = fmt("%s/description", path); |
82 | if (!stat(p, &st)) | 73 | if (!stat(p, &st)) |
83 | repo->desc = xstrdup(readfile(p)); | 74 | readfile(p, &repo->desc, &size); |
84 | 75 | ||
85 | p = fmt("%s/README.html", path); | 76 | p = fmt("%s/README.html", path); |
86 | if (!stat(p, &st)) | 77 | if (!stat(p, &st)) |