--- psiconv/trunk/program/extra/rewrite.c	2000/12/27 02:12:23	80
+++ psiconv/trunk/program/extra/rewrite.c	2003/11/25 17:57:05	168
@@ -19,7 +19,9 @@
 
 #include <psiconv/parse.h>
 #include <psiconv/generate.h>
+#include <psiconv/configuration.h>
 
+#include <stdlib.h>
 #include <stdio.h>
 
 int main(int argc, char *argv[])
@@ -27,13 +29,19 @@
   FILE *fp;
   psiconv_buffer buf;
   psiconv_file psionfile;
+  psiconv_config config;
 
   /* psiconv_verbosity = PSICONV_VERB_DEBUG; */
 
   if (argc < 3) {
     fprintf(stderr,"Not enough arguments\n");
+    fprintf(stderr,"Syntax: INFILE OUTFILE\n");
     exit(1);
   } 
+  if (!(config = psiconv_config_read(NULL))) {
+    fprintf(stderr,"Can't get config\n");
+    exit(1);
+  }
   if (!(fp = fopen(argv[1],"r"))) {
     perror("Can't open file");
     exit(1);
@@ -47,17 +55,18 @@
     exit(1);
   }
   fclose(fp);
-  if ((psiconv_parse(buf,&psionfile))) {
+  if ((psiconv_parse(config,buf,&psionfile))) {
     fprintf(stderr,"Parse error\n");
     exit(1);
   }
 
   psiconv_buffer_free(buf);
   buf = NULL;
-  if (psiconv_write(&buf,psionfile)) {
+  if (psiconv_write(config,&buf,psionfile)) {
     fprintf(stderr,"Generate error\n");
     exit(1);
   }
+  psiconv_free_file(psionfile);
   if (!(fp = fopen(argv[2],"w"))) {
     perror("Can't open file");
     exit(1);
@@ -66,5 +75,7 @@
       perror("Can't fwrite file");
       exit(1);
   }
+  fclose(fp);
+  psiconv_buffer_free(buf);
   exit(0);
 }