|
diff --git a/parsing.c b/parsing.c index 5093b8b..66e8b3d 100644 --- a/ parsing.c+++ b/ parsing.c |
|
@@ -1,186 +1,62 @@ |
1 | /* config.c: parsing of config files |
1 | /* config.c: parsing of config files |
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 | 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) |
| |
87 | { |
| |
88 | int d1, d2; |
| |
89 | if (strlen(txt) < 3) { |
| |
90 | *txt = '\0'; |
| |
91 | return txt-1; |
| |
92 | } |
| |
93 | d1 = hextoint(*(txt+1)); |
| |
94 | d2 = hextoint(*(txt+2)); |
| |
95 | if (d1<0 || d2<0) { |
| |
96 | strcpy(txt, txt+3); |
| |
97 | return txt-1; |
| |
98 | } else { |
| |
99 | *txt = d1 * 16 + d2; |
| |
100 | strcpy(txt+1, txt+3); |
| |
101 | return txt; |
| |
102 | } |
| |
103 | } |
| |
104 | |
| |
105 | int cgit_parse_query(char *txt, configfn fn) |
| |
106 | { |
| |
107 | char *t, *value = NULL, c; |
| |
108 | |
| |
109 | if (!txt) |
| |
110 | return 0; |
| |
111 | |
| |
112 | t = txt = xstrdup(txt); |
| |
113 | |
| |
114 | while((c=*t) != '\0') { |
| |
115 | if (c=='=') { |
| |
116 | *t = '\0'; |
| |
117 | value = t+1; |
| |
118 | } else if (c=='+') { |
| |
119 | *t = ' '; |
| |
120 | } else if (c=='%') { |
| |
121 | t = convert_query_hexchar(t); |
| |
122 | } else if (c=='&') { |
| |
123 | *t = '\0'; |
| |
124 | (*fn)(txt, value); |
| |
125 | txt = t+1; |
| |
126 | value = NULL; |
| |
127 | } |
| |
128 | t++; |
| |
129 | } |
| |
130 | if (t!=txt) |
| |
131 | (*fn)(txt, value); |
| |
132 | return 0; |
| |
133 | } |
| |
134 | |
| |
135 | /* |
11 | /* |
136 | * url syntax: [repo ['/' cmd [ '/' path]]] |
12 | * url syntax: [repo ['/' cmd [ '/' path]]] |
137 | * repo: any valid repo url, may contain '/' |
13 | * repo: any valid repo url, may contain '/' |
138 | * cmd: log | commit | diff | tree | view | blob | snapshot |
14 | * cmd: log | commit | diff | tree | view | blob | snapshot |
139 | * path: any valid path, may contain '/' |
15 | * path: any valid path, may contain '/' |
140 | * |
16 | * |
141 | */ |
17 | */ |
142 | void cgit_parse_url(const char *url) |
18 | void cgit_parse_url(const char *url) |
143 | { |
19 | { |
144 | char *cmd, *p; |
20 | char *cmd, *p; |
145 | |
21 | |
146 | cgit_repo = NULL; |
22 | ctx.repo = NULL; |
147 | if (!url || url[0] == '\0') |
23 | if (!url || url[0] == '\0') |
148 | return; |
24 | return; |
149 | |
25 | |
150 | cgit_repo = cgit_get_repoinfo(url); |
26 | ctx.repo = cgit_get_repoinfo(url); |
151 | if (cgit_repo) { |
27 | if (ctx.repo) { |
152 | cgit_query_repo = cgit_repo->url; |
28 | ctx.qry.repo = ctx.repo->url; |
153 | return; |
29 | return; |
154 | } |
30 | } |
155 | |
31 | |
156 | cmd = strchr(url, '/'); |
32 | cmd = strchr(url, '/'); |
157 | while (!cgit_repo && cmd) { |
33 | while (!ctx.repo && cmd) { |
158 | cmd[0] = '\0'; |
34 | cmd[0] = '\0'; |
159 | cgit_repo = cgit_get_repoinfo(url); |
35 | ctx.repo = cgit_get_repoinfo(url); |
160 | if (cgit_repo == NULL) { |
36 | if (ctx.repo == NULL) { |
161 | cmd[0] = '/'; |
37 | cmd[0] = '/'; |
162 | cmd = strchr(cmd + 1, '/'); |
38 | cmd = strchr(cmd + 1, '/'); |
163 | continue; |
39 | continue; |
164 | } |
40 | } |
165 | |
41 | |
166 | cgit_query_repo = cgit_repo->url; |
42 | ctx.qry.repo = ctx.repo->url; |
167 | p = strchr(cmd + 1, '/'); |
43 | p = strchr(cmd + 1, '/'); |
168 | if (p) { |
44 | if (p) { |
169 | p[0] = '\0'; |
45 | p[0] = '\0'; |
170 | if (p[1]) |
46 | if (p[1]) |
171 | cgit_query_path = trim_end(p + 1, '/'); |
47 | ctx.qry.path = trim_end(p + 1, '/'); |
172 | } |
48 | } |
173 | cgit_cmd = cgit_get_cmd_index(cmd + 1); |
49 | if (cmd[1]) |
174 | cgit_query_page = xstrdup(cmd + 1); |
50 | ctx.qry.page = xstrdup(cmd + 1); |
175 | return; |
51 | return; |
176 | } |
52 | } |
177 | } |
53 | } |
178 | |
54 | |
179 | char *substr(const char *head, const char *tail) |
55 | char *substr(const char *head, const char *tail) |
180 | { |
56 | { |
181 | char *buf; |
57 | char *buf; |
182 | |
58 | |
183 | buf = xmalloc(tail - head + 1); |
59 | buf = xmalloc(tail - head + 1); |
184 | strncpy(buf, head, tail - head); |
60 | strncpy(buf, head, tail - head); |
185 | buf[tail - head] = '\0'; |
61 | buf[tail - head] = '\0'; |
186 | return buf; |
62 | return buf; |
|