|
diff --git a/parsing.c b/parsing.c index 98b3243..6cab0e9 100644 --- a/ parsing.c+++ b/ parsing.c |
|
@@ -1,106 +1,159 @@ |
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) |
11 | int next_char(FILE *f) |
12 | { |
12 | { |
13 | int c = fgetc(f); |
13 | int c = fgetc(f); |
14 | if (c=='\r') { |
14 | if (c=='\r') { |
15 | c = fgetc(f); |
15 | c = fgetc(f); |
16 | if (c!='\n') { |
16 | if (c!='\n') { |
17 | ungetc(c, f); |
17 | ungetc(c, f); |
18 | c = '\r'; |
18 | c = '\r'; |
19 | } |
19 | } |
20 | } |
20 | } |
21 | return c; |
21 | return c; |
22 | } |
22 | } |
23 | |
23 | |
24 | void skip_line(FILE *f) |
24 | void skip_line(FILE *f) |
25 | { |
25 | { |
26 | int c; |
26 | int c; |
27 | |
27 | |
28 | while((c=next_char(f)) && c!='\n' && c!=EOF) |
28 | while((c=next_char(f)) && c!='\n' && c!=EOF) |
29 | ; |
29 | ; |
30 | } |
30 | } |
31 | |
31 | |
32 | int read_config_line(FILE *f, char *line, const char **value, int bufsize) |
32 | int read_config_line(FILE *f, char *line, const char **value, int bufsize) |
33 | { |
33 | { |
34 | int i = 0, isname = 0; |
34 | int i = 0, isname = 0; |
35 | |
35 | |
36 | *value = NULL; |
36 | *value = NULL; |
37 | while(i<bufsize-1) { |
37 | while(i<bufsize-1) { |
38 | int c = next_char(f); |
38 | int c = next_char(f); |
39 | if (!isname && (c=='#' || c==';')) { |
39 | if (!isname && (c=='#' || c==';')) { |
40 | skip_line(f); |
40 | skip_line(f); |
41 | continue; |
41 | continue; |
42 | } |
42 | } |
43 | if (!isname && isspace(c)) |
43 | if (!isname && isspace(c)) |
44 | continue; |
44 | continue; |
45 | |
45 | |
46 | if (c=='=' && !*value) { |
46 | if (c=='=' && !*value) { |
47 | line[i] = 0; |
47 | line[i] = 0; |
48 | *value = &line[i+1]; |
48 | *value = &line[i+1]; |
49 | } else if (c=='\n' && !isname) { |
49 | } else if (c=='\n' && !isname) { |
50 | i = 0; |
50 | i = 0; |
51 | continue; |
51 | continue; |
52 | } else if (c=='\n' || c==EOF) { |
52 | } else if (c=='\n' || c==EOF) { |
53 | line[i] = 0; |
53 | line[i] = 0; |
54 | break; |
54 | break; |
55 | } else { |
55 | } else { |
56 | line[i]=c; |
56 | line[i]=c; |
57 | } |
57 | } |
58 | isname = 1; |
58 | isname = 1; |
59 | i++; |
59 | i++; |
60 | } |
60 | } |
61 | line[i+1] = 0; |
61 | line[i+1] = 0; |
62 | return i; |
62 | return i; |
63 | } |
63 | } |
64 | |
64 | |
65 | int cgit_read_config(const char *filename, configfn fn) |
65 | int cgit_read_config(const char *filename, configfn fn) |
66 | { |
66 | { |
67 | int ret = 0, len; |
67 | int ret = 0, len; |
68 | char line[256]; |
68 | char line[256]; |
69 | const char *value; |
69 | const char *value; |
70 | FILE *f = fopen(filename, "r"); |
70 | FILE *f = fopen(filename, "r"); |
71 | |
71 | |
72 | if (!f) |
72 | if (!f) |
73 | return -1; |
73 | return -1; |
74 | |
74 | |
75 | while((len = read_config_line(f, line, &value, sizeof(line))) > 0) |
75 | while((len = read_config_line(f, line, &value, sizeof(line))) > 0) |
76 | (*fn)(line, value); |
76 | (*fn)(line, value); |
77 | |
77 | |
78 | fclose(f); |
78 | fclose(f); |
79 | return ret; |
79 | return ret; |
80 | } |
80 | } |
81 | |
81 | |
82 | int cgit_parse_query(char *txt, configfn fn) |
82 | int cgit_parse_query(char *txt, configfn fn) |
83 | { |
83 | { |
84 | char *t, *value = NULL, c; |
84 | char *t, *value = NULL, c; |
85 | |
85 | |
86 | if (!txt) |
86 | if (!txt) |
87 | return 0; |
87 | return 0; |
88 | |
88 | |
89 | t = txt = xstrdup(txt); |
89 | t = txt = xstrdup(txt); |
90 | |
90 | |
91 | while((c=*t) != '\0') { |
91 | while((c=*t) != '\0') { |
92 | if (c=='=') { |
92 | if (c=='=') { |
93 | *t = '\0'; |
93 | *t = '\0'; |
94 | value = t+1; |
94 | value = t+1; |
95 | } else if (c=='&') { |
95 | } else if (c=='&') { |
96 | *t = '\0'; |
96 | *t = '\0'; |
97 | (*fn)(txt, value); |
97 | (*fn)(txt, value); |
98 | txt = t+1; |
98 | txt = t+1; |
99 | value = NULL; |
99 | value = NULL; |
100 | } |
100 | } |
101 | t++; |
101 | t++; |
102 | } |
102 | } |
103 | if (t!=txt) |
103 | if (t!=txt) |
104 | (*fn)(txt, value); |
104 | (*fn)(txt, value); |
105 | return 0; |
105 | return 0; |
106 | } |
106 | } |
| |
107 | |
| |
108 | char *substr(const char *head, const char *tail) |
| |
109 | { |
| |
110 | char *buf; |
| |
111 | |
| |
112 | buf = xmalloc(tail - head + 1); |
| |
113 | strncpy(buf, head, tail - head); |
| |
114 | buf[tail - head] = '\0'; |
| |
115 | return buf; |
| |
116 | } |
| |
117 | |
| |
118 | struct commitinfo *cgit_parse_commit(struct commit *commit) |
| |
119 | { |
| |
120 | struct commitinfo *ret; |
| |
121 | char *p = commit->buffer, *t = commit->buffer; |
| |
122 | |
| |
123 | ret = xmalloc(sizeof(*ret)); |
| |
124 | ret->commit = commit; |
| |
125 | |
| |
126 | if (strncmp(p, "tree ", 5)) |
| |
127 | die("Bad commit: %s", sha1_to_hex(commit->object.sha1)); |
| |
128 | else |
| |
129 | p += 46; // "tree " + hex[40] + "\n" |
| |
130 | |
| |
131 | while (!strncmp(p, "parent ", 7)) |
| |
132 | p += 48; // "parent " + hex[40] + "\n" |
| |
133 | |
| |
134 | if (!strncmp(p, "author ", 7)) { |
| |
135 | p += 7; |
| |
136 | t = strchr(p, '<') - 1; |
| |
137 | ret->author = substr(p, t); |
| |
138 | p = strchr(p, '\n') + 1; |
| |
139 | } |
| |
140 | |
| |
141 | if (!strncmp(p, "committer ", 9)) { |
| |
142 | p += 9; |
| |
143 | t = strchr(p, '<') - 1; |
| |
144 | ret->committer = substr(p, t); |
| |
145 | p = strchr(p, '\n') + 1; |
| |
146 | } |
| |
147 | |
| |
148 | while (*p == '\n') |
| |
149 | p = strchr(p, '\n') + 1; |
| |
150 | |
| |
151 | t = strchr(p, '\n'); |
| |
152 | ret->subject = substr(p, t); |
| |
153 | |
| |
154 | while (*p == '\n') |
| |
155 | p = strchr(p, '\n') + 1; |
| |
156 | ret->msg = p; |
| |
157 | |
| |
158 | return ret; |
| |
159 | } |
|