--- psiconv/trunk/lib/psiconv/list.c	2000/12/13 16:17:54	62
+++ psiconv/trunk/lib/psiconv/list.c	2000/12/25 22:25:33	79
@@ -1,6 +1,6 @@
 /*
     list.c - Part of psiconv, a PSION 5 file formats converter
-    Copyright (c) 1999  Frodo Looijaard <frodol@dds.nl>       
+    Copyright (c) 1999, 2000  Frodo Looijaard <frodol@dds.nl>       
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -19,22 +19,24 @@
 
 
 #include "config.h"
+#include "compat.h"
 #include <stddef.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include "general.h"
 #include "list.h"
 #include "error.h"
 
-static int psiconv_list_resize(psiconv_list l,unsigned int nr);
+static int psiconv_list_resize(psiconv_list l,psiconv_u32 nr);
 
 struct psiconv_list_s {
-  int cur_len;
-  int max_len;
-  int el_size;
+  psiconv_u32 cur_len;
+  psiconv_u32 max_len;
+  size_t el_size;
   void *els;
 };
 
-psiconv_list psiconv_list_new(int element_size)
+psiconv_list psiconv_list_new(size_t element_size)
 {
   psiconv_list l;
   l = malloc(sizeof(*l));
@@ -62,7 +64,7 @@
   psiconv_list_free(l);
 }
 
-int psiconv_list_length(const psiconv_list l)
+psiconv_u32 psiconv_list_length(const psiconv_list l)
 {
   return l->cur_len;
 }
@@ -72,7 +74,7 @@
   return l->cur_len == 0;
 }
 
-void *psiconv_list_get(const psiconv_list l, unsigned int indx)
+void *psiconv_list_get(const psiconv_list l, psiconv_u32 indx)
 {
   if (indx >= l->cur_len)
     return NULL;
@@ -80,10 +82,11 @@
     return ((char *) (l->els)) + indx * l->el_size;
 }
 
-int psiconv_list_add(psiconv_list l, void *el)
+int psiconv_list_add(psiconv_list l, const void *el)
 {
-  if (psiconv_list_resize(l,l->cur_len + 1))
-    return -PSICONV_E_NOMEM;
+  int res;
+  if ((res = psiconv_list_resize(l,l->cur_len + 1)))
+    return res;
   memcpy(((char *) (l->els)) + l->cur_len * l->el_size, el, l->el_size);
   l->cur_len ++;
   return 0;
@@ -91,7 +94,7 @@
 
 void psiconv_list_foreach_el(psiconv_list l, void action(void *el))
 {
-  int i;
+  psiconv_u32 i;
   for (i = 0; i < l->cur_len; i ++)
     action(psiconv_list_get(l,i));
 }
@@ -99,7 +102,7 @@
 psiconv_list psiconv_list_clone(const psiconv_list l)
 {
   psiconv_list l2;
-  int i;
+  psiconv_u32 i;
   l2 = psiconv_list_new(l->el_size);
   if (!l2)
     return NULL;
@@ -112,7 +115,6 @@
   
 }
 
-
 size_t psiconv_list_fread(psiconv_list l,size_t size, FILE *f)
 {
   size_t res;
@@ -123,7 +125,30 @@
   return res;
 }
 
-int psiconv_list_resize(psiconv_list l,unsigned int nr)
+int psiconv_list_fread_all(psiconv_list l, FILE *f)
+{
+  while (!feof(f)) {
+    if (!psiconv_list_fread(l,1024,f) && !feof(f)) 
+      return -PSICONV_E_NOMEM;
+  }
+  return -PSICONV_E_OK;
+}
+
+int psiconv_list_fwrite_all(const psiconv_list l, FILE *f)
+{
+  psiconv_u32 pos = 0;
+  psiconv_u32 written;
+  psiconv_u32 len = psiconv_list_length(l);
+  while (pos < len) {
+    if (!(written = fwrite(((char *)(l->els)) + pos * l->el_size,l->el_size,
+                           len - pos,f)))
+      return -PSICONV_E_OTHER;
+    pos += written;
+  }
+  return -PSICONV_E_OK;
+}
+
+int psiconv_list_resize(psiconv_list l,psiconv_u32 nr)
 {
   void * temp;
   if (nr > l->max_len) {
@@ -132,9 +157,24 @@
     temp = realloc(l->els,l->max_len * l->el_size);
     if (temp) {
       l->els = temp;
-      return 0;
+      return -PSICONV_E_OK;
     } else
       return -PSICONV_E_NOMEM;
   }
+  return -PSICONV_E_OK;
 }
 
+int psiconv_list_concat(psiconv_list l, const psiconv_list extra)
+{
+  int res;
+  if (l->el_size != extra->el_size)
+    return -PSICONV_E_OTHER;
+  if ((res = psiconv_list_resize(l,
+                     l->cur_len + extra->cur_len)))
+    return res;
+  /* Unreadable but correct. */
+  memcpy(((char *) (l->els)) + l->cur_len * l->el_size,extra->els,
+         extra->cur_len * extra->el_size);
+  l->cur_len += extra->cur_len;
+  return 0;
+}