summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--Makefile4
m---------git0
-rw-r--r--shared.c2
-rw-r--r--ui-snapshot.c7
4 files changed, 7 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index eed59df..e39be18 100644
--- a/Makefile
+++ b/Makefile
@@ -1,31 +1,31 @@
1CGIT_VERSION = v0.7.1 1CGIT_VERSION = v0.7.2
2CGIT_SCRIPT_NAME = cgit.cgi 2CGIT_SCRIPT_NAME = cgit.cgi
3CGIT_SCRIPT_PATH = /var/www/htdocs/cgit 3CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
4CGIT_CONFIG = /etc/cgitrc 4CGIT_CONFIG = /etc/cgitrc
5CACHE_ROOT = /var/cache/cgit 5CACHE_ROOT = /var/cache/cgit
6SHA1_HEADER = <openssl/sha.h> 6SHA1_HEADER = <openssl/sha.h>
7GIT_VER = 1.5.3.5 7GIT_VER = 1.5.3.8
8GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 8GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
9 9
10# 10#
11# Let the user override the above settings. 11# Let the user override the above settings.
12# 12#
13-include cgit.conf 13-include cgit.conf
14 14
15 15
16EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto 16EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto
17OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \ 17OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \
18 ui-summary.o ui-log.o ui-tree.o ui-commit.o ui-diff.o \ 18 ui-summary.o ui-log.o ui-tree.o ui-commit.o ui-diff.o \
19 ui-snapshot.o ui-blob.o ui-tag.o ui-refs.o ui-patch.o 19 ui-snapshot.o ui-blob.o ui-tag.o ui-refs.o ui-patch.o
20 20
21 21
22ifdef NEEDS_LIBICONV 22ifdef NEEDS_LIBICONV
23 EXTLIBS += -liconv 23 EXTLIBS += -liconv
24endif 24endif
25 25
26 26
27.PHONY: all git test install clean distclean emptycache force-version get-git 27.PHONY: all git test install clean distclean emptycache force-version get-git
28 28
29all: cgit git 29all: cgit git
30 30
31VERSION: force-version 31VERSION: force-version
diff --git a/git b/git
Subproject 3f2a7ae2c84c921e11041a5edc2522964fc1cce Subproject aadd4efa715f56e0eac5ac459c8ff4933b56d4c
diff --git a/shared.c b/shared.c
index 9c992c8..bf0581f 100644
--- a/shared.c
+++ b/shared.c
@@ -97,49 +97,49 @@ int chk_non_negative(int result, char *msg)
97{ 97{
98 if (result < 0) 98 if (result < 0)
99 die("%s: %s",msg, strerror(errno)); 99 die("%s: %s",msg, strerror(errno));
100 return result; 100 return result;
101} 101}
102 102
103struct repoinfo *add_repo(const char *url) 103struct repoinfo *add_repo(const char *url)
104{ 104{
105 struct repoinfo *ret; 105 struct repoinfo *ret;
106 106
107 if (++cgit_repolist.count > cgit_repolist.length) { 107 if (++cgit_repolist.count > cgit_repolist.length) {
108 if (cgit_repolist.length == 0) 108 if (cgit_repolist.length == 0)
109 cgit_repolist.length = 8; 109 cgit_repolist.length = 8;
110 else 110 else
111 cgit_repolist.length *= 2; 111 cgit_repolist.length *= 2;
112 cgit_repolist.repos = xrealloc(cgit_repolist.repos, 112 cgit_repolist.repos = xrealloc(cgit_repolist.repos,
113 cgit_repolist.length * 113 cgit_repolist.length *
114 sizeof(struct repoinfo)); 114 sizeof(struct repoinfo));
115 } 115 }
116 116
117 ret = &cgit_repolist.repos[cgit_repolist.count-1]; 117 ret = &cgit_repolist.repos[cgit_repolist.count-1];
118 ret->url = trim_end(url, '/'); 118 ret->url = trim_end(url, '/');
119 ret->name = ret->url; 119 ret->name = ret->url;
120 ret->path = NULL; 120 ret->path = NULL;
121 ret->desc = NULL; 121 ret->desc = "[no description]";
122 ret->owner = NULL; 122 ret->owner = NULL;
123 ret->group = cgit_repo_group; 123 ret->group = cgit_repo_group;
124 ret->defbranch = "master"; 124 ret->defbranch = "master";
125 ret->snapshots = cgit_snapshots; 125 ret->snapshots = cgit_snapshots;
126 ret->enable_log_filecount = cgit_enable_log_filecount; 126 ret->enable_log_filecount = cgit_enable_log_filecount;
127 ret->enable_log_linecount = cgit_enable_log_linecount; 127 ret->enable_log_linecount = cgit_enable_log_linecount;
128 ret->module_link = cgit_module_link; 128 ret->module_link = cgit_module_link;
129 ret->readme = NULL; 129 ret->readme = NULL;
130 return ret; 130 return ret;
131} 131}
132 132
133struct repoinfo *cgit_get_repoinfo(const char *url) 133struct repoinfo *cgit_get_repoinfo(const char *url)
134{ 134{
135 int i; 135 int i;
136 struct repoinfo *repo; 136 struct repoinfo *repo;
137 137
138 for (i=0; i<cgit_repolist.count; i++) { 138 for (i=0; i<cgit_repolist.count; i++) {
139 repo = &cgit_repolist.repos[i]; 139 repo = &cgit_repolist.repos[i];
140 if (!strcmp(repo->url, url)) 140 if (!strcmp(repo->url, url))
141 return repo; 141 return repo;
142 } 142 }
143 return NULL; 143 return NULL;
144} 144}
145 145
diff --git a/ui-snapshot.c b/ui-snapshot.c
index 4d1aa88..dfedd8f 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -109,48 +109,49 @@ void cgit_print_snapshot(struct cacheitem *item, const char *head,
109 109
110void cgit_print_snapshot_links(const char *repo, const char *head, 110void cgit_print_snapshot_links(const char *repo, const char *head,
111 const char *hex, int snapshots) 111 const char *hex, int snapshots)
112{ 112{
113 const struct snapshot_archive_t* sat; 113 const struct snapshot_archive_t* sat;
114 char *filename; 114 char *filename;
115 int f; 115 int f;
116 116
117 for(f=0; f<snapshot_archives_len; f++) { 117 for(f=0; f<snapshot_archives_len; f++) {
118 sat = &snapshot_archives[f]; 118 sat = &snapshot_archives[f];
119 if(!(snapshots & sat->bit)) 119 if(!(snapshots & sat->bit))
120 continue; 120 continue;
121 filename = fmt("%s-%s%s", cgit_repobasename(repo), hex, 121 filename = fmt("%s-%s%s", cgit_repobasename(repo), hex,
122 sat->suffix); 122 sat->suffix);
123 cgit_snapshot_link(filename, NULL, NULL, (char *)head, 123 cgit_snapshot_link(filename, NULL, NULL, (char *)head,
124 (char *)hex, filename); 124 (char *)hex, filename);
125 html("<br/>"); 125 html("<br/>");
126 } 126 }
127} 127}
128 128
129int cgit_parse_snapshots_mask(const char *str) 129int cgit_parse_snapshots_mask(const char *str)
130{ 130{
131 const struct snapshot_archive_t* sat; 131 const struct snapshot_archive_t* sat;
132 static const char *delim = " \t,:/|;"; 132 static const char *delim = " \t,:/|;";
133 int f, tl, rv = 0; 133 int f, tl, sl, rv = 0;
134 134
135 /* favor legacy setting */ 135 /* favor legacy setting */
136 if(atoi(str)) 136 if(atoi(str))
137 return 1; 137 return 1;
138 for(;;) { 138 for(;;) {
139 str += strspn(str,delim); 139 str += strspn(str,delim);
140 tl = strcspn(str,delim); 140 tl = strcspn(str,delim);
141 if(!tl) 141 if(!tl)
142 break; 142 break;
143 for(f=0; f<snapshot_archives_len; f++) { 143 for(f=0; f<snapshot_archives_len; f++) {
144 sat = &snapshot_archives[f]; 144 sat = &snapshot_archives[f];
145 if(!(strncmp(sat->suffix, str, tl) && 145 sl = strlen(sat->suffix);
146 strncmp(sat->suffix+1, str, tl-1))) { 146 if((tl == sl && !strncmp(sat->suffix, str, tl)) ||
147 (tl == sl-1 && !strncmp(sat->suffix+1, str, tl-1))) {
147 rv |= sat->bit; 148 rv |= sat->bit;
148 break; 149 break;
149 } 150 }
150 } 151 }
151 str += tl; 152 str += tl;
152 } 153 }
153 return rv; 154 return rv;
154} 155}
155 156
156/* vim:set sw=8: */ 157/* vim:set sw=8: */