-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 | |||
@@ -60,64 +60,68 @@ static void add_repo(const char *base, const char *path) | |||
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 | } |