/[public]/psiconv/trunk/program/psiconv/psiconv.c
ViewVC logotype

Diff of /psiconv/trunk/program/psiconv/psiconv.c

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

Revision 74 Revision 193
… …
24#include <getopt.h> 24#include <getopt.h>
25#include <stdio.h> 25#include <stdio.h>
26#include <sys/stat.h> 26#include <sys/stat.h>
27#include <stdlib.h> 27#include <stdlib.h>
28#include <string.h> 28#include <string.h>
29#include <strings.h>
29#include <ctype.h> 30#include <ctype.h>
30 31
31#ifdef HAVE_UNISTD_H 32#ifdef HAVE_UNISTD_H
32#include <unistd.h> 33#include <unistd.h>
33#endif 34#endif
34 35
35#ifdef IMAGEMAGICK 36#ifdef IMAGEMAGICK
36#include <magick/magick.h> 37#include "magick-aux.h"
37#endif 38#endif
38 39
39#include "psiconv/data.h" 40#include <psiconv/data.h>
41#include <psiconv/list.h>
40#include "psiconv/parse.h" 42#include <psiconv/parse.h>
43#include <psiconv/configuration.h>
44#include "psiconv.h"
41#include "gen.h" 45#include "gen.h"
42#include "psiconv.h"
43 46
44static void print_help(void); 47static void print_help(void);
45static void print_version(void); 48static void print_version(void);
46static void strtoupper(char *str); 49static void strtoupper(char *str);
47 50
48void print_help(void) 51void print_help(void)
49{ 52{
50 psiconv_fileformat ff; 53 fileformat ff;
51 int i,j; 54 int i,j;
52 55
53 puts("Syntax: psiconv [OPTIONS..] [FILE]"); 56 puts("Syntax: psiconv [OPTIONS..] [FILE]");
54 puts("Convert the psion Word file FILE to a HTML file"); 57 puts("Convert the psion file FILE to other formats");
55 puts("If FILE is not specified, use stdin"); 58 puts("If FILE is not specified, use stdin");
56 puts(" -d, --debug Show debug information on stderr"); 59 puts(" -e, --encoding=ENC Output encoding (default: UTF8)");
57 puts(" -h, --help Display this help and exit"); 60 puts(" -h, --help Display this help and exit");
61 puts(" -n, --noise=LEVEL Select what to print on stderr (overrides psiconv.conf)");
58 puts(" -o, --outputfile Output to file instead of stdout"); 62 puts(" -o, --outputfile Output to file instead of stdout");
59 puts(" -s, --silent Do not even show warnings on stderr");
60 puts(" -T, --type=FILETYPE Output type"); 63 puts(" -T, --type=FILETYPE Output type (default: XHTML or TIFF");
61 puts(" -V, --version Display the program version and exit"); 64 puts(" -V, --version Display the program version and exit");
62 puts(" -v, --verbose Show progress indicators on stderr"); 65 puts("");
66 puts("The following encodings are currently supported:");
67 puts(" UTF8 Variable length Unicode encoding");
68 puts(" UCS2 Fixed 16-bit length Unicode encoding");
69 puts(" Psion The encoding your Psion uses (as in psiconv.conf)");
70 puts(" ASCII 7-bit ASCII (other symbols are substituted by '?')");
71 puts("");
72 puts("The following noise levels are currently supported:");
73 puts(" 1 or F: Fatal errors only");
74 puts(" 2 or E: Errors");
75 puts(" 3 or W: Warnings");
76 puts(" 4 or P: Progress indicators");
77 puts(" 5 or D: Debug data");
78 puts("");
79 puts("The following abbreviations are used below:");
80 puts(" C - processes ClipArt files");
81 puts(" c - processes ClipArt files containing only one image");
82 puts(" M - processes MBM files");
83 puts(" m - processes MBM files containing only one image");
84 puts(" S - processes Sketch files");
85 puts(" T - processes TextEd files");
86 puts(" W - processes Word files");
63 puts(""); 87 puts("");
64 puts("The following output types are known:"); 88 puts("The following output types are known:");
65 for (i = 0; i < psiconv_list_length(fileformat_list); i ++) { 89 for (i = 0; i < psiconv_list_length(fileformat_list); i ++) {
66 ff = psiconv_list_get(fileformat_list,i); 90 ff = psiconv_list_get(fileformat_list,i);
67 printf(" %s",ff->name); 91 printf(" %s",ff->name);
68 for (j = strlen(ff->name); j < 15; j++) 92 for (j = strlen(ff->name); j < 10; j++)
69 putchar(' '); 93 putchar(' ');
94 printf("[%c%c%c%c%c] ",
95 ff->supported_format & FORMAT_CLIPART_MULTIPLE?'C':
96 ff->supported_format & FORMAT_CLIPART_SINGLE?'c':' ',
97 ff->supported_format & FORMAT_MBM_MULTIPLE?'M':
98 ff->supported_format & FORMAT_MBM_SINGLE?'m':' ',
99 ff->supported_format & FORMAT_SKETCH?'S':' ',
100 ff->supported_format & FORMAT_TEXTED?'T':' ',
101 ff->supported_format & FORMAT_WORD?'W':' ');
70 puts(ff->description); 102 puts(ff->description);
71 } 103 }
104 puts("");
105 puts("When using UTF8 with LaTeX type, the resulting LaTeX source should be converted");
106 puts(" to a suitable encoding for your LaTeX installation before being typeset");
72} 107}
73 108
74void print_version(void) 109void print_version(void)
75{ 110{
76 printf("Version %s\n",VERSION); 111 printf("Version %s\n",VERSION);
… …
87{ 122{
88 struct option long_options[] = 123 struct option long_options[] =
89 { 124 {
90 {"help",no_argument,NULL,'h'}, 125 {"help",no_argument,NULL,'h'},
91 {"version",no_argument,NULL,'V'}, 126 {"version",no_argument,NULL,'V'},
92 {"verbose",no_argument,NULL,'v'}, 127 {"noise",required_argument,NULL,'n'},
93 {"debug",no_argument,NULL,'d'},
94 {"silent",no_argument,NULL,'s'},
95 {"outputfile",required_argument,NULL,'o'}, 128 {"outputfile",required_argument,NULL,'o'},
96 {"type",required_argument,NULL,'T'}, 129 {"type",required_argument,NULL,'T'},
130 {"encoding",no_argument,NULL,'e'},
97 {0,0,0,0} 131 {0,0,0,0}
98 }; 132 };
99 const char* short_options = "hVvsdo:eT:"; 133 const char* short_options = "hVn:o:e:T:";
100 int option_index; 134 int option_index;
101 FILE * f; 135 FILE * f;
102 struct stat fbuf; 136 struct stat fbuf;
103 137
104 const char *inputfilename = ""; 138 const char *inputfilename = "";
105 const char *outputfilename = ""; 139 const char *outputfilename = "";
106 char *type = strdup("HTML3"); 140 char *type = NULL;
141 encoding encoding_type=ENCODING_UTF8;
142 psiconv_list outputlist;
107 143
108 int c,i,res; 144 int c,i,res;
109 psiconv_buffer buf; 145 psiconv_buffer buf;
110 psiconv_file file; 146 psiconv_file file;
111 psiconv_fileformat ff; 147 fileformat ff = NULL;
112 148
113 psiconv_verbosity = PSICONV_VERB_WARN; 149 psiconv_config config = psiconv_config_default();
150 psiconv_config_read(NULL,&config);
114 151
115 fileformat_list = psiconv_list_new(sizeof(struct psiconv_fileformat_s)); 152 if (!(fileformat_list = psiconv_list_new(sizeof(struct fileformat_s)))) {
153 fputs("Out of memory error",stderr);
154 exit(1);
155 }
156
116 init_txt(); 157 init_txt();
117 init_html(); 158 init_xhtml();
118 init_html4(); 159 init_html4();
119 init_rtf();
120 init_image(); 160 init_image();
121 161
122 while(1) { 162 while(1) {
123 c = getopt_long(argc,argv,short_options, long_options, &option_index); 163 c = getopt_long(argc,argv,short_options, long_options, &option_index);
124 if (c == -1) 164 if (c == -1)
125 break; 165 break;
126 switch(c) { 166 switch(c) {
127 case 'h': print_help(); exit(0); 167 case 'h': print_help(); exit(0);
128 case 'V': print_version(); exit(0); 168 case 'V': print_version(); exit(0);
129 case 'v': if (psiconv_verbosity < PSICONV_VERB_PROGRESS) 169 case 'n': switch(optarg[0]) {
130 psiconv_verbosity = PSICONV_VERB_PROGRESS; 170 case '1': case 'F':case 'f':
171 config->verbosity=PSICONV_VERB_FATAL;
172 break;
173 case '2': case 'E':case 'e':
174 config->verbosity=PSICONV_VERB_ERROR;
175 break;
176 case '3': case 'W':case 'w':
177 config->verbosity=PSICONV_VERB_WARN;
178 break;
179 case '4': case 'P':case 'p':
180 config->verbosity=PSICONV_VERB_PROGRESS;
181 break;
182 case '5': case 'D':case 'd':
183 config->verbosity=PSICONV_VERB_DEBUG;
184 break;
185 default:
186 fputs("Unknown noise level\n",stderr);
187 exit(1);
188 }
131 break; 189 break;
132 case 'd': psiconv_verbosity = PSICONV_VERB_DEBUG; break;
133 case 's': psiconv_verbosity = PSICONV_VERB_FATAL; break;
134 case 'o': outputfilename = strdup(optarg); break; 190 case 'o': outputfilename = strdup(optarg); break;
135 case 'T': type = strdup(optarg); break; 191 case 'T': type = strdup(optarg); break;
192 case 'e': if(!strcmp(optarg,"UTF8"))
193 encoding_type = ENCODING_UTF8;
194 else if (!strcmp(optarg,"UCS2"))
195 encoding_type = ENCODING_UCS2;
196 else if (!strcmp(optarg,"ASCII"))
197 encoding_type = ENCODING_ASCII;
198 else if (!strcmp(optarg,"Psion"))
199 encoding_type = ENCODING_PSION;
200 else {
201 fputs("Unknown encoding type "
202 "(try '-h' for more information\n",stderr);
203 exit(1);
204 }
205 break;
136 case '?': case ':': fputs("Try `-h' for more information\n",stderr); 206 case '?': case ':': fputs("Try `-h' for more information\n",stderr);
137 exit(1); 207 exit(1);
138 default: fprintf(stderr,"Internal error: getopt_long returned character " 208 default: fprintf(stderr,"Internal error: getopt_long returned character "
139 "code 0%o ?? (contact the author)\n", c); 209 "code 0%o ?? (contact the author)\n", c);
140 exit(1); break; 210 exit(1); break;
… …
143 if (optind < argc-1) { 213 if (optind < argc-1) {
144 fputs("I can only convert one file!\n" 214 fputs("I can only convert one file!\n"
145 "Try `-h' for more information\n",stderr); 215 "Try `-h' for more information\n",stderr);
146 exit(1); 216 exit(1);
147 } else if (optind == argc-1) 217 } else if (optind == argc-1)
148 inputfilename = strdup(argv[optind]); 218 if (!(inputfilename = strdup(argv[optind]))) {
219 fputs("Out of memory error",stderr);
220 exit(1);
221 }
149 222
150 223
151 /* Open inputfile for reading */ 224 /* Open inputfile for reading */
152 225
153 if (strlen(inputfilename) != 0) { 226 if (strlen(inputfilename) != 0) {
… …
161 exit(1); 234 exit(1);
162 } 235 }
163 } else 236 } else
164 f = stdin; 237 f = stdin;
165 238
166 buf = psiconv_list_new(sizeof(psiconv_u8)); 239 if (!(buf = psiconv_buffer_new())) {
240 fputs("Out of memory error",stderr);
241 exit(1);
242 }
167 psiconv_list_fread_all(buf,f); 243 if (psiconv_buffer_fread_all(buf,f)) {
244 fprintf(stderr,"Failure reading file");
245 exit(1);
246 }
168 247
169 if (strlen(inputfilename) != 0) 248 if (strlen(inputfilename) != 0)
170 if (fclose(f)) { 249 if (fclose(f)) {
171 perror(inputfilename); 250 perror(inputfilename);
172 exit(1); 251 exit(1);
173 } 252 }
174 253
175 if (psiconv_parse(buf,&file) || (file->type == psiconv_unknown_file)) 254 if (psiconv_parse(config,buf,&file) || (file->type == psiconv_unknown_file))
176 { 255 {
177 fprintf(stderr,"Parse error\n"); 256 fprintf(stderr,"Parse error\n");
178 exit(1); 257 exit(1);
179 } 258 }
180 259
181 /* Set correct output file */ 260 if (!type) {
182 if (strlen(outputfilename) == 0) 261 switch(file->type) {
183 outputfilename = "/dev/stdout"; 262 case psiconv_word_file:
184 263 case psiconv_texted_file:
264 default:
265 type = "XHTML"; break;
266 case psiconv_mbm_file:
267 case psiconv_clipart_file:
268 case psiconv_sketch_file:
269 type = "TIFF"; break;
270 }
271 } else
185 strtoupper(type); 272 strtoupper(type);
273
186 for (i = 0; i < psiconv_list_length(fileformat_list); i ++) { 274 for (i = 0; i < psiconv_list_length(fileformat_list); i ++) {
187 ff = psiconv_list_get(fileformat_list,i); 275 ff = psiconv_list_get(fileformat_list,i);
188 if (! strcmp(type,ff->name)) { 276 if (! strcasecmp(type,ff->name)) {
189 res = ff->output(outputfilename,file,type);
190 if (res) {
191 fprintf(stderr,
192 "Output format `%s' not permitted for this file type\n",type);
193 exit(1);
194 }
195 break; 277 break;
196 } 278 }
197 } 279 }
198 280
199 if (i == psiconv_list_length(fileformat_list)) { 281 if (i == psiconv_list_length(fileformat_list)) {
200 fprintf(stderr,"Unknown output type: `%s'\n",type); 282 fprintf(stderr,"Unknown output type: `%s'\n",type);
201 exit(1); 283 exit(1);
202 } 284 }
203 285
286 if (!(outputlist = psiconv_list_new(sizeof(psiconv_u8)))) {
287 fputs("Out of memory error\n",stderr);
288 exit(1);
289 }
290
291 res = ff->output(config,outputlist,file,type,encoding_type);
292 if (res) {
293 fprintf(stderr,
294 "Output format `%s' not permitted for this file type\n",type);
295 exit(1);
296 }
297
204 psiconv_free_file(file); 298 psiconv_free_file(file);
299
300 if (strlen(outputfilename) != 0) {
301 f = fopen(outputfilename,"w");
302 if (! f) {
303 perror(inputfilename);
304 exit(1);
305 }
306 } else
307 f = stdout;
308
309 psiconv_list_fwrite_all(outputlist,f);
310
311 if (fclose(f)) {
312 perror(inputfilename);
313 exit(1);
314 }
315
316 psiconv_list_free(outputlist);
205 317
206 exit(0); 318 exit(0);
207} 319}
Legend:
Removed from v.74  
changed lines
  Added in v.193
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26