-rw-r--r-- | scan-tree.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scan-tree.c b/scan-tree.c index cdafb02..47f3988 100644 --- a/scan-tree.c +++ b/scan-tree.c | |||
@@ -1,92 +1,93 @@ | |||
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 | char *readfile(const char *path) | 38 | char *readfile(const char *path) |
39 | { | 39 | { |
40 | FILE *f; | 40 | FILE *f; |
41 | static char buf[MAX_PATH]; | 41 | static char buf[MAX_PATH]; |
42 | 42 | ||
43 | if (!(f = fopen(path, "r"))) | 43 | if (!(f = fopen(path, "r"))) |
44 | return NULL; | 44 | return NULL; |
45 | buf[0] = 0; | ||
45 | fgets(buf, MAX_PATH, f); | 46 | fgets(buf, MAX_PATH, f); |
46 | fclose(f); | 47 | fclose(f); |
47 | return buf; | 48 | return buf; |
48 | } | 49 | } |
49 | 50 | ||
50 | static void add_repo(const char *base, const char *path) | 51 | static void add_repo(const char *base, const char *path) |
51 | { | 52 | { |
52 | struct cgit_repo *repo; | 53 | struct cgit_repo *repo; |
53 | struct stat st; | 54 | struct stat st; |
54 | struct passwd *pwd; | 55 | struct passwd *pwd; |
55 | char *p; | 56 | char *p; |
56 | 57 | ||
57 | if (stat(path, &st)) { | 58 | if (stat(path, &st)) { |
58 | fprintf(stderr, "Error accessing %s: %s (%d)\n", | 59 | fprintf(stderr, "Error accessing %s: %s (%d)\n", |
59 | path, strerror(errno), errno); | 60 | path, strerror(errno), errno); |
60 | return; | 61 | return; |
61 | } | 62 | } |
62 | if ((pwd = getpwuid(st.st_uid)) == NULL) { | 63 | if ((pwd = getpwuid(st.st_uid)) == NULL) { |
63 | fprintf(stderr, "Error reading owner-info for %s: %s (%d)\n", | 64 | fprintf(stderr, "Error reading owner-info for %s: %s (%d)\n", |
64 | path, strerror(errno), errno); | 65 | path, strerror(errno), errno); |
65 | return; | 66 | return; |
66 | } | 67 | } |
67 | if (base == path) | 68 | if (base == path) |
68 | p = fmt("%s", path); | 69 | p = fmt("%s", path); |
69 | else | 70 | else |
70 | p = fmt("%s", path + strlen(base) + 1); | 71 | p = fmt("%s", path + strlen(base) + 1); |
71 | 72 | ||
72 | if (!strcmp(p + strlen(p) - 5, "/.git")) | 73 | if (!strcmp(p + strlen(p) - 5, "/.git")) |
73 | p[strlen(p) - 5] = '\0'; | 74 | p[strlen(p) - 5] = '\0'; |
74 | 75 | ||
75 | repo = cgit_add_repo(xstrdup(p)); | 76 | repo = cgit_add_repo(xstrdup(p)); |
76 | repo->name = repo->url; | 77 | repo->name = repo->url; |
77 | repo->path = xstrdup(path); | 78 | repo->path = xstrdup(path); |
78 | repo->owner = (pwd ? xstrdup(pwd->pw_gecos ? pwd->pw_gecos : pwd->pw_name) : ""); | 79 | repo->owner = (pwd ? xstrdup(pwd->pw_gecos ? pwd->pw_gecos : pwd->pw_name) : ""); |
79 | 80 | ||
80 | p = fmt("%s/description", path); | 81 | p = fmt("%s/description", path); |
81 | if (!stat(p, &st)) | 82 | if (!stat(p, &st)) |
82 | repo->desc = xstrdup(readfile(p)); | 83 | repo->desc = xstrdup(readfile(p)); |
83 | 84 | ||
84 | p = fmt("%s/README.html", path); | 85 | p = fmt("%s/README.html", path); |
85 | if (!stat(p, &st)) | 86 | if (!stat(p, &st)) |
86 | repo->readme = "README.html"; | 87 | repo->readme = "README.html"; |
87 | } | 88 | } |
88 | 89 | ||
89 | static void scan_path(const char *base, const char *path) | 90 | static void scan_path(const char *base, const char *path) |
90 | { | 91 | { |
91 | DIR *dir; | 92 | DIR *dir; |
92 | struct dirent *ent; | 93 | struct dirent *ent; |