… | |
… | |
39 | |
39 | |
40 | #ifndef CONFIGURATION_SEARCH_PATH |
40 | #ifndef CONFIGURATION_SEARCH_PATH |
41 | #define CONFIGURATION_SEARCH_PATH PSICONVETCDIR "/psiconv.conf:~/.psiconv.conf" |
41 | #define CONFIGURATION_SEARCH_PATH PSICONVETCDIR "/psiconv.conf:~/.psiconv.conf" |
42 | #endif |
42 | #endif |
43 | static struct psiconv_config_s default_config = |
43 | static struct psiconv_config_s default_config = |
44 | { 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 }; |
45 | |
45 | |
46 | static void psiconv_config_parse_statement(const char *filename, |
46 | static void psiconv_config_parse_statement(const char *filename, |
47 | int linenr, |
47 | int linenr, |
48 | const char *var, int value, |
48 | const char *var, int value, |
49 | psiconv_config *config); |
49 | psiconv_config *config); |
… | |
… | |
57 | psiconv_config psiconv_config_default(void) |
57 | psiconv_config psiconv_config_default(void) |
58 | { |
58 | { |
59 | psiconv_config result; |
59 | psiconv_config result; |
60 | result = malloc(sizeof(*result)); |
60 | result = malloc(sizeof(*result)); |
61 | *result = default_config; |
61 | *result = default_config; |
|
|
62 | psiconv_unicode_select_characterset(result,1); |
62 | return result; |
63 | return result; |
63 | } |
64 | } |
64 | |
65 | |
65 | void psiconv_config_free(psiconv_config config) |
66 | void psiconv_config_free(psiconv_config config) |
66 | { |
67 | { |