--- psiconv/trunk/program/psiconv/psiconv.c 2003/12/13 23:26:37 180 +++ psiconv/trunk/program/psiconv/psiconv.c 2004/01/09 22:20:03 185 @@ -52,11 +52,12 @@ #include "magick-aux.h" #endif -#include "psiconv/data.h" -#include "psiconv/parse.h" -#include "psiconv/configuration.h" -#include "gen.h" +#include +#include +#include +#include #include "psiconv.h" +#include "gen.h" static void print_help(void); static void print_version(void); @@ -64,20 +65,26 @@ void print_help(void) { - psiconv_fileformat ff; + fileformat ff; int i,j; puts("Syntax: psiconv [OPTIONS..] [FILE]"); - puts("Convert the psion Word file FILE to other formats"); + puts("Convert the psion file FILE to other formats"); puts("If FILE is not specified, use stdin"); puts(" -d, --debug Show debug information on stderr"); + puts(" -e, --encoding Output encoding (default: UTF8)"); puts(" -h, --help Display this help and exit"); puts(" -o, --outputfile Output to file instead of stdout"); puts(" -s, --silent Do not even show warnings on stderr"); puts(" -T, --type=FILETYPE Output type"); puts(" -V, --version Display the program version and exit"); puts(" -v, --verbose Show progress indicators on stderr"); - puts(" -u, --UTF8 Input file is encoded in UTF8"); + puts(""); + puts("The following encodings are currently supported:"); + puts(" UTF8 Variable length Unicode encoding"); + puts(" UCS2 Fixed 16-bit length Unicode encoding"); + puts(" Psion The encoding your Psion uses (as in psiconv.conf)"); + puts(" ASCII 7-bit ASCII (other symbols are substituted by '?')"); puts(""); puts("The following output types are known:"); for (i = 0; i < psiconv_list_length(fileformat_list); i ++) { @@ -115,10 +122,10 @@ {"silent",no_argument,NULL,'s'}, {"outputfile",required_argument,NULL,'o'}, {"type",required_argument,NULL,'T'}, - {"UTF8",no_argument,NULL,'u'}, + {"encoding",no_argument,NULL,'e'}, {0,0,0,0} }; - const char* short_options = "hVvsdo:uT:"; + const char* short_options = "hVvsdo:e:T:"; int option_index; FILE * f; struct stat fbuf; @@ -126,23 +133,30 @@ const char *inputfilename = ""; const char *outputfilename = ""; char *type = strdup("HTML3"); - psiconv_encoding encoding_type=PSICONV_ENCODING_CP1252; + encoding encoding_type=ENCODING_UTF8; + psiconv_list outputlist; int c,i,res; psiconv_buffer buf; psiconv_file file; - psiconv_fileformat ff; + fileformat ff = NULL; psiconv_config config = psiconv_config_default(); psiconv_config_read(NULL,&config); - fileformat_list = psiconv_list_new(sizeof(struct psiconv_fileformat_s)); + if (!(fileformat_list = psiconv_list_new(sizeof(struct fileformat_s)))) { + fputs("Out of memory error",stderr); + exit(1); + } + init_txt(); +#if 0 init_html(); init_html4(); init_latex(); init_rtf(); init_image(); +#endif while(1) { c = getopt_long(argc,argv,short_options, long_options, &option_index); @@ -155,10 +169,23 @@ config->verbosity = PSICONV_VERB_PROGRESS; break; case 'd': config->verbosity = PSICONV_VERB_DEBUG; break; - case 's': config->verbosity = PSICONV_VERB_FATAL; break; + case 's': config->verbosity = PSICONV_VERB_ERROR; break; case 'o': outputfilename = strdup(optarg); break; case 'T': type = strdup(optarg); break; - case 'u': encoding_type = PSICONV_ENCODING_UTF8; break; + case 'e': if(!strcmp(optarg,"UTF8")) + encoding_type = ENCODING_UTF8; + else if (!strcmp(optarg,"UCS2")) + encoding_type = ENCODING_UCS2; + else if (!strcmp(optarg,"ASCII")) + encoding_type = ENCODING_ASCII; + else if (!strcmp(optarg,"Psion")) + encoding_type = ENCODING_PSION; + else { + fputs("Unknown encoding type " + "(try '-h' for more information\n",stderr); + exit(1); + } + break; case '?': case ':': fputs("Try `-h' for more information\n",stderr); exit(1); default: fprintf(stderr,"Internal error: getopt_long returned character " @@ -171,7 +198,10 @@ "Try `-h' for more information\n",stderr); exit(1); } else if (optind == argc-1) - inputfilename = strdup(argv[optind]); + if (!(inputfilename = strdup(argv[optind]))) { + fputs("Out of memory error",stderr); + exit(1); + } /* Open inputfile for reading */ @@ -189,8 +219,14 @@ } else f = stdin; - buf = psiconv_buffer_new(); - psiconv_buffer_fread_all(buf,f); + if (!(buf = psiconv_buffer_new())) { + fputs("Out of memory error",stderr); + exit(1); + } + if (psiconv_buffer_fread_all(buf,f)) { + fprintf(stderr,"Failure reading file"); + exit(1); + } if (strlen(inputfilename) != 0) if (fclose(f)) { @@ -204,20 +240,10 @@ exit(1); } - /* Set correct output file */ - if (strlen(outputfilename) == 0) - outputfilename = "/dev/stdout"; - strtoupper(type); for (i = 0; i < psiconv_list_length(fileformat_list); i ++) { ff = psiconv_list_get(fileformat_list,i); if (! strcasecmp(type,ff->name)) { - res = ff->output(outputfilename,file,type, encoding_type); - if (res) { - fprintf(stderr, - "Output format `%s' not permitted for this file type\n",type); - exit(1); - } break; } } @@ -227,7 +253,37 @@ exit(1); } + if (!(outputlist = psiconv_list_new(sizeof(psiconv_u8)))) { + fputs("Out of memory error\n",stderr); + exit(1); + } + + res = ff->output(config,outputlist,file,type,encoding_type); + if (res) { + fprintf(stderr, + "Output format `%s' not permitted for this file type\n",type); + exit(1); + } + psiconv_free_file(file); + if (strlen(outputfilename) != 0) { + f = fopen(outputfilename,"w"); + if (! f) { + perror(inputfilename); + exit(1); + } + } else + f = stdout; + + psiconv_list_fwrite_all(outputlist,f); + + if (fclose(f)) { + perror(inputfilename); + exit(1); + } + + psiconv_list_free(outputlist); + exit(0); }