summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--scan-tree.c1
-rw-r--r--ui-repolist.c1
2 files changed, 2 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,108 +1,109 @@
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')
diff --git a/ui-repolist.c b/ui-repolist.c
index 2c13d50..3aedde5 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -1,89 +1,90 @@
1/* ui-repolist.c: functions for generating the repolist page 1/* ui-repolist.c: functions for generating the repolist page
2 * 2 *
3 * Copyright (C) 2006 Lars Hjemli 3 * Copyright (C) 2006 Lars Hjemli
4 * 4 *
5 * Licensed under GNU General Public License v2 5 * Licensed under GNU General Public License v2
6 * (see COPYING for full license text) 6 * (see COPYING for full license text)
7 */ 7 */
8 8
9/* This is needed for strcasestr to be defined by <string.h> */ 9/* This is needed for strcasestr to be defined by <string.h> */
10#define _GNU_SOURCE 1 10#define _GNU_SOURCE 1
11#include <string.h> 11#include <string.h>
12 12
13#include <time.h> 13#include <time.h>
14 14
15#include "cgit.h" 15#include "cgit.h"
16#include "html.h" 16#include "html.h"
17#include "ui-shared.h" 17#include "ui-shared.h"
18 18
19time_t read_agefile(char *path) 19time_t read_agefile(char *path)
20{ 20{
21 FILE *f; 21 FILE *f;
22 static char buf[64], buf2[64]; 22 static char buf[64], buf2[64];
23 23
24 if (!(f = fopen(path, "r"))) 24 if (!(f = fopen(path, "r")))
25 return -1; 25 return -1;
26 buf[0] = 0;
26 if (fgets(buf, sizeof(buf), f) == NULL) 27 if (fgets(buf, sizeof(buf), f) == NULL)
27 return -1; 28 return -1;
28 fclose(f); 29 fclose(f);
29 if (parse_date(buf, buf2, sizeof(buf2))) 30 if (parse_date(buf, buf2, sizeof(buf2)))
30 return strtoul(buf2, NULL, 10); 31 return strtoul(buf2, NULL, 10);
31 else 32 else
32 return 0; 33 return 0;
33} 34}
34 35
35static int get_repo_modtime(const struct cgit_repo *repo, time_t *mtime) 36static int get_repo_modtime(const struct cgit_repo *repo, time_t *mtime)
36{ 37{
37 char *path; 38 char *path;
38 struct stat s; 39 struct stat s;
39 struct cgit_repo *r = (struct cgit_repo *)repo; 40 struct cgit_repo *r = (struct cgit_repo *)repo;
40 41
41 if (repo->mtime != -1) { 42 if (repo->mtime != -1) {
42 *mtime = repo->mtime; 43 *mtime = repo->mtime;
43 return 1; 44 return 1;
44 } 45 }
45 path = fmt("%s/%s", repo->path, ctx.cfg.agefile); 46 path = fmt("%s/%s", repo->path, ctx.cfg.agefile);
46 if (stat(path, &s) == 0) { 47 if (stat(path, &s) == 0) {
47 *mtime = read_agefile(path); 48 *mtime = read_agefile(path);
48 r->mtime = *mtime; 49 r->mtime = *mtime;
49 return 1; 50 return 1;
50 } 51 }
51 52
52 path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch); 53 path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch);
53 if (stat(path, &s) == 0) 54 if (stat(path, &s) == 0)
54 *mtime = s.st_mtime; 55 *mtime = s.st_mtime;
55 else 56 else
56 *mtime = 0; 57 *mtime = 0;
57 58
58 r->mtime = *mtime; 59 r->mtime = *mtime;
59 return (r->mtime != 0); 60 return (r->mtime != 0);
60} 61}
61 62
62static void print_modtime(struct cgit_repo *repo) 63static void print_modtime(struct cgit_repo *repo)
63{ 64{
64 time_t t; 65 time_t t;
65 if (get_repo_modtime(repo, &t)) 66 if (get_repo_modtime(repo, &t))
66 cgit_print_age(t, -1, NULL); 67 cgit_print_age(t, -1, NULL);
67} 68}
68 69
69int is_match(struct cgit_repo *repo) 70int is_match(struct cgit_repo *repo)
70{ 71{
71 if (!ctx.qry.search) 72 if (!ctx.qry.search)
72 return 1; 73 return 1;
73 if (repo->url && strcasestr(repo->url, ctx.qry.search)) 74 if (repo->url && strcasestr(repo->url, ctx.qry.search))
74 return 1; 75 return 1;
75 if (repo->name && strcasestr(repo->name, ctx.qry.search)) 76 if (repo->name && strcasestr(repo->name, ctx.qry.search))
76 return 1; 77 return 1;
77 if (repo->desc && strcasestr(repo->desc, ctx.qry.search)) 78 if (repo->desc && strcasestr(repo->desc, ctx.qry.search))
78 return 1; 79 return 1;
79 if (repo->owner && strcasestr(repo->owner, ctx.qry.search)) 80 if (repo->owner && strcasestr(repo->owner, ctx.qry.search))
80 return 1; 81 return 1;
81 return 0; 82 return 0;
82} 83}
83 84
84int is_in_url(struct cgit_repo *repo) 85int is_in_url(struct cgit_repo *repo)
85{ 86{
86 if (!ctx.qry.url) 87 if (!ctx.qry.url)
87 return 1; 88 return 1;
88 if (repo->url && !prefixcmp(repo->url, ctx.qry.url)) 89 if (repo->url && !prefixcmp(repo->url, ctx.qry.url))
89 return 1; 90 return 1;