-rw-r--r-- | scan-tree.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/scan-tree.c b/scan-tree.c index b5b50f3..a0e09ce 100644 --- a/scan-tree.c +++ b/scan-tree.c | |||
@@ -20,128 +20,132 @@ static int is_git_dir(const char *path) | |||
20 | static char buf[MAX_PATH]; | 20 | static char buf[MAX_PATH]; |
21 | 21 | ||
22 | if (snprintf(buf, MAX_PATH, "%s/objects", path) >= MAX_PATH) { | 22 | if (snprintf(buf, MAX_PATH, "%s/objects", path) >= MAX_PATH) { |
23 | fprintf(stderr, "Insanely long path: %s\n", path); | 23 | fprintf(stderr, "Insanely long path: %s\n", path); |
24 | return 0; | 24 | return 0; |
25 | } | 25 | } |
26 | if (stat(buf, &st)) { | 26 | if (stat(buf, &st)) { |
27 | if (errno != ENOENT) | 27 | if (errno != ENOENT) |
28 | fprintf(stderr, "Error checking path %s: %s (%d)\n", | 28 | fprintf(stderr, "Error checking path %s: %s (%d)\n", |
29 | path, strerror(errno), errno); | 29 | path, strerror(errno), errno); |
30 | return 0; | 30 | return 0; |
31 | } | 31 | } |
32 | if (!S_ISDIR(st.st_mode)) | 32 | if (!S_ISDIR(st.st_mode)) |
33 | return 0; | 33 | return 0; |
34 | 34 | ||
35 | sprintf(buf, "%s/HEAD", path); | 35 | sprintf(buf, "%s/HEAD", path); |
36 | if (stat(buf, &st)) { | 36 | if (stat(buf, &st)) { |
37 | if (errno != ENOENT) | 37 | if (errno != ENOENT) |
38 | fprintf(stderr, "Error checking path %s: %s (%d)\n", | 38 | fprintf(stderr, "Error checking path %s: %s (%d)\n", |
39 | path, strerror(errno), errno); | 39 | path, strerror(errno), errno); |
40 | return 0; | 40 | return 0; |
41 | } | 41 | } |
42 | if (!S_ISREG(st.st_mode)) | 42 | if (!S_ISREG(st.st_mode)) |
43 | return 0; | 43 | return 0; |
44 | 44 | ||
45 | return 1; | 45 | return 1; |
46 | } | 46 | } |
47 | 47 | ||
48 | struct cgit_repo *repo; | 48 | struct cgit_repo *repo; |
49 | repo_config_fn config_fn; | 49 | repo_config_fn config_fn; |
50 | char *owner; | 50 | char *owner; |
51 | 51 | ||
52 | static void repo_config(const char *name, const char *value) | 52 | static void repo_config(const char *name, const char *value) |
53 | { | 53 | { |
54 | config_fn(repo, name, value); | 54 | config_fn(repo, name, value); |
55 | } | 55 | } |
56 | 56 | ||
57 | static int git_owner_config(const char *key, const char *value, void *cb) | 57 | static int git_owner_config(const char *key, const char *value, void *cb) |
58 | { | 58 | { |
59 | if (!strcmp(key, "gitweb.owner")) | 59 | if (!strcmp(key, "gitweb.owner")) |
60 | owner = xstrdup(value); | 60 | owner = xstrdup(value); |
61 | return 0; | 61 | return 0; |
62 | } | 62 | } |
63 | 63 | ||
64 | static char *xstrrchr(char *s, char *from, int c) | 64 | static char *xstrrchr(char *s, char *from, int c) |
65 | { | 65 | { |
66 | while (from >= s && *from != c) | 66 | while (from >= s && *from != c) |
67 | from--; | 67 | from--; |
68 | return from < s ? NULL : from; | 68 | return from < s ? NULL : from; |
69 | } | 69 | } |
70 | 70 | ||
71 | static void add_repo(const char *base, const char *path, repo_config_fn fn) | 71 | static void add_repo(const char *base, const char *path, repo_config_fn fn) |
72 | { | 72 | { |
73 | struct stat st; | 73 | struct stat st; |
74 | struct passwd *pwd; | 74 | struct passwd *pwd; |
75 | char *rel, *p, *slash; | 75 | char *rel, *p, *slash; |
76 | int n; | 76 | int n; |
77 | size_t size; | 77 | size_t size; |
78 | 78 | ||
79 | if (stat(path, &st)) { | 79 | if (stat(path, &st)) { |
80 | fprintf(stderr, "Error accessing %s: %s (%d)\n", | 80 | fprintf(stderr, "Error accessing %s: %s (%d)\n", |
81 | path, strerror(errno), errno); | 81 | path, strerror(errno), errno); |
82 | return; | 82 | return; |
83 | } | 83 | } |
84 | |||
85 | if (ctx.cfg.strict_export && stat(fmt("%s/%s", path, ctx.cfg.strict_export), &st)) | ||
86 | return; | ||
87 | |||
84 | if (!stat(fmt("%s/noweb", path), &st)) | 88 | if (!stat(fmt("%s/noweb", path), &st)) |
85 | return; | 89 | return; |
86 | 90 | ||
87 | owner = NULL; | 91 | owner = NULL; |
88 | if (ctx.cfg.enable_gitweb_owner) | 92 | if (ctx.cfg.enable_gitweb_owner) |
89 | git_config_from_file(git_owner_config, fmt("%s/config", path), NULL); | 93 | git_config_from_file(git_owner_config, fmt("%s/config", path), NULL); |
90 | if (base == path) | 94 | if (base == path) |
91 | rel = xstrdup(fmt("%s", path)); | 95 | rel = xstrdup(fmt("%s", path)); |
92 | else | 96 | else |
93 | rel = xstrdup(fmt("%s", path + strlen(base) + 1)); | 97 | rel = xstrdup(fmt("%s", path + strlen(base) + 1)); |
94 | 98 | ||
95 | if (!strcmp(rel + strlen(rel) - 5, "/.git")) | 99 | if (!strcmp(rel + strlen(rel) - 5, "/.git")) |
96 | rel[strlen(rel) - 5] = '\0'; | 100 | rel[strlen(rel) - 5] = '\0'; |
97 | 101 | ||
98 | repo = cgit_add_repo(rel); | 102 | repo = cgit_add_repo(rel); |
99 | if (ctx.cfg.remove_suffix) | 103 | if (ctx.cfg.remove_suffix) |
100 | if ((p = strrchr(repo->url, '.')) && !strcmp(p, ".git")) | 104 | if ((p = strrchr(repo->url, '.')) && !strcmp(p, ".git")) |
101 | *p = '\0'; | 105 | *p = '\0'; |
102 | repo->name = repo->url; | 106 | repo->name = repo->url; |
103 | repo->path = xstrdup(path); | 107 | repo->path = xstrdup(path); |
104 | while (!owner) { | 108 | while (!owner) { |
105 | if ((pwd = getpwuid(st.st_uid)) == NULL) { | 109 | if ((pwd = getpwuid(st.st_uid)) == NULL) { |
106 | fprintf(stderr, "Error reading owner-info for %s: %s (%d)\n", | 110 | fprintf(stderr, "Error reading owner-info for %s: %s (%d)\n", |
107 | path, strerror(errno), errno); | 111 | path, strerror(errno), errno); |
108 | break; | 112 | break; |
109 | } | 113 | } |
110 | if (pwd->pw_gecos) | 114 | if (pwd->pw_gecos) |
111 | if ((p = strchr(pwd->pw_gecos, ','))) | 115 | if ((p = strchr(pwd->pw_gecos, ','))) |
112 | *p = '\0'; | 116 | *p = '\0'; |
113 | owner = xstrdup(pwd->pw_gecos ? pwd->pw_gecos : pwd->pw_name); | 117 | owner = xstrdup(pwd->pw_gecos ? pwd->pw_gecos : pwd->pw_name); |
114 | } | 118 | } |
115 | repo->owner = owner; | 119 | repo->owner = owner; |
116 | 120 | ||
117 | p = fmt("%s/description", path); | 121 | p = fmt("%s/description", path); |
118 | if (!stat(p, &st)) | 122 | if (!stat(p, &st)) |
119 | readfile(p, &repo->desc, &size); | 123 | readfile(p, &repo->desc, &size); |
120 | 124 | ||
121 | if (!repo->readme) { | 125 | if (!repo->readme) { |
122 | p = fmt("%s/README.html", path); | 126 | p = fmt("%s/README.html", path); |
123 | if (!stat(p, &st)) | 127 | if (!stat(p, &st)) |
124 | repo->readme = "README.html"; | 128 | repo->readme = "README.html"; |
125 | } | 129 | } |
126 | if (ctx.cfg.section_from_path) { | 130 | if (ctx.cfg.section_from_path) { |
127 | n = ctx.cfg.section_from_path; | 131 | n = ctx.cfg.section_from_path; |
128 | if (n > 0) { | 132 | if (n > 0) { |
129 | slash = rel; | 133 | slash = rel; |
130 | while (slash && n && (slash = strchr(slash, '/'))) | 134 | while (slash && n && (slash = strchr(slash, '/'))) |
131 | n--; | 135 | n--; |
132 | } else { | 136 | } else { |
133 | slash = rel + strlen(rel); | 137 | slash = rel + strlen(rel); |
134 | while (slash && n && (slash = xstrrchr(rel, slash, '/'))) | 138 | while (slash && n && (slash = xstrrchr(rel, slash, '/'))) |
135 | n++; | 139 | n++; |
136 | } | 140 | } |
137 | if (slash && !n) { | 141 | if (slash && !n) { |
138 | *slash = '\0'; | 142 | *slash = '\0'; |
139 | repo->section = xstrdup(rel); | 143 | repo->section = xstrdup(rel); |
140 | *slash = '/'; | 144 | *slash = '/'; |
141 | if (!prefixcmp(repo->name, repo->section)) { | 145 | if (!prefixcmp(repo->name, repo->section)) { |
142 | repo->name += strlen(repo->section); | 146 | repo->name += strlen(repo->section); |
143 | if (*repo->name == '/') | 147 | if (*repo->name == '/') |
144 | repo->name++; | 148 | repo->name++; |
145 | } | 149 | } |
146 | } | 150 | } |
147 | } | 151 | } |