… | |
… | |
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 "error.h" |
21 | #include "compat.h" |
22 | #include "compat.h" |
22 | #include <stdio.h> |
23 | #include <stdio.h> |
23 | #include <stdlib.h> |
24 | #include <stdlib.h> |
24 | #include <string.h> |
25 | #include <string.h> |
25 | |
26 | |
26 | #include "configuration.h" |
27 | #include "configuration.h" |
27 | #include "error.h" |
|
|
28 | |
28 | |
29 | #ifdef DMALLOC |
29 | #ifdef DMALLOC |
30 | #include <dmalloc.h> |
30 | #include <dmalloc.h> |
31 | #endif |
31 | #endif |
32 | |
32 | |
33 | #ifndef CONFIGURATION_SEARCH_PATH |
33 | #ifndef CONFIGURATION_SEARCH_PATH |
34 | #define CONFIGURATION_SEARCH_PATH "/etc/psiconv.conf:~/.psiconv.conf" |
34 | #define CONFIGURATION_SEARCH_PATH "/etc/psiconv.conf:~/.psiconv.conf" |
35 | #endif |
35 | #endif |
36 | struct psiconv_config_s default_config = |
36 | struct psiconv_config_s default_config = |
37 | { PSICONV_VERB_WARN, 2, psiconv_bool_false }; |
37 | { PSICONV_VERB_WARN, 2, 0,0,0,psiconv_bool_false,NULL }; |
38 | |
38 | |
39 | psiconv_config psiconv_config_read(const char *extra_config_file) |
39 | psiconv_config psiconv_config_read(const char *extra_config_file) |
40 | { |
40 | { |
41 | psiconv_config config; |
41 | psiconv_config config; |
42 | if (!(config = malloc(sizeof(*config)))) |
42 | if (!(config = malloc(sizeof(*config)))) |