author | Lars Hjemli <hjemli@gmail.com> | 2010-06-22 14:15:48 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-06-22 14:15:48 (UTC) |
commit | 37a24e4e39737edaa5cdde501346a65eeb280e63 (patch) (unidiff) | |
tree | ff23eb0d57edf108edd1aa3e64a8d6cf70062954 /shared.c | |
parent | 47187b33be1c3de43fbed6f350ab05bc978aacd0 (diff) | |
parent | a2cbd3c30b64a26b52b2003ba6569f3c083f4092 (diff) | |
download | cgit-37a24e4e39737edaa5cdde501346a65eeb280e63.zip cgit-37a24e4e39737edaa5cdde501346a65eeb280e63.tar.gz cgit-37a24e4e39737edaa5cdde501346a65eeb280e63.tar.bz2 |
Merge branch 'jh/path-limit'
Conflicts:
cgit.h
ui-commit.c
-rw-r--r-- | shared.c | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -1,77 +1,76 @@ | |||
1 | /* shared.c: global vars + some callback functions | 1 | /* shared.c: global vars + some callback functions |
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 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | 10 | ||
11 | struct cgit_repolist cgit_repolist; | 11 | struct cgit_repolist cgit_repolist; |
12 | struct cgit_context ctx; | 12 | struct cgit_context ctx; |
13 | int cgit_cmd; | ||
14 | 13 | ||
15 | int chk_zero(int result, char *msg) | 14 | int chk_zero(int result, char *msg) |
16 | { | 15 | { |
17 | if (result != 0) | 16 | if (result != 0) |
18 | die("%s: %s", msg, strerror(errno)); | 17 | die("%s: %s", msg, strerror(errno)); |
19 | return result; | 18 | return result; |
20 | } | 19 | } |
21 | 20 | ||
22 | int chk_positive(int result, char *msg) | 21 | int chk_positive(int result, char *msg) |
23 | { | 22 | { |
24 | if (result <= 0) | 23 | if (result <= 0) |
25 | die("%s: %s", msg, strerror(errno)); | 24 | die("%s: %s", msg, strerror(errno)); |
26 | return result; | 25 | return result; |
27 | } | 26 | } |
28 | 27 | ||
29 | int chk_non_negative(int result, char *msg) | 28 | int chk_non_negative(int result, char *msg) |
30 | { | 29 | { |
31 | if (result < 0) | 30 | if (result < 0) |
32 | die("%s: %s",msg, strerror(errno)); | 31 | die("%s: %s",msg, strerror(errno)); |
33 | return result; | 32 | return result; |
34 | } | 33 | } |
35 | 34 | ||
36 | struct cgit_repo *cgit_add_repo(const char *url) | 35 | struct cgit_repo *cgit_add_repo(const char *url) |
37 | { | 36 | { |
38 | struct cgit_repo *ret; | 37 | struct cgit_repo *ret; |
39 | 38 | ||
40 | if (++cgit_repolist.count > cgit_repolist.length) { | 39 | if (++cgit_repolist.count > cgit_repolist.length) { |
41 | if (cgit_repolist.length == 0) | 40 | if (cgit_repolist.length == 0) |
42 | cgit_repolist.length = 8; | 41 | cgit_repolist.length = 8; |
43 | else | 42 | else |
44 | cgit_repolist.length *= 2; | 43 | cgit_repolist.length *= 2; |
45 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, | 44 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, |
46 | cgit_repolist.length * | 45 | cgit_repolist.length * |
47 | sizeof(struct cgit_repo)); | 46 | sizeof(struct cgit_repo)); |
48 | } | 47 | } |
49 | 48 | ||
50 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; | 49 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; |
51 | memset(ret, 0, sizeof(struct cgit_repo)); | 50 | memset(ret, 0, sizeof(struct cgit_repo)); |
52 | ret->url = trim_end(url, '/'); | 51 | ret->url = trim_end(url, '/'); |
53 | ret->name = ret->url; | 52 | ret->name = ret->url; |
54 | ret->path = NULL; | 53 | ret->path = NULL; |
55 | ret->desc = "[no description]"; | 54 | ret->desc = "[no description]"; |
56 | ret->owner = NULL; | 55 | ret->owner = NULL; |
57 | ret->section = ctx.cfg.section; | 56 | ret->section = ctx.cfg.section; |
58 | ret->defbranch = "master"; | 57 | ret->defbranch = "master"; |
59 | ret->snapshots = ctx.cfg.snapshots; | 58 | ret->snapshots = ctx.cfg.snapshots; |
60 | ret->enable_log_filecount = ctx.cfg.enable_log_filecount; | 59 | ret->enable_log_filecount = ctx.cfg.enable_log_filecount; |
61 | ret->enable_log_linecount = ctx.cfg.enable_log_linecount; | 60 | ret->enable_log_linecount = ctx.cfg.enable_log_linecount; |
62 | ret->enable_remote_branches = ctx.cfg.enable_remote_branches; | 61 | ret->enable_remote_branches = ctx.cfg.enable_remote_branches; |
63 | ret->enable_subject_links = ctx.cfg.enable_subject_links; | 62 | ret->enable_subject_links = ctx.cfg.enable_subject_links; |
64 | ret->max_stats = ctx.cfg.max_stats; | 63 | ret->max_stats = ctx.cfg.max_stats; |
65 | ret->module_link = ctx.cfg.module_link; | 64 | ret->module_link = ctx.cfg.module_link; |
66 | ret->readme = NULL; | 65 | ret->readme = NULL; |
67 | ret->mtime = -1; | 66 | ret->mtime = -1; |
68 | ret->about_filter = ctx.cfg.about_filter; | 67 | ret->about_filter = ctx.cfg.about_filter; |
69 | ret->commit_filter = ctx.cfg.commit_filter; | 68 | ret->commit_filter = ctx.cfg.commit_filter; |
70 | ret->source_filter = ctx.cfg.source_filter; | 69 | ret->source_filter = ctx.cfg.source_filter; |
71 | return ret; | 70 | return ret; |
72 | } | 71 | } |
73 | 72 | ||
74 | struct cgit_repo *cgit_get_repoinfo(const char *url) | 73 | struct cgit_repo *cgit_get_repoinfo(const char *url) |
75 | { | 74 | { |
76 | int i; | 75 | int i; |
77 | struct cgit_repo *repo; | 76 | struct cgit_repo *repo; |