--- psiconv/trunk/lib/psiconv/parse_simple.c	2000/12/13 16:30:21	63
+++ psiconv/trunk/lib/psiconv/parse_simple.c	2000/12/15 00:21:51	64
@@ -22,124 +22,201 @@
 
 #include "parse_routines.h"
 
-psiconv_u8 psiconv_read_u8(const psiconv_buffer buf,int lev,psiconv_u32 off)
+psiconv_u8 psiconv_read_u8(const psiconv_buffer buf,int lev,psiconv_u32 off,
+                           int *status)
 {
   psiconv_u8 *ptr;
   ptr = psiconv_list_get(buf,off);
-  if (!ptr)
-    psiconv_fatal(lev,off,"Trying byte read past the end of the file");
+  if (!ptr) {
+    psiconv_warn(lev,off,"Trying byte read past the end of the file");
+    if (status)
+      *status = -PSICONV_E_PARSE;
+    return 0;
+  }
+  if (status)
+    *status = 0;
   return *ptr;
 }
 
-psiconv_u16 psiconv_read_u16(const psiconv_buffer buf,int lev,psiconv_u32 off)
+psiconv_u16 psiconv_read_u16(const psiconv_buffer buf,int lev,psiconv_u32 off,
+                             int *status)
 {
   psiconv_u8 *ptr0,*ptr1;
   ptr0 = psiconv_list_get(buf,off);
   ptr1 = psiconv_list_get(buf,off+1);
-  if (!ptr0 || !ptr1)
-    psiconv_fatal(lev,off,"Trying word read past the end of the file");
+  if (!ptr0 || !ptr1) {
+    psiconv_warn(lev,off,"Trying word read past the end of the file");
+    if (status)
+      *status = -PSICONV_E_PARSE;
+    return 0;
+  }
+  if (status)
+    *status = 0;
   return *ptr0 + (*ptr1 << 8);
 }
 
-psiconv_u32 psiconv_read_u32(const psiconv_buffer buf,int lev,psiconv_u32 off)
+psiconv_u32 psiconv_read_u32(const psiconv_buffer buf,int lev,psiconv_u32 off,
+                             int *status)
 {
   psiconv_u8 *ptr0,*ptr1,*ptr2,*ptr3;
   ptr0 = psiconv_list_get(buf,off);
   ptr1 = psiconv_list_get(buf,off+1);
   ptr2 = psiconv_list_get(buf,off+2);
   ptr3 = psiconv_list_get(buf,off+3);
-  if (!ptr0 || !ptr1 || !ptr2 || !ptr3)
-    psiconv_fatal(lev,off,"Trying long read past the end of the file");
+  if (!ptr0 || !ptr1 || !ptr2 || !ptr3) {
+    psiconv_warn(lev,off,"Trying long read past the end of the file");
+    if (status)
+      *status = -PSICONV_E_PARSE;
+    return 0;
+  }
+  if (status)
+    *status = 0;
   return *ptr0 + (*ptr1 << 8) + (*ptr2 << 16) + (*ptr3 << 24);
 }
 
 psiconv_S_t psiconv_read_S(const psiconv_buffer buf, int lev, psiconv_u32 off,
-                   int *length)
+                           int *length,int *status)
 {
   psiconv_u8 temp;
   psiconv_S_t res;
-  int len;
+  int len,localstatus;
 
   psiconv_progress(lev+1,off,"Going to read a S length indicator");
-  temp = psiconv_read_u8(buf,lev+2,off);
+  temp = psiconv_read_u8(buf,lev+2,off,&localstatus);
+  if (localstatus)
+    goto ERROR;
   if ((temp & 0x03) == 0x02) {
-    res = psiconv_read_u8(buf,lev+2,off) >> 2;
+    res = psiconv_read_u8(buf,lev+2,off,&localstatus) >> 2;
+    if (localstatus)
+      goto ERROR;
     len = 1;
     psiconv_debug(lev+2,off,"Indicator (1 byte): %02x",res);
   } else if ((temp & 0x07) == 0x03) {
-    res = psiconv_read_u16(buf,lev+2,off) >> 3;
+    res = psiconv_read_u16(buf,lev+2,off,&localstatus) >> 3;
+    if (localstatus)
+      goto ERROR;
     len = 2;
     psiconv_debug(lev+2,off,"Indicator (2 bytes): %04x",res);
   } else {
     psiconv_warn(lev+2,off,"S indicator: unknown encoding!");
     psiconv_debug(lev+2,off,"Raw data first byte: %02x",temp);
-    res = 0;
-    len = 1;
+    goto ERROR;
   }
 
   if (length)
     *length = len;
+  if (status)
+    *status = 0;
 
   psiconv_progress(lev+1,off+len-1,
                    "End of S length indicator (total length: %08x)", len);
 
   return res;
+
+ERROR:
+  psiconv_warn(lev+1,off,"Reading of S indicator failed");
+  if (status)
+    *status = localstatus;
+  if (length)
+     *length = 0;
+  return 0;
 }
 
 psiconv_X_t psiconv_read_X(const psiconv_buffer buf, int lev, psiconv_u32 off,
-                           int *length)
+                           int *length, int *status)
 {
   psiconv_u8 temp;
   psiconv_X_t res;
-  int len;
+  int len,localstatus;
 
   psiconv_progress(lev+1,off,"Going to read a X length indicator");
-  temp = psiconv_read_u8(buf,lev+2,off);
+  temp = psiconv_read_u8(buf,lev+2,off,&localstatus);
+  if (localstatus)
+    goto ERROR;
   if ((temp & 0x01) == 0x00) {
-    res = psiconv_read_u8(buf,lev+2,off) >> 1;
+    res = psiconv_read_u8(buf,lev+2,off,&localstatus) >> 1;
+    if (localstatus)
+      goto ERROR;
     len = 1;
     psiconv_debug(lev+2,off,"Indicator (1 byte): %02x",res);
   } else if ((temp & 0x03) == 0x01) {
-    res = psiconv_read_u16(buf,lev+2,off) >> 2;
+    res = psiconv_read_u16(buf,lev+2,off,&localstatus) >> 2;
+    if (localstatus)
+      goto ERROR;
     len = 2;
     psiconv_debug(lev+2,off,"Indicator (2 bytes): %04x",res);
   } else if ((temp & 0x07) == 0x03) {
-    res = psiconv_read_u32(buf,lev+2,off) >> 3;
+    res = psiconv_read_u32(buf,lev+2,off,&localstatus) >> 3;
+    if (localstatus)
+      goto ERROR;
     len = 4;
     psiconv_debug(lev+2,off,"Indicator (4 bytes): %08x",res);
   } else {
     psiconv_warn(lev+2,off,"X indicator: unknown encoding!");
     psiconv_debug(lev+2,off,"Raw data first byte: %02x",temp);
-    res = 0;
-    len = 1;
+    goto ERROR;
   }
 
   if (length)
     *length = len;
+  if (status)
+    *status = 0;
 
   psiconv_progress(lev+1,off+len-1,
                    "End of X length indicator (total length: %08x)", len);
 
   return res;
+
+ERROR:
+  psiconv_warn(lev+1,off,"Reading of X indicator failed");
+  if (status)
+    *status = localstatus;
+  if (length)
+     *length = 0;
+  return 0;
 }
 
 psiconv_length_t psiconv_read_length(const psiconv_buffer buf, int lev,
-                                     psiconv_u32 off, int *length)
+                                     psiconv_u32 off, int *length, int *status)
 {
   psiconv_length_t res;
-  res = (2.54/1440.0) * ((psiconv_s32) psiconv_read_u32(buf,lev,off));
+  int localstatus;
+
+  res = (2.54/1440.0) * ((psiconv_s32) psiconv_read_u32(buf,lev,off,
+                                                        &localstatus));
+  if (localstatus) {
+    psiconv_warn(lev+1,off,"Reading of length failed");
+    if (length)
+      *length = 0;
+    if (status)
+       *status = localstatus;
+     return 0;
+  }
   psiconv_debug(lev+1,off,"Length: %f",res);
   if (length)
     *length = 4;
+  if (status)
+     *status = 0;
   return res;
 }
 
 psiconv_size_t psiconv_read_size(const psiconv_buffer buf, int lev,
-                                 psiconv_u32 off, int *length)
+                                 psiconv_u32 off, int *length, int *status)
 {
   psiconv_size_t res;
-  res = ((psiconv_s32) psiconv_read_u32(buf,lev,off)) / 20.0;
+  int localstatus;
+  res = ((psiconv_s32) psiconv_read_u32(buf,lev,off,&localstatus)) / 20.0;
+  if (localstatus) {
+    psiconv_warn(lev+1,off,"Reading of size failed");
+    if (length)
+      *length = 0;
+    if (status)
+       *status = localstatus;
+     return 0;
+  }
   psiconv_debug(lev+1,off,"Size: %f",res);
+  if (status)
+     *status = 0;
   if (length)
     *length = 4;
   return res;
@@ -149,7 +226,14 @@
                        int *length, psiconv_bool_t *result)
 {
   psiconv_u8 temp;
-  temp = psiconv_read_u8(buf,lev,off);
+  int localstatus;
+  temp = psiconv_read_u8(buf,lev,off,&localstatus);
+  if (localstatus) {
+    psiconv_warn(lev+1,off,"Reading of bool failed");
+    if (length)
+      *length = 0;
+     return localstatus;
+  }
   if (length)
     *length = 1;
   if (temp == 0) {
@@ -162,36 +246,57 @@
   psiconv_warn(lev+1,off,"Unknown value for boolean");
   psiconv_debug(lev+1,off,"Boolean value: %02x",temp);
   *result = psiconv_bool_true;
-  return -1;
+  return 0;
 }
 
 psiconv_string_t psiconv_read_string(const psiconv_buffer buf,int lev,
-                                     psiconv_u32 off,int *length)
+                                     psiconv_u32 off,int *length, int *status)
 {
-  int stringlen,i,leng,len;
+  int stringlen,i,leng,len,localstatus;
   psiconv_string_t result;
   char *res_copy;
 
   psiconv_progress(lev+1,off,"Going to read a string");
 
-  stringlen = psiconv_read_S(buf,lev+2,off,&leng);
+  stringlen = psiconv_read_S(buf,lev+2,off,&leng,&localstatus);
+  if (localstatus)
+    goto ERROR1;
   psiconv_debug(lev+2,off,"Length: %i",stringlen);
   len = leng;
 
   result = malloc(stringlen + 1);
-  for (i = 0; i < stringlen; i++)
-    result[i] = psiconv_read_u8(buf,lev,off+i+len);
+  if (!result)
+    goto ERROR1;
+  for (i = 0; (i < stringlen) && !localstatus; i++)
+    result[i] = psiconv_read_u8(buf,lev,off+i+len,&localstatus);
+  if (localstatus)
+    goto ERROR2;
   result[stringlen] = 0;
   len += stringlen;
 
   res_copy = psiconv_make_printable(result);
+  if (!res_copy)
+    goto ERROR2;
   psiconv_debug(lev+2,off,"Contents: `%s'",res_copy);
   free(res_copy);
 
   if (length)
     *length = len;
 
+  if (status)
+    *status = 0;
+
   psiconv_progress(lev+1,off+len-1,"End of string (total length: %08x)",len);
 
   return result;
+
+ERROR2:
+  free(result);
+ERROR1:
+  psiconv_warn(lev+1,off,"Reading of string failed");
+  if (status)
+    *status = localstatus;
+  if (length)
+    *length = 0;
+  return NULL;
 }