summaryrefslogtreecommitdiffabout
path: root/parsing.c
Unidiff
Diffstat (limited to 'parsing.c') (more/less context) (ignore whitespace changes)
-rw-r--r--parsing.c21
1 files changed, 21 insertions, 0 deletions
diff --git a/parsing.c b/parsing.c
index 1b22fcf..4173dd4 100644
--- a/parsing.c
+++ b/parsing.c
@@ -1,170 +1,191 @@
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
11int next_char(FILE *f) 11int 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
24void skip_line(FILE *f) 24void 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
32int read_config_line(FILE *f, char *line, const char **value, int bufsize) 32int 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
65int cgit_read_config(const char *filename, configfn fn) 65int 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
82char *convert_query_hexchar(char *txt)
83{
84 int d1, d2;
85 if (strlen(txt) < 3) {
86 *txt = '\0';
87 return txt-1;
88 }
89 d1 = hextoint(*(txt+1));
90 d2 = hextoint(*(txt+2));
91 if (d1<0 || d2<0) {
92 strcpy(txt, txt+3);
93 return txt-1;
94 } else {
95 *txt = d1 * 16 + d2;
96 strcpy(txt+1, txt+3);
97 return txt;
98 }
99}
100
82int cgit_parse_query(char *txt, configfn fn) 101int cgit_parse_query(char *txt, configfn fn)
83{ 102{
84 char *t, *value = NULL, c; 103 char *t, *value = NULL, c;
85 104
86 if (!txt) 105 if (!txt)
87 return 0; 106 return 0;
88 107
89 t = txt = xstrdup(txt); 108 t = txt = xstrdup(txt);
90 109
91 while((c=*t) != '\0') { 110 while((c=*t) != '\0') {
92 if (c=='=') { 111 if (c=='=') {
93 *t = '\0'; 112 *t = '\0';
94 value = t+1; 113 value = t+1;
95 } else if (c=='+') { 114 } else if (c=='+') {
96 *t = ' '; 115 *t = ' ';
116 } else if (c=='%') {
117 t = convert_query_hexchar(t);
97 } else if (c=='&') { 118 } else if (c=='&') {
98 *t = '\0'; 119 *t = '\0';
99 (*fn)(txt, value); 120 (*fn)(txt, value);
100 txt = t+1; 121 txt = t+1;
101 value = NULL; 122 value = NULL;
102 } 123 }
103 t++; 124 t++;
104 } 125 }
105 if (t!=txt) 126 if (t!=txt)
106 (*fn)(txt, value); 127 (*fn)(txt, value);
107 return 0; 128 return 0;
108} 129}
109 130
110char *substr(const char *head, const char *tail) 131char *substr(const char *head, const char *tail)
111{ 132{
112 char *buf; 133 char *buf;
113 134
114 buf = xmalloc(tail - head + 1); 135 buf = xmalloc(tail - head + 1);
115 strncpy(buf, head, tail - head); 136 strncpy(buf, head, tail - head);
116 buf[tail - head] = '\0'; 137 buf[tail - head] = '\0';
117 return buf; 138 return buf;
118} 139}
119 140
120struct commitinfo *cgit_parse_commit(struct commit *commit) 141struct commitinfo *cgit_parse_commit(struct commit *commit)
121{ 142{
122 struct commitinfo *ret; 143 struct commitinfo *ret;
123 char *p = commit->buffer, *t = commit->buffer; 144 char *p = commit->buffer, *t = commit->buffer;
124 145
125 ret = xmalloc(sizeof(*ret)); 146 ret = xmalloc(sizeof(*ret));
126 ret->commit = commit; 147 ret->commit = commit;
127 148
128 if (strncmp(p, "tree ", 5)) 149 if (strncmp(p, "tree ", 5))
129 die("Bad commit: %s", sha1_to_hex(commit->object.sha1)); 150 die("Bad commit: %s", sha1_to_hex(commit->object.sha1));
130 else 151 else
131 p += 46; // "tree " + hex[40] + "\n" 152 p += 46; // "tree " + hex[40] + "\n"
132 153
133 while (!strncmp(p, "parent ", 7)) 154 while (!strncmp(p, "parent ", 7))
134 p += 48; // "parent " + hex[40] + "\n" 155 p += 48; // "parent " + hex[40] + "\n"
135 156
136 if (!strncmp(p, "author ", 7)) { 157 if (!strncmp(p, "author ", 7)) {
137 p += 7; 158 p += 7;
138 t = strchr(p, '<') - 1; 159 t = strchr(p, '<') - 1;
139 ret->author = substr(p, t); 160 ret->author = substr(p, t);
140 p = t; 161 p = t;
141 t = strchr(t, '>') + 1; 162 t = strchr(t, '>') + 1;
142 ret->author_email = substr(p, t); 163 ret->author_email = substr(p, t);
143 ret->author_date = atol(++t); 164 ret->author_date = atol(++t);
144 p = strchr(t, '\n') + 1; 165 p = strchr(t, '\n') + 1;
145 } 166 }
146 167
147 if (!strncmp(p, "committer ", 9)) { 168 if (!strncmp(p, "committer ", 9)) {
148 p += 9; 169 p += 9;
149 t = strchr(p, '<') - 1; 170 t = strchr(p, '<') - 1;
150 ret->committer = substr(p, t); 171 ret->committer = substr(p, t);
151 p = t; 172 p = t;
152 t = strchr(t, '>') + 1; 173 t = strchr(t, '>') + 1;
153 ret->committer_email = substr(p, t); 174 ret->committer_email = substr(p, t);
154 ret->committer_date = atol(++t); 175 ret->committer_date = atol(++t);
155 p = strchr(t, '\n') + 1; 176 p = strchr(t, '\n') + 1;
156 } 177 }
157 178
158 while (*p == '\n') 179 while (*p == '\n')
159 p = strchr(p, '\n') + 1; 180 p = strchr(p, '\n') + 1;
160 181
161 t = strchr(p, '\n'); 182 t = strchr(p, '\n');
162 ret->subject = substr(p, t); 183 ret->subject = substr(p, t);
163 p = t + 1; 184 p = t + 1;
164 185
165 while (*p == '\n') 186 while (*p == '\n')
166 p = strchr(p, '\n') + 1; 187 p = strchr(p, '\n') + 1;
167 ret->msg = p; 188 ret->msg = p;
168 189
169 return ret; 190 return ret;
170} 191}