summaryrefslogtreecommitdiffabout
path: root/scan-tree.c
authorSimon Arlott <simon@fire.lp0.eu>2009-03-07 00:06:24 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-08-18 12:27:41 (UTC)
commit011f2e9bdddcbfe65da397629bca87d167313a28 (patch) (unidiff)
tree606b84a7b0211a6c4536bb508d57d4f19d20c3ab /scan-tree.c
parent6421dc38db02eff8d3ada93e87a2f7e5292af131 (diff)
downloadcgit-011f2e9bdddcbfe65da397629bca87d167313a28.zip
cgit-011f2e9bdddcbfe65da397629bca87d167313a28.tar.gz
cgit-011f2e9bdddcbfe65da397629bca87d167313a28.tar.bz2
truncate buffer before reading empty files
If readfile() reads an empty file, fgets() won't truncate the buffer and it'll still contain the contents of the previously read file. [lh: fixed similar issue in ui-repolist.c] Signed-off-by: Simon Arlott <simon@fire.lp0.eu> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'scan-tree.c') (more/less context) (ignore whitespace changes)
-rw-r--r--scan-tree.c1
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,136 +1,137 @@
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 */
7static int is_git_dir(const char *path) 7static 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
38char *readfile(const char *path) 38char *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
50static void add_repo(const char *base, const char *path) 51static 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
89static void scan_path(const char *base, const char *path) 90static 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;
93 char *buf; 94 char *buf;
94 struct stat st; 95 struct stat st;
95 96
96 if (is_git_dir(path)) { 97 if (is_git_dir(path)) {
97 add_repo(base, path); 98 add_repo(base, path);
98 return; 99 return;
99 } 100 }
100 dir = opendir(path); 101 dir = opendir(path);
101 if (!dir) { 102 if (!dir) {
102 fprintf(stderr, "Error opening directory %s: %s (%d)\n", 103 fprintf(stderr, "Error opening directory %s: %s (%d)\n",
103 path, strerror(errno), errno); 104 path, strerror(errno), errno);
104 return; 105 return;
105 } 106 }
106 while((ent = readdir(dir)) != NULL) { 107 while((ent = readdir(dir)) != NULL) {
107 if (ent->d_name[0] == '.') { 108 if (ent->d_name[0] == '.') {
108 if (ent->d_name[1] == '\0') 109 if (ent->d_name[1] == '\0')
109 continue; 110 continue;
110 if (ent->d_name[1] == '.' && ent->d_name[2] == '\0') 111 if (ent->d_name[1] == '.' && ent->d_name[2] == '\0')
111 continue; 112 continue;
112 } 113 }
113 buf = malloc(strlen(path) + strlen(ent->d_name) + 2); 114 buf = malloc(strlen(path) + strlen(ent->d_name) + 2);
114 if (!buf) { 115 if (!buf) {
115 fprintf(stderr, "Alloc error on %s: %s (%d)\n", 116 fprintf(stderr, "Alloc error on %s: %s (%d)\n",
116 path, strerror(errno), errno); 117 path, strerror(errno), errno);
117 exit(1); 118 exit(1);
118 } 119 }
119 sprintf(buf, "%s/%s", path, ent->d_name); 120 sprintf(buf, "%s/%s", path, ent->d_name);
120 if (stat(buf, &st)) { 121 if (stat(buf, &st)) {
121 fprintf(stderr, "Error checking path %s: %s (%d)\n", 122 fprintf(stderr, "Error checking path %s: %s (%d)\n",
122 buf, strerror(errno), errno); 123 buf, strerror(errno), errno);
123 free(buf); 124 free(buf);
124 continue; 125 continue;
125 } 126 }
126 if (S_ISDIR(st.st_mode)) 127 if (S_ISDIR(st.st_mode))
127 scan_path(base, buf); 128 scan_path(base, buf);
128 free(buf); 129 free(buf);
129 } 130 }
130 closedir(dir); 131 closedir(dir);
131} 132}
132 133
133void scan_tree(const char *path) 134void scan_tree(const char *path)
134{ 135{
135 scan_path(path, path); 136 scan_path(path, path);
136} 137}