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