-rw-r--r-- | Makefile | 1 | ||||
-rw-r--r-- | cgit.c | 5 | ||||
-rw-r--r-- | cgit.h | 1 | ||||
-rw-r--r-- | configfile.c | 87 | ||||
-rw-r--r-- | configfile.h | 8 | ||||
-rw-r--r-- | parsing.c | 75 |
6 files changed, 99 insertions, 78 deletions
@@ -48,12 +48,13 @@ endif | |||
48 | 48 | ||
49 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto | 49 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto |
50 | OBJECTS = | 50 | OBJECTS = |
51 | OBJECTS += cache.o | 51 | OBJECTS += cache.o |
52 | OBJECTS += cgit.o | 52 | OBJECTS += cgit.o |
53 | OBJECTS += cmd.o | 53 | OBJECTS += cmd.o |
54 | OBJECTS += configfile.o | ||
54 | OBJECTS += html.o | 55 | OBJECTS += html.o |
55 | OBJECTS += parsing.o | 56 | OBJECTS += parsing.o |
56 | OBJECTS += shared.o | 57 | OBJECTS += shared.o |
57 | OBJECTS += ui-blob.o | 58 | OBJECTS += ui-blob.o |
58 | OBJECTS += ui-commit.o | 59 | OBJECTS += ui-commit.o |
59 | OBJECTS += ui-diff.o | 60 | OBJECTS += ui-diff.o |
@@ -6,12 +6,13 @@ | |||
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 | #include "cache.h" | 10 | #include "cache.h" |
11 | #include "cmd.h" | 11 | #include "cmd.h" |
12 | #include "configfile.h" | ||
12 | #include "ui-shared.h" | 13 | #include "ui-shared.h" |
13 | 14 | ||
14 | const char *cgit_version = CGIT_VERSION; | 15 | const char *cgit_version = CGIT_VERSION; |
15 | 16 | ||
16 | void config_cb(const char *name, const char *value) | 17 | void config_cb(const char *name, const char *value) |
17 | { | 18 | { |
@@ -100,13 +101,13 @@ void config_cb(const char *name, const char *value) | |||
100 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { | 101 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { |
101 | if (*value == '/') | 102 | if (*value == '/') |
102 | ctx.repo->readme = xstrdup(value); | 103 | ctx.repo->readme = xstrdup(value); |
103 | else | 104 | else |
104 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); | 105 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); |
105 | } else if (!strcmp(name, "include")) | 106 | } else if (!strcmp(name, "include")) |
106 | cgit_read_config(value, config_cb); | 107 | parse_configfile(value, config_cb); |
107 | } | 108 | } |
108 | 109 | ||
109 | static void querystring_cb(const char *name, const char *value) | 110 | static void querystring_cb(const char *name, const char *value) |
110 | { | 111 | { |
111 | if (!strcmp(name,"r")) { | 112 | if (!strcmp(name,"r")) { |
112 | ctx.qry.repo = xstrdup(value); | 113 | ctx.qry.repo = xstrdup(value); |
@@ -433,13 +434,13 @@ int main(int argc, const char **argv) | |||
433 | prepare_context(&ctx); | 434 | prepare_context(&ctx); |
434 | item.st.st_mtime = time(NULL); | 435 | item.st.st_mtime = time(NULL); |
435 | cgit_repolist.length = 0; | 436 | cgit_repolist.length = 0; |
436 | cgit_repolist.count = 0; | 437 | cgit_repolist.count = 0; |
437 | cgit_repolist.repos = NULL; | 438 | cgit_repolist.repos = NULL; |
438 | 439 | ||
439 | cgit_read_config(cgit_config_env ? cgit_config_env : CGIT_CONFIG, | 440 | parse_configfile(cgit_config_env ? cgit_config_env : CGIT_CONFIG, |
440 | config_cb); | 441 | config_cb); |
441 | if (getenv("SCRIPT_NAME")) | 442 | if (getenv("SCRIPT_NAME")) |
442 | ctx.cfg.script_name = xstrdup(getenv("SCRIPT_NAME")); | 443 | ctx.cfg.script_name = xstrdup(getenv("SCRIPT_NAME")); |
443 | if (getenv("QUERY_STRING")) | 444 | if (getenv("QUERY_STRING")) |
444 | ctx.qry.raw = xstrdup(getenv("QUERY_STRING")); | 445 | ctx.qry.raw = xstrdup(getenv("QUERY_STRING")); |
445 | cgit_parse_args(argc, argv); | 446 | cgit_parse_args(argc, argv); |
@@ -211,13 +211,12 @@ extern void cgit_diff_tree(const unsigned char *old_sha1, | |||
211 | filepair_fn fn, const char *prefix); | 211 | filepair_fn fn, const char *prefix); |
212 | 212 | ||
213 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); | 213 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); |
214 | 214 | ||
215 | extern char *fmt(const char *format,...); | 215 | extern char *fmt(const char *format,...); |
216 | 216 | ||
217 | extern int cgit_read_config(const char *filename, configfn fn); | ||
218 | extern int cgit_parse_query(char *txt, configfn fn); | 217 | extern int cgit_parse_query(char *txt, configfn fn); |
219 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); | 218 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); |
220 | extern struct taginfo *cgit_parse_tag(struct tag *tag); | 219 | extern struct taginfo *cgit_parse_tag(struct tag *tag); |
221 | extern void cgit_parse_url(const char *url); | 220 | extern void cgit_parse_url(const char *url); |
222 | 221 | ||
223 | extern const char *cgit_repobasename(const char *reponame); | 222 | extern const char *cgit_repobasename(const char *reponame); |
diff --git a/configfile.c b/configfile.c new file mode 100644 index 0000000..4908058 --- a/dev/null +++ b/configfile.c | |||
@@ -0,0 +1,87 @@ | |||
1 | /* configfile.c: parsing of config files | ||
2 | * | ||
3 | * Copyright (C) 2008 Lars Hjemli | ||
4 | * | ||
5 | * Licensed under GNU General Public License v2 | ||
6 | * (see COPYING for full license text) | ||
7 | */ | ||
8 | |||
9 | #include <ctype.h> | ||
10 | #include <stdio.h> | ||
11 | #include "configfile.h" | ||
12 | |||
13 | int next_char(FILE *f) | ||
14 | { | ||
15 | int c = fgetc(f); | ||
16 | if (c=='\r') { | ||
17 | c = fgetc(f); | ||
18 | if (c!='\n') { | ||
19 | ungetc(c, f); | ||
20 | c = '\r'; | ||
21 | } | ||
22 | } | ||
23 | return c; | ||
24 | } | ||
25 | |||
26 | void skip_line(FILE *f) | ||
27 | { | ||
28 | int c; | ||
29 | |||
30 | while((c=next_char(f)) && c!='\n' && c!=EOF) | ||
31 | ; | ||
32 | } | ||
33 | |||
34 | int read_config_line(FILE *f, char *line, const char **value, int bufsize) | ||
35 | { | ||
36 | int i = 0, isname = 0; | ||
37 | |||
38 | *value = NULL; | ||
39 | while(i<bufsize-1) { | ||
40 | int c = next_char(f); | ||
41 | if (!isname && (c=='#' || c==';')) { | ||
42 | skip_line(f); | ||
43 | continue; | ||
44 | } | ||
45 | if (!isname && isspace(c)) | ||
46 | continue; | ||
47 | |||
48 | if (c=='=' && !*value) { | ||
49 | line[i] = 0; | ||
50 | *value = &line[i+1]; | ||
51 | } else if (c=='\n' && !isname) { | ||
52 | i = 0; | ||
53 | continue; | ||
54 | } else if (c=='\n' || c==EOF) { | ||
55 | line[i] = 0; | ||
56 | break; | ||
57 | } else { | ||
58 | line[i]=c; | ||
59 | } | ||
60 | isname = 1; | ||
61 | i++; | ||
62 | } | ||
63 | line[i+1] = 0; | ||
64 | return i; | ||
65 | } | ||
66 | |||
67 | int parse_configfile(const char *filename, configfile_value_fn fn) | ||
68 | { | ||
69 | static int nesting; | ||
70 | int len; | ||
71 | char line[256]; | ||
72 | const char *value; | ||
73 | FILE *f; | ||
74 | |||
75 | /* cancel deeply nested include-commands */ | ||
76 | if (nesting > 8) | ||
77 | return -1; | ||
78 | if (!(f = fopen(filename, "r"))) | ||
79 | return -1; | ||
80 | nesting++; | ||
81 | while((len = read_config_line(f, line, &value, sizeof(line))) > 0) | ||
82 | fn(line, value); | ||
83 | nesting--; | ||
84 | fclose(f); | ||
85 | return 0; | ||
86 | } | ||
87 | |||
diff --git a/configfile.h b/configfile.h new file mode 100644 index 0000000..04235e5 --- a/dev/null +++ b/configfile.h | |||
@@ -0,0 +1,8 @@ | |||
1 | #ifndef CONFIGFILE_H | ||
2 | #define CONFIGFILE_H | ||
3 | |||
4 | typedef void (*configfile_value_fn)(const char *name, const char *value); | ||
5 | |||
6 | extern int parse_configfile(const char *filename, configfile_value_fn fn); | ||
7 | |||
8 | #endif /* CONFIGFILE_H */ | ||
@@ -5,87 +5,12 @@ | |||
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 | int next_char(FILE *f) | ||
12 | { | ||
13 | int c = fgetc(f); | ||
14 | if (c=='\r') { | ||
15 | c = fgetc(f); | ||
16 | if (c!='\n') { | ||
17 | ungetc(c, f); | ||
18 | c = '\r'; | ||
19 | } | ||
20 | } | ||
21 | return c; | ||
22 | } | ||
23 | |||
24 | void skip_line(FILE *f) | ||
25 | { | ||
26 | int c; | ||
27 | |||
28 | while((c=next_char(f)) && c!='\n' && c!=EOF) | ||
29 | ; | ||
30 | } | ||
31 | |||
32 | int read_config_line(FILE *f, char *line, const char **value, int bufsize) | ||
33 | { | ||
34 | int i = 0, isname = 0; | ||
35 | |||
36 | *value = NULL; | ||
37 | while(i<bufsize-1) { | ||
38 | int c = next_char(f); | ||
39 | if (!isname && (c=='#' || c==';')) { | ||
40 | skip_line(f); | ||
41 | continue; | ||
42 | } | ||
43 | if (!isname && isspace(c)) | ||
44 | continue; | ||
45 | |||
46 | if (c=='=' && !*value) { | ||
47 | line[i] = 0; | ||
48 | *value = &line[i+1]; | ||
49 | } else if (c=='\n' && !isname) { | ||
50 | i = 0; | ||
51 | continue; | ||
52 | } else if (c=='\n' || c==EOF) { | ||
53 | line[i] = 0; | ||
54 | break; | ||
55 | } else { | ||
56 | line[i]=c; | ||
57 | } | ||
58 | isname = 1; | ||
59 | i++; | ||
60 | } | ||
61 | line[i+1] = 0; | ||
62 | return i; | ||
63 | } | ||
64 | |||
65 | int cgit_read_config(const char *filename, configfn fn) | ||
66 | { | ||
67 | static int nesting; | ||
68 | int len; | ||
69 | char line[256]; | ||
70 | const char *value; | ||
71 | FILE *f; | ||
72 | |||
73 | /* cancel deeply nested include-commands */ | ||
74 | if (nesting > 8) | ||
75 | return -1; | ||
76 | if (!(f = fopen(filename, "r"))) | ||
77 | return -1; | ||
78 | nesting++; | ||
79 | while((len = read_config_line(f, line, &value, sizeof(line))) > 0) | ||
80 | (*fn)(line, value); | ||
81 | nesting--; | ||
82 | fclose(f); | ||
83 | return 0; | ||
84 | } | ||
85 | |||
86 | char *convert_query_hexchar(char *txt) | 11 | char *convert_query_hexchar(char *txt) |
87 | { | 12 | { |
88 | int d1, d2; | 13 | int d1, d2; |
89 | if (strlen(txt) < 3) { | 14 | if (strlen(txt) < 3) { |
90 | *txt = '\0'; | 15 | *txt = '\0'; |
91 | return txt-1; | 16 | return txt-1; |