-rw-r--r-- | scan-tree.c | 45 |
1 files changed, 27 insertions, 18 deletions
diff --git a/scan-tree.c b/scan-tree.c index 47f3988..dbca797 100644 --- a/scan-tree.c +++ b/scan-tree.c | |||
@@ -1,17 +1,18 @@ | |||
1 | #include "cgit.h" | 1 | #include "cgit.h" |
2 | #include "configfile.h" | ||
2 | #include "html.h" | 3 | #include "html.h" |
3 | 4 | ||
4 | #define MAX_PATH 4096 | 5 | #define MAX_PATH 4096 |
5 | 6 | ||
6 | /* return 1 if path contains a objects/ directory and a HEAD file */ | 7 | /* return 1 if path contains a objects/ directory and a HEAD file */ |
7 | static int is_git_dir(const char *path) | 8 | static int is_git_dir(const char *path) |
8 | { | 9 | { |
9 | struct stat st; | 10 | struct stat st; |
10 | static char buf[MAX_PATH]; | 11 | static char buf[MAX_PATH]; |
11 | 12 | ||
12 | if (snprintf(buf, MAX_PATH, "%s/objects", path) >= MAX_PATH) { | 13 | if (snprintf(buf, MAX_PATH, "%s/objects", path) >= MAX_PATH) { |
13 | fprintf(stderr, "Insanely long path: %s\n", path); | 14 | fprintf(stderr, "Insanely long path: %s\n", path); |
14 | return 0; | 15 | return 0; |
15 | } | 16 | } |
16 | if (stat(buf, &st)) { | 17 | if (stat(buf, &st)) { |
17 | if (errno != ENOENT) | 18 | if (errno != ENOENT) |
@@ -22,116 +23,124 @@ static int is_git_dir(const char *path) | |||
22 | if (!S_ISDIR(st.st_mode)) | 23 | if (!S_ISDIR(st.st_mode)) |
23 | return 0; | 24 | return 0; |
24 | 25 | ||
25 | sprintf(buf, "%s/HEAD", path); | 26 | sprintf(buf, "%s/HEAD", path); |
26 | if (stat(buf, &st)) { | 27 | if (stat(buf, &st)) { |
27 | if (errno != ENOENT) | 28 | if (errno != ENOENT) |
28 | fprintf(stderr, "Error checking path %s: %s (%d)\n", | 29 | fprintf(stderr, "Error checking path %s: %s (%d)\n", |
29 | path, strerror(errno), errno); | 30 | path, strerror(errno), errno); |
30 | return 0; | 31 | return 0; |
31 | } | 32 | } |
32 | if (!S_ISREG(st.st_mode)) | 33 | if (!S_ISREG(st.st_mode)) |
33 | return 0; | 34 | return 0; |
34 | 35 | ||
35 | return 1; | 36 | return 1; |
36 | } | 37 | } |
37 | 38 | ||
38 | char *readfile(const char *path) | 39 | struct cgit_repo *repo; |
39 | { | 40 | repo_config_fn config_fn; |
40 | FILE *f; | ||
41 | static char buf[MAX_PATH]; | ||
42 | 41 | ||
43 | if (!(f = fopen(path, "r"))) | 42 | static void repo_config(const char *name, const char *value) |
44 | return NULL; | 43 | { |
45 | buf[0] = 0; | 44 | config_fn(repo, name, value); |
46 | fgets(buf, MAX_PATH, f); | ||
47 | fclose(f); | ||
48 | return buf; | ||
49 | } | 45 | } |
50 | 46 | ||
51 | static void add_repo(const char *base, const char *path) | 47 | static void add_repo(const char *base, const char *path, repo_config_fn fn) |
52 | { | 48 | { |
53 | struct cgit_repo *repo; | ||
54 | struct stat st; | 49 | struct stat st; |
55 | struct passwd *pwd; | 50 | struct passwd *pwd; |
56 | char *p; | 51 | char *p; |
52 | size_t size; | ||
57 | 53 | ||
58 | if (stat(path, &st)) { | 54 | if (stat(path, &st)) { |
59 | fprintf(stderr, "Error accessing %s: %s (%d)\n", | 55 | fprintf(stderr, "Error accessing %s: %s (%d)\n", |
60 | path, strerror(errno), errno); | 56 | path, strerror(errno), errno); |
61 | return; | 57 | return; |
62 | } | 58 | } |
63 | if ((pwd = getpwuid(st.st_uid)) == NULL) { | 59 | if ((pwd = getpwuid(st.st_uid)) == NULL) { |
64 | fprintf(stderr, "Error reading owner-info for %s: %s (%d)\n", | 60 | fprintf(stderr, "Error reading owner-info for %s: %s (%d)\n", |
65 | path, strerror(errno), errno); | 61 | path, strerror(errno), errno); |
66 | return; | 62 | return; |
67 | } | 63 | } |
68 | if (base == path) | 64 | if (base == path) |
69 | p = fmt("%s", path); | 65 | p = fmt("%s", path); |
70 | else | 66 | else |
71 | p = fmt("%s", path + strlen(base) + 1); | 67 | p = fmt("%s", path + strlen(base) + 1); |
72 | 68 | ||
73 | if (!strcmp(p + strlen(p) - 5, "/.git")) | 69 | if (!strcmp(p + strlen(p) - 5, "/.git")) |
74 | p[strlen(p) - 5] = '\0'; | 70 | p[strlen(p) - 5] = '\0'; |
75 | 71 | ||
76 | repo = cgit_add_repo(xstrdup(p)); | 72 | repo = cgit_add_repo(xstrdup(p)); |
77 | repo->name = repo->url; | 73 | repo->name = repo->url; |
78 | repo->path = xstrdup(path); | 74 | repo->path = xstrdup(path); |
75 | p = (pwd && pwd->pw_gecos) ? strchr(pwd->pw_gecos, ',') : NULL; | ||
76 | if (p) | ||
77 | *p = '\0'; | ||
79 | repo->owner = (pwd ? xstrdup(pwd->pw_gecos ? pwd->pw_gecos : pwd->pw_name) : ""); | 78 | repo->owner = (pwd ? xstrdup(pwd->pw_gecos ? pwd->pw_gecos : pwd->pw_name) : ""); |
80 | 79 | ||
81 | p = fmt("%s/description", path); | 80 | p = fmt("%s/description", path); |
82 | if (!stat(p, &st)) | 81 | if (!stat(p, &st)) |
83 | repo->desc = xstrdup(readfile(p)); | 82 | readfile(p, &repo->desc, &size); |
84 | 83 | ||
85 | p = fmt("%s/README.html", path); | 84 | p = fmt("%s/README.html", path); |
86 | if (!stat(p, &st)) | 85 | if (!stat(p, &st)) |
87 | repo->readme = "README.html"; | 86 | repo->readme = "README.html"; |
87 | |||
88 | p = fmt("%s/cgitrc", path); | ||
89 | if (!stat(p, &st)) { | ||
90 | config_fn = fn; | ||
91 | parse_configfile(xstrdup(p), &repo_config); | ||
92 | } | ||
88 | } | 93 | } |
89 | 94 | ||
90 | static void scan_path(const char *base, const char *path) | 95 | static void scan_path(const char *base, const char *path, repo_config_fn fn) |
91 | { | 96 | { |
92 | DIR *dir; | 97 | DIR *dir; |
93 | struct dirent *ent; | 98 | struct dirent *ent; |
94 | char *buf; | 99 | char *buf; |
95 | struct stat st; | 100 | struct stat st; |
96 | 101 | ||
97 | if (is_git_dir(path)) { | 102 | if (is_git_dir(path)) { |
98 | add_repo(base, path); | 103 | add_repo(base, path, fn); |
104 | return; | ||
105 | } | ||
106 | if (is_git_dir(fmt("%s/.git", path))) { | ||
107 | add_repo(base, fmt("%s/.git", path), fn); | ||
99 | return; | 108 | return; |
100 | } | 109 | } |
101 | dir = opendir(path); | 110 | dir = opendir(path); |
102 | if (!dir) { | 111 | if (!dir) { |
103 | fprintf(stderr, "Error opening directory %s: %s (%d)\n", | 112 | fprintf(stderr, "Error opening directory %s: %s (%d)\n", |
104 | path, strerror(errno), errno); | 113 | path, strerror(errno), errno); |
105 | return; | 114 | return; |
106 | } | 115 | } |
107 | while((ent = readdir(dir)) != NULL) { | 116 | while((ent = readdir(dir)) != NULL) { |
108 | if (ent->d_name[0] == '.') { | 117 | if (ent->d_name[0] == '.') { |
109 | if (ent->d_name[1] == '\0') | 118 | if (ent->d_name[1] == '\0') |
110 | continue; | 119 | continue; |
111 | if (ent->d_name[1] == '.' && ent->d_name[2] == '\0') | 120 | if (ent->d_name[1] == '.' && ent->d_name[2] == '\0') |
112 | continue; | 121 | continue; |
113 | } | 122 | } |
114 | buf = malloc(strlen(path) + strlen(ent->d_name) + 2); | 123 | buf = malloc(strlen(path) + strlen(ent->d_name) + 2); |
115 | if (!buf) { | 124 | if (!buf) { |
116 | fprintf(stderr, "Alloc error on %s: %s (%d)\n", | 125 | fprintf(stderr, "Alloc error on %s: %s (%d)\n", |
117 | path, strerror(errno), errno); | 126 | path, strerror(errno), errno); |
118 | exit(1); | 127 | exit(1); |
119 | } | 128 | } |
120 | sprintf(buf, "%s/%s", path, ent->d_name); | 129 | sprintf(buf, "%s/%s", path, ent->d_name); |
121 | if (stat(buf, &st)) { | 130 | if (stat(buf, &st)) { |
122 | fprintf(stderr, "Error checking path %s: %s (%d)\n", | 131 | fprintf(stderr, "Error checking path %s: %s (%d)\n", |
123 | buf, strerror(errno), errno); | 132 | buf, strerror(errno), errno); |
124 | free(buf); | 133 | free(buf); |
125 | continue; | 134 | continue; |
126 | } | 135 | } |
127 | if (S_ISDIR(st.st_mode)) | 136 | if (S_ISDIR(st.st_mode)) |
128 | scan_path(base, buf); | 137 | scan_path(base, buf, fn); |
129 | free(buf); | 138 | free(buf); |
130 | } | 139 | } |
131 | closedir(dir); | 140 | closedir(dir); |
132 | } | 141 | } |
133 | 142 | ||
134 | void scan_tree(const char *path) | 143 | void scan_tree(const char *path, repo_config_fn fn) |
135 | { | 144 | { |
136 | scan_path(path, path); | 145 | scan_path(path, path, fn); |
137 | } | 146 | } |