/[public]/psiconv/trunk/lib/psiconv/configuration.c
ViewVC logotype

Diff of /psiconv/trunk/lib/psiconv/configuration.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 180 Revision 218
1/* 1/*
2 configuration.c - Part of psiconv, a PSION 5 file formats converter 2 configuration.c - Part of psiconv, a PSION 5 file formats converter
3 Copyright (c) 1999, 2000,2003 Frodo Looijaard <frodol@dds.nl> 3 Copyright (c) 1999-2004 Frodo Looijaard <frodol@dds.nl>
4 4
5 This program is free software; you can redistribute it and/or modify 5 This program is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 6 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or 7 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 8 (at your option) any later version.
… …
16 along with this program; if not, write to the Free Software 16 along with this program; if not, write to the Free Software
17 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 17 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
18*/ 18*/
19 19
20#include "config.h" 20#include "config.h"
21#include "compat.h"
21#include "error.h" 22#include "error.h"
22#include "compat.h" 23#include "unicode.h"
23 24
24#include <stdio.h> 25#include <stdio.h>
25#include <stdlib.h> 26#include <stdlib.h>
26#include <string.h> 27#include <string.h>
28#include <strings.h>
27#include <sys/types.h> 29#include <sys/types.h>
28#include <sys/stat.h> 30#include <sys/stat.h>
29#include <unistd.h> 31#include <unistd.h>
30#include <fcntl.h> 32#include <fcntl.h>
31 33
… …
34#ifdef DMALLOC 36#ifdef DMALLOC
35#include <dmalloc.h> 37#include <dmalloc.h>
36#endif 38#endif
37 39
38#ifndef CONFIGURATION_SEARCH_PATH 40#ifndef CONFIGURATION_SEARCH_PATH
39#define CONFIGURATION_SEARCH_PATH "/etc/psiconv.conf:~/.psiconv.conf" 41#define CONFIGURATION_SEARCH_PATH PSICONVETCDIR "/psiconv.conf:~/.psiconv.conf"
40#endif 42#endif
41static struct psiconv_config_s default_config = 43static struct psiconv_config_s default_config =
42 { PSICONV_VERB_WARN, 2, 0,0,0,psiconv_bool_false,NULL }; 44 { PSICONV_VERB_WARN, 2, 0,0,0,psiconv_bool_false,NULL,'?','?',{ 0 },psiconv_bool_false };
43 45
44static void psiconv_config_parse_statement(const char *filename, 46static void psiconv_config_parse_statement(const char *filename,
45 int linenr, 47 int linenr,
46 const char *var, int value, 48 const char *var, int value,
47 psiconv_config *config); 49 psiconv_config *config);
… …
55psiconv_config psiconv_config_default(void) 57psiconv_config psiconv_config_default(void)
56{ 58{
57 psiconv_config result; 59 psiconv_config result;
58 result = malloc(sizeof(*result)); 60 result = malloc(sizeof(*result));
59 *result = default_config; 61 *result = default_config;
62 psiconv_unicode_select_characterset(result,1);
60 return result; 63 return result;
64}
65
66void psiconv_config_free(psiconv_config config)
67{
68 free(config);
61} 69}
62 70
63void psiconv_config_parse_statement(const char *filename, 71void psiconv_config_parse_statement(const char *filename,
64 int linenr, 72 int linenr,
65 const char *var, int value, 73 const char *var, int value,
66 psiconv_config *config) 74 psiconv_config *config)
67{ 75{
76 int charnr;
77
68 if (!(strcasecmp(var,"verbosity"))) { 78 if (!(strcasecmp(var,"verbosity"))) {
69 if ((value >= 1) && (value <= 4)) 79 if ((value >= 1) && (value <= 5))
70 (*config)->verbosity = value; 80 (*config)->verbosity = value;
71 else 81 else
72 psiconv_fatal(*config,0,0,"Configuration file %s, line %d: " 82 psiconv_error(*config,0,0,"Configuration file %s, line %d: "
73 "Verbosity should be between 1 and 4",filename,linenr); 83 "Verbosity should be between 1 and 5",filename,linenr);
74 } else if (!(strcasecmp(var,"color"))) { 84 } else if (!(strcasecmp(var,"color"))) {
75 if ((value == 0) || (value == 1)) 85 if ((value == 0) || (value == 1))
76 (*config)->color = value; 86 (*config)->color = value;
77 else 87 else
78 psiconv_fatal(*config,0,0,"Configuration file %s, line %d: " 88 psiconv_error(*config,0,0,"Configuration file %s, line %d: "
79 "Color should be 0 or 1",filename,linenr); 89 "Color should be 0 or 1",filename,linenr);
80 } else if (!(strcasecmp(var,"colordepth"))) { 90 } else if (!(strcasecmp(var,"colordepth"))) {
81 if ((value > 0) && (value <= 32)) 91 if ((value > 0) && (value <= 32))
82 (*config)->colordepth = value; 92 (*config)->colordepth = value;
83 else 93 else
84 psiconv_fatal(*config,0,0,"Configuration file %s, line %d: " 94 psiconv_error(*config,0,0,"Configuration file %s, line %d: "
85 "ColorDepth should be between 1 and 32",filename,linenr); 95 "ColorDepth should be between 1 and 32",filename,linenr);
86 } else if (!(strcasecmp(var,"redbits"))) { 96 } else if (!(strcasecmp(var,"redbits"))) {
87 if ((value >= 0) && (value <= 32)) 97 if ((value >= 0) && (value <= 32))
88 (*config)->redbits = value; 98 (*config)->redbits = value;
89 else 99 else
90 psiconv_fatal(*config,0,0,"Configuration file %s, line %d: " 100 psiconv_error(*config,0,0,"Configuration file %s, line %d: "
91 "RedBits should be between 1 and 32 or 0",filename,linenr); 101 "RedBits should be between 1 and 32 or 0",filename,linenr);
92 } else if (!(strcasecmp(var,"greenbits"))) { 102 } else if (!(strcasecmp(var,"greenbits"))) {
93 if ((value >= 0) && (value <= 32)) 103 if ((value >= 0) && (value <= 32))
94 (*config)->greenbits = value; 104 (*config)->greenbits = value;
95 else 105 else
96 psiconv_fatal(*config,0,0,"Configuration file %s, line %d: " 106 psiconv_error(*config,0,0,"Configuration file %s, line %d: "
97 "GreenBits should be between 1 and 32 or 0",filename,linenr); 107 "GreenBits should be between 1 and 32 or 0",filename,linenr);
98 } else if (!(strcasecmp(var,"bluebits"))) { 108 } else if (!(strcasecmp(var,"bluebits"))) {
99 if ((value >= 0) && (value <= 32)) 109 if ((value >= 0) && (value <= 32))
100 (*config)->bluebits = value; 110 (*config)->bluebits = value;
101 else 111 else
102 psiconv_fatal(*config,0,0,"Configuration file %s, line %d: " 112 psiconv_error(*config,0,0,"Configuration file %s, line %d: "
103 "BlueBits should be between 1 and 32 or 0",filename,linenr); 113 "BlueBits should be between 1 and 32 or 0",filename,linenr);
114 } else if (!(strcasecmp(var,"characterset"))) {
115 if ((value >= 0) && (value <= 1))
116 psiconv_unicode_select_characterset(*config,value);
117 else
118 psiconv_error(*config,0,0,"Configuration file %s, line %d: "
119 "CharacterSet should be between 0 and 1",
120 filename,linenr);
121 } else if (!(strcasecmp(var,"unknownunicodechar"))) {
122 if ((value >= 1) && (value < 0x10000))
123 (*config)->unknown_unicode_char = value;
124 else
125 psiconv_error(*config,0,0,"Configuration file %s, line %d: "
126 "UnknownUnicodeChar should be between 1 and 65535",
127 filename,linenr);
128 } else if (!(strcasecmp(var,"unknownepocchar"))) {
129 if ((value >= 1) && (value < 0x100))
130 (*config)->unknown_epoc_char = value;
131 else
132 psiconv_error(*config,0,0,"Configuration file %s, line %d: "
133 "UnknownEPOCChar should be between 1 and 255",
134 filename,linenr);
135 } else if (sscanf(var,"char%d",&charnr) == strlen(var)) {
136 if ((charnr < 0) || (charnr > 255))
137 psiconv_error(*config,0,0,"Configuration file %s, line %d: "
138 "CharXXX should have XXX between 0 and 255",
139 filename,linenr);
140 if ((value >= 1) && (value <= 0x10000))
141 (*config)->unicode_table[charnr] = value;
142 else
143 psiconv_error(*config,0,0,"Configuration file %s, line %d: "
144 "CharXXX should be between 1 and 65535",
145 filename,linenr);
104 } else { 146 } else {
105 psiconv_fatal(*config,0,0,"Configuration file %s, line %d: " 147 psiconv_error(*config,0,0,"Configuration file %s, line %d: "
106 "Unknown variable %s",filename,linenr,var); 148 "Unknown variable %s",filename,linenr,var);
107 } 149 }
108 psiconv_debug(*config,0,0,"Configuration file %s, line %d: " 150 psiconv_debug(*config,0,0,"Configuration file %s, line %d: "
109 "Set variable %s to %d",filename,linenr,var,value); 151 "Set variable %s to %d",filename,linenr,var,value);
110} 152}
… …
126 return; 168 return;
127 eovar = sovar; 169 eovar = sovar;
128 while (line[eovar] && (((line[eovar] >= 'A') && (line[eovar] <= 'Z')) || 170 while (line[eovar] && (((line[eovar] >= 'A') && (line[eovar] <= 'Z')) ||
129 ((line[eovar] >= 'a') && (line[eovar] <= 'z')))) 171 ((line[eovar] >= 'a') && (line[eovar] <= 'z'))))
130 eovar ++; 172 eovar ++;
131 if (sovar == eovar) 173 if (sovar == eovar) {
132 psiconv_fatal(*config,0,0,"Configuration file %s, line %d: " 174 psiconv_error(*config,0,0,"Configuration file %s, line %d: "
133 "Syntax error (no variable found)",filename,linenr); 175 "Syntax error (no variable found)",filename,linenr);
176 return;
177 }
134 soval = eovar; 178 soval = eovar;
135 while (line[soval] && (line[soval] <= 32)) 179 while (line[soval] && (line[soval] <= 32))
136 soval ++; 180 soval ++;
137 if (line[soval] != '=') 181 if (line[soval] != '=') {
138 psiconv_fatal(*config,0,0,"Configuration file %s, line %d: " 182 psiconv_error(*config,0,0,"Configuration file %s, line %d: "
139 "Syntax error (no = token found)",filename,linenr); 183 "Syntax error (no = token found)",filename,linenr);
184 return;
185 }
140 soval ++; 186 soval ++;
141 while (line[soval] && (line[soval] <= 32)) 187 while (line[soval] && (line[soval] <= 32))
142 soval ++; 188 soval ++;
143 eoval = soval; 189 eoval = soval;
144 while (line[eoval] && ((line[eoval] >= '0') && (line[eovar] <= '9'))) 190 while (line[eoval] && ((line[eoval] >= '0') && (line[eovar] <= '9')))
145 eoval ++; 191 eoval ++;
146 if (eoval == soval) 192 if (eoval == soval) {
147 psiconv_fatal(*config,0,0,"Configuration file %s, line %d: " 193 psiconv_error(*config,0,0,"Configuration file %s, line %d: "
148 "Syntax error (no value found)",filename,linenr); 194 "Syntax error (no value found)",filename,linenr);
195 return;
196 }
149 if (soval - eoval > 7) 197 if (soval - eoval > 7) {
150 psiconv_fatal(*config,0,0,"Configuration file %s, line %d: " 198 psiconv_error(*config,0,0,"Configuration file %s, line %d: "
151 "Syntax error (value too large)",filename,linenr); 199 "Syntax error (value too large)",filename,linenr);
200 return;
201 }
152 eol = eoval; 202 eol = eoval;
153 while (line[eol] && (line[eol] < 32)) 203 while (line[eol] && (line[eol] < 32))
154 eol ++; 204 eol ++;
155 if (line[eol]) 205 if (line[eol]) {
156 psiconv_fatal(*config,0,0,"Configuration file %s, line %d: " 206 psiconv_error(*config,0,0,"Configuration file %s, line %d: "
157 "Syntax error (trailing garbage)",filename,linenr); 207 "Syntax error (trailing garbage)",filename,linenr);
208 return;
209 }
158 210
159 var = malloc(eovar - sovar + 1); 211 var = malloc(eovar - sovar + 1);
160 memcpy(var,line + sovar, eovar - sovar); 212 memcpy(var,line + sovar, eovar - sovar);
161 var[eovar-sovar] = 0; 213 var[eovar-sovar] = 0;
162 214
… …
177 psiconv_progress(*config,0,0, 229 psiconv_progress(*config,0,0,
178 "Going to access configuration file %s",filename); 230 "Going to access configuration file %s",filename);
179 231
180 /* Try to open the file; it may fail, if it does not exist for example */ 232 /* Try to open the file; it may fail, if it does not exist for example */
181 if ((file = open(filename,O_RDONLY)) == -1) 233 if ((file = open(filename,O_RDONLY)) == -1)
182 return; 234 goto ERROR0;
183 235
184 /* Read the contents of the file into filebuffer. This may fail */ 236 /* Read the contents of the file into filebuffer. This may fail */
185 if (fstat(file,&stat_buf)) { 237 if (fstat(file,&stat_buf)) {
186 if (close(file)) 238 if (close(file))
187 psiconv_fatal(*config,0,0,"Configuration file %s: " 239 psiconv_error(*config,0,0,"Configuration file %s: "
188 "Couldn't close file",filename); 240 "Couldn't close file",filename);
189 return; 241 return;
190 } 242 }
191 243
192 filesize = stat_buf.st_size; 244 filesize = stat_buf.st_size;
193 if (!(filebuffer = malloc(filesize + 1))) 245 if (!(filebuffer = malloc(filesize + 1))) {
194 psiconv_fatal(*config,0,0,"Configuration file %s: " 246 psiconv_error(*config,0,0,"Configuration file %s: "
195 "Out of memory error",filename); 247 "Out of memory error",filename);
248 goto ERROR1;
249 }
250
196 filebuffer_ptr = filebuffer; 251 filebuffer_ptr = filebuffer;
197 bytes_left = filesize; 252 bytes_left = filesize;
198 bytes_read = 1; /* Dummy for the first time through the loop */ 253 bytes_read = 1; /* Dummy for the first time through the loop */
199 while ((bytes_read > 0) && bytes_left) { 254 while ((bytes_read > 0) && bytes_left) {
200 bytes_read = read(file,filebuffer_ptr,bytes_left); 255 bytes_read = read(file,filebuffer_ptr,bytes_left);
… …
204 } 259 }
205 } 260 }
206 261
207 /* On NFS, the first read may fail and this is not fatal */ 262 /* On NFS, the first read may fail and this is not fatal */
208 if (bytes_left && (bytes_left != filesize)) { 263 if (bytes_left && (bytes_left != filesize)) {
209 psiconv_fatal(*config,0,0,"Configuration file %s: " 264 psiconv_error(*config,0,0,"Configuration file %s: "
210 "Couldn't read file into memory",filename); 265 "Couldn't read file into memory",filename);
266 goto ERROR2;
211 } 267 }
212 268
213 if (close(file)) 269 if (close(file)) {
214 psiconv_fatal(*config,0,0,"Configuration file %s: " 270 psiconv_error(*config,0,0,"Configuration file %s: "
215 "Couldn't close file",filename); 271 "Couldn't close file",filename);
272 file = -1;
273 goto ERROR2;
274 }
275 file = -1;
216 276
217 psiconv_progress(*config,0,0, 277 psiconv_progress(*config,0,0,
218 "Going to parse configuration file %s: ",filename); 278 "Going to parse configuration file %s: ",filename);
219 /* Now we walk through the file to isolate lines */ 279 /* Now we walk through the file to isolate lines */
220 linenr = 0; 280 linenr = 0;
… …
225 eol = sol; 285 eol = sol;
226 while ((eol < filesize) && (filebuffer[eol] != 13) && 286 while ((eol < filesize) && (filebuffer[eol] != 13) &&
227 (filebuffer[eol] != 10) && (filebuffer[eol] != 0)) 287 (filebuffer[eol] != 10) && (filebuffer[eol] != 0))
228 eol ++; 288 eol ++;
229 289
230 if ((eol < filesize) && (filebuffer[eol] == 0)) 290 if ((eol < filesize) && (filebuffer[eol] == 0)) {
231 psiconv_fatal(*config,0,0,"Configuration file %s, line %d: " 291 psiconv_error(*config,0,0,"Configuration file %s, line %d: "
232 "Unexpected character \000 found",filename,linenr); 292 "Unexpected character \000 found",filename,linenr);
293 goto ERROR2;
294 }
233 if ((eol < filesize + 1) && 295 if ((eol < filesize + 1) &&
234 (((filebuffer[eol] == 13) && (filebuffer[eol+1] == 10)) || 296 (((filebuffer[eol] == 13) && (filebuffer[eol+1] == 10)) ||
235 ((filebuffer[eol] == 10) && (filebuffer[eol+1] == 13)))) { 297 ((filebuffer[eol] == 10) && (filebuffer[eol+1] == 13)))) {
236 filebuffer[eol] = 0; 298 filebuffer[eol] = 0;
237 eol ++; 299 eol ++;
… …
239 filebuffer[eol] = 0; 301 filebuffer[eol] = 0;
240 psiconv_config_parse_line(filename,linenr,filebuffer + sol,config); 302 psiconv_config_parse_line(filename,linenr,filebuffer + sol,config);
241 sol = eol+1; 303 sol = eol+1;
242 } 304 }
243 free(filebuffer); 305 free(filebuffer);
306 return;
307
308ERROR2:
309 free(filebuffer);
310ERROR1:
311 if ((file != -1) && close(file))
312 psiconv_error(*config,0,0,"Configuration file %s: "
313 "Couldn't close file",filename);
314ERROR0:
315 return;
244} 316}
245 317
246void psiconv_config_read(const char *extra_config_files, 318void psiconv_config_read(const char *extra_config_files,
247 psiconv_config *config) 319 psiconv_config *config)
248{ 320{
… …
286 } 358 }
287 359
288 psiconv_config_parse_file(filename,config); 360 psiconv_config_parse_file(filename,config);
289 free(filename); 361 free(filename);
290 } 362 }
363 free(path);
291} 364}
Legend:
Removed from v.180  
changed lines
  Added in v.218
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26