Added dynamic memory allocation on encoding

diff --git a/include/odr.h b/include/odr.h
index abdeabd..300cfa2 100644 (file)
--- a/include/odr.h
+++ b/include/odr.h
@@ -5,7 +5,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr.h,v $
- * Revision 1.1  1995-03-30 09:39:41  quinn
+ * Revision 1.2  1995-04-18 08:14:37  quinn
+ * Added dynamic memory allocation on encoding
+ *
+ * Revision 1.1  1995/03/30  09:39:41  quinn
  * Moved .h files to include directory
  *
  * Revision 1.15  1995/03/29  15:39:57  quinn
@@ -130,14 +133,30 @@ typedef int Odr_oid;   /* terminate by -1 */
 typedef struct odr_constack
 {
     unsigned char *base;         /* starting point of data */
+    int base_offset;
     int len;                     /* length of data, if known, else -1
                                        (decoding only) */
     unsigned char *lenb;         /* where to encode length */
+    int len_offset;
     int lenlen;                  /* length of length-field */
 } odr_constack;
 
 struct odr_memblock; /* defined in odr_mem.c */
 
+#define ODR_S_SET     0
+#define ODR_S_CUR     1
+#define ODR_S_END     2
+
+typedef struct odr_ecblock
+{
+    int can_grow;         /* are we allowed to reallocate */
+    unsigned char *buf;            /* memory handle */
+    int pos;              /* current position */
+    int top;              /* top of buffer */
+    int size;             /* current buffer size */
+} odr_ecblock;
+
+
 typedef struct odr
 {
     int direction;       /* the direction of this stream */
@@ -148,6 +167,8 @@ typedef struct odr
     unsigned char *bp;   /* position in buffer */
     int left;            /* bytes remaining in buffer */
 
+    odr_ecblock ecb;     /* memory control block */
+
     int t_class;         /* implicit tagging (-1==default tag) */
     int t_tag;
 
@@ -221,6 +242,45 @@ void *odr_malloc(ODR o, int size);
 #define ODR_MASK_GET(mask, num)  ( ((num) >> 3 <= (mask)->top) ? \
     ((mask)->bits[(num) >> 3] & (0X80 >> ((num) & 0X07)) ? 1 : 0) : 0)
 
+/*
+ * write a single character at the current position - grow buffer if
+ * necessary.
+ * (no, we're not usually this anal about our macros, but this one is
+ *  next to unreadable without some indentation  :)
+ */
+#define odr_putc(o, c) \
+( \
+    ( \
+       (o)->ecb.pos < (o)->ecb.size ? \
+       ( \
+           (o)->ecb.buf[(o)->ecb.pos++] = (c), \
+           0 \
+       ) : \
+       ( \
+           odr_grow_block(&(o)->ecb, 1) == 0 ? \
+           ( \
+               (o)->ecb.buf[(o)->ecb.pos++] = (c), \
+               0 \
+           ) : \
+           ( \
+               (o)->error = OSPACE, \
+               -1 \
+           ) \
+       ) \
+    ) == 0 ? \
+    ( \
+       (o)->ecb.pos > (o)->ecb.top ? \
+       ( \
+           (o)->ecb.top = (o)->ecb.pos, \
+           0 \
+       ) : \
+       0 \
+    ) : \
+       -1 \
+) \
+
+#define odr_tell(o) ((o)->ecb.pos)
+
 #include <prt.h>
 #include <dmalloc.h>
 

diff --git a/include/prt.h b/include/prt.h
index 39ddc65..4f13dc9 100644 (file)
--- a/include/prt.h
+++ b/include/prt.h
@@ -1,6 +1,6 @@
 int ber_boolean(ODR o, int *val);
 int ber_tag(ODR o, void *p, int class, int tag, int *constructed, int opt);
-int ber_enctag(unsigned char *buf, int class, int tag, int constructed, int len);
+int ber_enctag(ODR o, int class, int tag, int constructed);
 int ber_dectag(unsigned char *buf, int *class, int *tag, int *constructed);
 int odr_bool(ODR o, int **p, int opt);
 int odr_integer(ODR o, int **p, int opt);
@@ -9,7 +9,7 @@ int odr_implicit_settag(ODR o, int class, int tag);
 int odr_implicit(ODR o, int (*type)(ODR o, void *p, int opt), void *p,
     int class, int tag, int opt);
 #endif
-int ber_enclen(unsigned char *buf, int len, int lenlen, int exact);
+int ber_enclen(ODR o, int len, int lenlen, int exact);
 int ber_declen(unsigned char *buf, int *len);
 char *odr_indent(ODR o);
 int ber_null(ODR o, int *val);
@@ -42,3 +42,6 @@ void odr_oidcat(Odr_oid *t, Odr_oid *s);
 int odr_oidcmp(Odr_oid *o1, Odr_oid *o2);
 int odr_oidlen(Odr_oid *o);
 Odr_oid *odr_oiddup(ODR odr, Odr_oid *o);
+int odr_grow_block(odr_ecblock *b, int min_bytes);
+int odr_write(ODR o, unsigned char *buf, int bytes);
+int odr_seek(ODR o, int whence, int offset);