--- psiconv/trunk/lib/psiconv/parse_simple.c	2001/01/30 23:57:28	101
+++ psiconv/trunk/lib/psiconv/parse_simple.c	2001/06/30 13:36:39	118
@@ -26,6 +26,18 @@
 #include "parse_routines.h"
 #include "error.h"
 
+/* Very inefficient, but good enough for now. By implementing it ourselves,
+   we do not have to link with -lm */
+psiconv_float_t pow2(int n)
+{
+  psiconv_float_t res=1.0;
+  int i;
+
+  for (i = 0; i < (n<0?-n:n); i++) 
+    res *= 2.0;
+
+  return n<0?1/res:res;
+}
 psiconv_u8 psiconv_read_u8(const psiconv_buffer buf,int lev,psiconv_u32 off,
                            int *status)
 {
@@ -305,6 +317,61 @@
   return NULL;
 }
 
+psiconv_string_t psiconv_read_short_string(const psiconv_buffer buf,
+                                     int lev,
+                                     psiconv_u32 off,int *length, int *status)
+{
+  int stringlen,i,len,localstatus;
+  psiconv_string_t result;
+  char *res_copy;
+
+  psiconv_progress(lev+1,off,"Going to read a short string");
+
+  stringlen = psiconv_read_u8(buf,lev+2,off,&localstatus);
+  if (localstatus)
+    goto ERROR1;
+  psiconv_debug(lev+2,off,"Length: %i",stringlen);
+  len = 1;
+
+  result = malloc(stringlen + 1);
+  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 short string (total length: %08x)",
+                   len);
+
+  return result;
+
+
+ERROR2:
+  free(result);
+ERROR1:
+  psiconv_warn(lev+1,off,"Reading of short string failed");
+  if (status)
+    *status = localstatus;
+  if (length)
+    *length = 0;
+  return NULL;
+}
+
 psiconv_float_t psiconv_read_float(const psiconv_buffer buf, int lev,
                                    psiconv_u32 off, int *length, int *status)
 {
@@ -331,7 +398,7 @@
   if (temp & 0x8000)
     result = -result;
   temp = (temp & 0x7ff0) >> 4;
-  result *= pow(2.0,((int) temp)-0x3ff);
+  result *= pow2(((int) temp)-0x3ff);
   psiconv_debug(lev+1,off,"Float value: %f",result);
   if (length)
     *length = 8;
@@ -346,3 +413,4 @@
     *status = res;
   return 0.0;
 }
+