author | Lars Hjemli <hjemli@gmail.com> | 2008-03-27 23:09:11 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-03-27 23:09:11 (UTC) |
commit | 20a33548b9a87a6eb23162ee5d137daa46d78613 (patch) (unidiff) | |
tree | 9c4ca364df64dcce640a531c7f515ee48bc99387 /parsing.c | |
parent | ee4056bd2c902a12dea67874368863fe60ea5a5f (diff) | |
download | cgit-20a33548b9a87a6eb23162ee5d137daa46d78613.zip cgit-20a33548b9a87a6eb23162ee5d137daa46d78613.tar.gz cgit-20a33548b9a87a6eb23162ee5d137daa46d78613.tar.bz2 |
Move function for configfile parsing into configfile.[ch]
This is a generic function which wanted its own little object file.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | parsing.c | 75 |
1 files changed, 0 insertions, 75 deletions
@@ -1,101 +1,26 @@ | |||
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) | 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; |
92 | } | 17 | } |
93 | d1 = hextoint(*(txt+1)); | 18 | d1 = hextoint(*(txt+1)); |
94 | d2 = hextoint(*(txt+2)); | 19 | d2 = hextoint(*(txt+2)); |
95 | if (d1<0 || d2<0) { | 20 | if (d1<0 || d2<0) { |
96 | strcpy(txt, txt+3); | 21 | strcpy(txt, txt+3); |
97 | return txt-1; | 22 | return txt-1; |
98 | } else { | 23 | } else { |
99 | *txt = d1 * 16 + d2; | 24 | *txt = d1 * 16 + d2; |
100 | strcpy(txt+1, txt+3); | 25 | strcpy(txt+1, txt+3); |
101 | return txt; | 26 | return txt; |