| -rw-r--r-- | Makefile | 15 | ||||
| -rw-r--r-- | cgit.c | 9 | ||||
| -rw-r--r-- | cgit.css | 5 | ||||
| -rw-r--r-- | cgit.h | 1 | ||||
| -rw-r--r-- | cgitrc.5.txt | 15 | ||||
| -rwxr-xr-x | filters/syntax-highlighting.sh | 29 | ||||
| -rw-r--r-- | shared.c | 17 | ||||
| -rw-r--r-- | ui-repolist.c | 2 | ||||
| -rw-r--r-- | ui-shared.c | 11 | ||||
| -rw-r--r-- | ui-shared.h | 1 | ||||
| -rw-r--r-- | ui-tag.c | 24 | ||||
| -rw-r--r-- | ui-tree.c | 6 |
12 files changed, 41 insertions, 94 deletions
@@ -11,9 +11,6 @@ INSTALL = install # Define NO_STRCASESTR if you don't have strcasestr. # -# Define NO_OPENSSL to disable linking with OpenSSL and use bundled SHA1 -# implementation (slower). -# # Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin). # @@ -71,7 +68,7 @@ endif $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< -EXTLIBS = git/libgit.a git/xdiff/lib.a -lz +EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto OBJECTS = OBJECTS += cache.o OBJECTS += cgit.o @@ -127,12 +124,6 @@ endif ifdef NO_STRCASESTR CFLAGS += -DNO_STRCASESTR endif -ifdef NO_OPENSSL - CFLAGS += -DNO_OPENSSL - GIT_OPTIONS += NO_OPENSSL=1 -else - EXTLIBS += -lcrypto -endif cgit: $(OBJECTS) libgit $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) @@ -142,8 +133,8 @@ cgit.o: VERSION -include $(OBJECTS:.o=.d) libgit: - $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) libgit.a - $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) xdiff/lib.a + $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 libgit.a + $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 xdiff/lib.a test: all $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all @@ -68,9 +68,9 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value) repo->section = xstrdup(value); else if (!strcmp(name, "readme") && value != NULL) { if (*value == '/') - repo->readme = xstrdup(value); + ctx.repo->readme = xstrdup(value); else - repo->readme = xstrdup(fmt("%s/%s", repo->path, value)); + ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); } else if (ctx.cfg.enable_filter_overrides) { if (!strcmp(name, "about-filter")) repo->about_filter = new_filter(value, 0); @@ -165,8 +165,6 @@ void config_cb(const char *name, const char *value) ctx.cfg.max_msg_len = atoi(value); else if (!strcmp(name, "max-repodesc-length")) ctx.cfg.max_repodesc_len = atoi(value); - else if (!strcmp(name, "max-blob-size")) - ctx.cfg.max_blob_size = atoi(value); else if (!strcmp(name, "max-repo-count")) ctx.cfg.max_repo_count = atoi(value); else if (!strcmp(name, "max-commit-count")) @@ -213,8 +211,6 @@ static void querystring_cb(const char *name, const char *value) } else if (!strcmp(name, "p")) { ctx.qry.page = xstrdup(value); } else if (!strcmp(name, "url")) { - if (*value == '/') - value++; ctx.qry.url = xstrdup(value); cgit_parse_url(value); } else if (!strcmp(name, "qt")) { @@ -276,7 +272,6 @@ static void prepare_context(struct cgit_context *ctx) ctx->cfg.max_lock_attempts = 5; ctx->cfg.max_msg_len = 80; ctx->cfg.max_repodesc_len = 80; - ctx->cfg.max_blob_size = 0; ctx->cfg.max_stats = 0; ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; ctx->cfg.renamelimit = -1; @@ -162,11 +162,6 @@ table.list td a { color: black; } -table.list td a.ls-dir { - font-weight: bold; - color: #00f; -} - table.list td a:hover { color: #00f; } @@ -186,7 +186,6 @@ struct cgit_config { int max_lock_attempts; int max_msg_len; int max_repodesc_len; - int max_blob_size; int max_stats; int nocache; int noplainemail; diff --git a/cgitrc.5.txt b/cgitrc.5.txt index 70e4c78..252d546 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt @@ -1,6 +1,3 @@ -:man source: cgit -:man manual: cgit - CGITRC(5) ======== @@ -177,10 +174,6 @@ max-repodesc-length:: Specifies the maximum number of repo description characters to display on the repository index page. Default value: "80". -max-blob-size:: - Specifies the maximum size of a blob to display HTML for in KBytes. - Default value: "0" (limit disabled). - max-stats:: Set the default maximum statistics period. Valid values are "week", "month", "quarter" and "year". If unspecified, statistics are @@ -432,8 +425,8 @@ mimetype.svg=image/svg+xml ## ## List of repositories. -## PS: Any repositories listed when section is unset will not be -## displayed under a section heading +## PS: Any repositories listed when repo.group is unset will not be +## displayed under a group heading ## PPS: This list could be kept in a different file (e.g. '/etc/cgitrepos') ## and included like this: ## include=/etc/cgitrepos @@ -455,7 +448,7 @@ repo.readme=info/web/about.html # The next repositories will be displayed under the 'extras' heading -section=extras +repo.group=extras repo.url=baz @@ -468,7 +461,7 @@ repo.desc=the wizard of foo # Add some mirrored repositories -section=mirrors +repo.group=mirrors repo.url=git diff --git a/filters/syntax-highlighting.sh b/filters/syntax-highlighting.sh index 6b1c576..999ad0c 100755 --- a/filters/syntax-highlighting.sh +++ b/filters/syntax-highlighting.sh @@ -3,10 +3,6 @@ # tree-view by refering to this file with the source-filter or repo.source- # filter options in cgitrc. # -# This script requires a shell supporting the ${var##pattern} syntax. -# It is supported by at least dash and bash, however busybox environments -# might have to use an external call to sed instead. -# # Note: the highlight command (http://www.andre-simon.de/) uses css for syntax # highlighting, so you'll probably want something like the following included # in your css file (generated by highlight 2.4.8 and adapted for cgit): @@ -24,11 +20,20 @@ # table.blob .kwc { color:#000000; font-weight:bold; } # table.blob .kwd { color:#010181; } -# store filename and extension in local vars -BASENAME="$1" -EXTENSION="${BASENAME##*.}" - -# map Makefile and Makefile.* to .mk -[ "${BASENAME%%.*}" == "Makefile" ] && EXTENSION=mk - -exec highlight --force -f -I -X -S $EXTENSION 2>/dev/null +case "$1" in + *.c) + highlight -f -I -X -S c + ;; + *.h) + highlight -f -I -X -S c + ;; + *.sh) + highlight -f -I -X -S sh + ;; + *.css) + highlight -f -I -X -S css + ;; + *) + highlight -f -I -X -S txt + ;; +esac @@ -400,25 +400,18 @@ int cgit_close_filter(struct cgit_filter *filter) */ int readfile(const char *path, char **buf, size_t *size) { - int fd, e; + int fd; struct stat st; fd = open(path, O_RDONLY); if (fd == -1) return errno; - if (fstat(fd, &st)) { - e = errno; - close(fd); - return e; - } - if (!S_ISREG(st.st_mode)) { - close(fd); + if (fstat(fd, &st)) + return errno; + if (!S_ISREG(st.st_mode)) return EISDIR; - } *buf = xmalloc(st.st_size + 1); *size = read_in_full(fd, *buf, st.st_size); - e = errno; (*buf)[*size] = '\0'; - close(fd); - return (*size == st.st_size ? 0 : e); + return (*size == st.st_size ? 0 : errno); } diff --git a/ui-repolist.c b/ui-repolist.c index 0a0b6ca..3ef2e99 100644 --- a/ui-repolist.c +++ b/ui-repolist.c @@ -94,7 +94,7 @@ int is_in_url(struct cgit_repo *repo) void print_sort_header(const char *title, const char *sort) { - htmlf("<th class='left'><a href='%s?s=%s", cgit_rooturl(), sort); + htmlf("<th class='left'><a href='./?s=%s", sort); if (ctx.qry.search) { html("&q="); html_url_arg(ctx.qry.search); diff --git a/ui-shared.c b/ui-shared.c index 08ea003..de55eff 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -20,7 +20,7 @@ static char *http_date(time_t t) {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; static char month[][4] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", - "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; + "Jul", "Aug", "Sep", "Oct", "Now", "Dec"}; struct tm *tm = gmtime(&t); return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday], tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year, @@ -782,18 +782,13 @@ void cgit_print_snapshot_links(const char *repo, const char *head, const char *hex, int snapshots) { const struct cgit_snapshot_format* f; - char *prefix; char *filename; - unsigned char sha1[20]; - if (get_sha1(fmt("refs/tags/%s", hex), sha1) == 0 && - (hex[0] == 'v' || hex[0] == 'V') && isdigit(hex[1])) - hex++; - prefix = xstrdup(fmt("%s-%s", cgit_repobasename(repo), hex)); for (f = cgit_snapshot_formats; f->suffix; f++) { if (!(snapshots & f->bit)) continue; - filename = fmt("%s%s", prefix, f->suffix); + filename = fmt("%s-%s%s", cgit_repobasename(repo), hex, + f->suffix); cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename); html("<br/>"); } diff --git a/ui-shared.h b/ui-shared.h index 9ebc1f9..166246d 100644 --- a/ui-shared.h +++ b/ui-shared.h @@ -3,7 +3,6 @@ extern char *cgit_httpscheme(); extern char *cgit_hosturl(); -extern char *cgit_rooturl(); extern char *cgit_repourl(const char *reponame); extern char *cgit_fileurl(const char *reponame, const char *pagename, const char *filename, const char *query); @@ -30,14 +30,6 @@ static void print_tag_content(char *buf) } } -void print_download_links(char *revname) -{ - html("<tr><th>download</th><td class='sha1'>"); - cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head, - revname, ctx.repo->snapshots); - html("</td></tr>"); -} - void cgit_print_tag(char *revname) { unsigned char sha1[20]; @@ -64,16 +56,16 @@ void cgit_print_tag(char *revname) return; } html("<table class='commit-info'>\n"); - htmlf("<tr><td>tag name</td><td>"); + htmlf("<tr><td>Tag name</td><td>"); html_txt(revname); htmlf(" (%s)</td></tr>\n", sha1_to_hex(sha1)); if (info->tagger_date > 0) { - html("<tr><td>tag date</td><td>"); + html("<tr><td>Tag date</td><td>"); cgit_print_date(info->tagger_date, FMT_LONGDATE, ctx.cfg.local_time); html("</td></tr>\n"); } if (info->tagger) { - html("<tr><td>tagged by</td><td>"); + html("<tr><td>Tagged by</td><td>"); html_txt(info->tagger); if (info->tagger_email && !ctx.cfg.noplainemail) { html(" "); @@ -81,23 +73,19 @@ void cgit_print_tag(char *revname) } html("</td></tr>\n"); } - html("<tr><td>tagged object</td><td class='sha1'>"); + html("<tr><td>Tagged object</td><td>"); cgit_object_link(tag->tagged); html("</td></tr>\n"); - if (ctx.repo->snapshots) - print_download_links(revname); html("</table>\n"); print_tag_content(info->msg); } else { html("<table class='commit-info'>\n"); - htmlf("<tr><td>tag name</td><td>"); + htmlf("<tr><td>Tag name</td><td>"); html_txt(revname); html("</td></tr>\n"); - html("<tr><td>Tagged object</td><td class='sha1'>"); + html("<tr><td>Tagged object</td><td>"); cgit_object_link(obj); html("</td></tr>\n"); - if (ctx.repo->snapshots) - print_download_links(revname); html("</table>\n"); } return; @@ -107,12 +107,6 @@ static void print_object(const unsigned char *sha1, char *path, const char *base curr_rev, path); htmlf(")<br/>blob: %s\n", sha1_to_hex(sha1)); - if (ctx.cfg.max_blob_size && size / 1024 > ctx.cfg.max_blob_size) { - htmlf("<div class='error'>blob size (%dKB) exceeds display size limit (%dKB).</div>", - size / 1024, ctx.cfg.max_blob_size); - return; - } - if (buffer_is_binary(buf, size)) print_binary_buffer(buf, size); else |