--- psiconv/trunk/program/psiconv/psiconv.c	2000/12/15 01:16:43	65
+++ psiconv/trunk/program/psiconv/psiconv.c	2000/12/15 17:17:45	66
@@ -54,7 +54,6 @@
   puts("Convert the psion Word file FILE to a HTML file");
   puts("If FILE is not specified, use stdin");
   puts("  -d, --debug          Show debug information on stderr");
-  puts("  -e, --exact          Quit on any parse errors or warnings");
   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");
@@ -95,7 +94,6 @@
     {"silent",no_argument,NULL,'s'},
     {"outputfile",required_argument,NULL,'o'},
     {"type",required_argument,NULL,'T'},
-    {"exact",no_argument,NULL,'e'},
     {0,0,0,0}
   };
   const char* short_options = "hVvsdo:eT:";
@@ -106,7 +104,6 @@
   const char *inputfilename = "";
   const char *outputfilename = "";
   char *type = strdup("HTML3");
-  int exact=0;
 
   int c,i,res;
   psiconv_buffer buf;
@@ -134,7 +131,6 @@
                 break;
       case 'd': psiconv_verbosity = PSICONV_VERB_DEBUG; break;
       case 's': psiconv_verbosity = PSICONV_VERB_FATAL; break;
-      case 'e': exact = 1; break;
       case 'o': outputfilename = strdup(optarg); break;
       case 'T': type = strdup(optarg); break;
       case '?': case ':': fputs("Try `-h' for more information\n",stderr); 
@@ -177,9 +173,11 @@
       exit(1);
     }
 
-  if (psiconv_parse(buf,&file))
-    if(exact)
-       exit(1);
+  if (psiconv_parse(buf,&file) || (file->type == psiconv_unknown_file))
+  {
+     fprintf(stderr,"Parse error\n");
+     exit(1);
+  }
 
   /* Set correct output file */
   if (strlen(outputfilename) == 0)