X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=odr%2Fodr_cons.c;h=152134341f9a5f07db218cdf3d9d6b753581d9b1;hp=3fdae22df176701d7a65065c6c83ae5e506387fd;hb=ec1f815d5348cd21e393f76bc212c910c34bbc45;hpb=10981b2f116449523a9f628c20a78212ce91553e diff --git a/odr/odr_cons.c b/odr/odr_cons.c index 3fdae22..1521343 100644 --- a/odr/odr_cons.c +++ b/odr/odr_cons.c @@ -1,97 +1,180 @@ /* - * Copyright (C) 1994, Index Data I/S - * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss + * Copyright (c) 1995-2003, Index Data + * See the file LICENSE for details. * - * $Log: odr_cons.c,v $ - * Revision 1.3 1995-02-09 15:51:48 quinn - * Works better now. - * - * Revision 1.2 1995/02/07 17:52:59 quinn - * A damn mess, but now things work, I think. - * - * Revision 1.1 1995/02/02 16:21:53 quinn - * First kick. + * $Id: odr_cons.c,v 1.26 2003-05-20 19:55:30 adam Exp $ * */ +#if HAVE_CONFIG_H +#include +#endif -#include +#include "odr-priv.h" -int odr_constructed_begin(ODR o, void *p, int class, int tag) +void odr_setlenlen(ODR o, int len) +{ + o->lenlen = len; +} + +int odr_constructed_begin(ODR o, void *p, int zclass, int tag, + const char *name) { int res; int cons = 1; + int lenlen = o->lenlen; + if (o->error) + return 0; + o->lenlen = 1; /* reset lenlen */ if (o->t_class < 0) { - o->t_class = class; + o->t_class = zclass; o->t_tag = tag; } - if (o->direction == ODR_DECODE) - *(char**)p = 0; - if ((res = ber_tag(o, *(char**)p, o->t_class, o->t_tag, &cons)) < 0) + if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, 1, name)) < 0) return 0; if (!res || !cons) return 0; - o->stack[++(o->stackp)].lenb = o->bp; - if (o->direction == ODR_ENCODE || o->direction == ODR_PRINT) + if (o->op->stackp == ODR_MAX_STACK - 1) { - o->stack[o->stackp].lenlen = 1; - o->bp++; - o->left--; + odr_seterror(o, OSTACK, 30); + return 0; + } + o->op->stack[++(o->op->stackp)].lenb = o->bp; + o->op->stack[o->op->stackp].len_offset = odr_tell(o); +#ifdef ODR_DEBUG + fprintf(stderr, "[cons_begin(%d)]", o->op->stackp); +#endif + if (o->direction == ODR_ENCODE) + { + static unsigned char dummy[sizeof(int)+1]; + + o->op->stack[o->op->stackp].lenlen = lenlen; + + if (odr_write(o, dummy, lenlen) < 0) /* dummy */ + { + --(o->op->stackp); + return 0; + } } else if (o->direction == ODR_DECODE) { - if ((res = ber_declen(o->bp, &o->stack[o->stackp].len)) < 0) + if ((res = ber_declen(o->bp, &o->op->stack[o->op->stackp].len, + odr_max(o))) < 0) + { + odr_seterror(o, OOTHER, 31); + --(o->op->stackp); return 0; - o->stack[o->stackp].lenlen = res; + } + o->op->stack[o->op->stackp].lenlen = res; o->bp += res; - o->left -= res; + if (o->op->stack[o->op->stackp].len > odr_max(o)) + { + odr_seterror(o, OOTHER, 32); + --(o->op->stackp); + return 0; + } } - else return 0; - - o->stack[o->stackp].base = o->bp; + else if (o->direction == ODR_PRINT) + { + odr_prname(o, name); + fprintf(o->print, "{\n"); + o->indent++; + } + else + { + odr_seterror(o, OOTHER, 33); + --(o->op->stackp); + return 0; + } + o->op->stack[o->op->stackp].base = o->bp; + o->op->stack[o->op->stackp].base_offset = odr_tell(o); return 1; } +int odr_constructed_more(ODR o) +{ + if (o->error) + return 0; + if (o->op->stackp < 0) + return 0; + if (o->op->stack[o->op->stackp].len >= 0) + return o->bp - o->op->stack[o->op->stackp].base < o->op->stack[o->op->stackp].len; + else + return (!(*o->bp == 0 && *(o->bp + 1) == 0)); +} + int odr_constructed_end(ODR o) { int res; + int pos; - if (o->stackp < 0) + if (o->error) return 0; + if (o->op->stackp < 0) + { + odr_seterror(o, OOTHER, 34); + return 0; + } switch (o->direction) { - case ODR_DECODE: - if (o->stack[o->stackp].len < 0) - { - if (*o->bp++ == 0 && *(o->bp++) == 0) - { - o->left -= 2; + case ODR_DECODE: + if (o->op->stack[o->op->stackp].len < 0) + { + if (*o->bp++ == 0 && *(o->bp++) == 0) + { + o->op->stackp--; return 1; - } - else - return 0; - } - else if (o->bp - o->stack[o->stackp].base != - o->stack[o->stackp].len) - return 0; - o->stackp--; - return 1; - case ODR_ENCODE: - if ((res = ber_enclen(o->stack[o->stackp].lenb, - o->bp - o->stack[o->stackp].base, - o->stack[o->stackp].lenlen, 1)) < 0) - return 0; - if (res == 0) /* indefinite encoding */ - { - *(o->bp++) = *(o->bp++) = 0; - o->left--; - } - o->stackp--; - return 1; - case ODR_PRINT: return 1; - default: return 0; + } + else + { + odr_seterror(o, OOTHER, 35); + return 0; + } + } + else if (o->bp - o->op->stack[o->op->stackp].base != + o->op->stack[o->op->stackp].len) + { + odr_seterror(o, OCONLEN, 36); + return 0; + } + o->op->stackp--; + return 1; + case ODR_ENCODE: + pos = odr_tell(o); + odr_seek(o, ODR_S_SET, o->op->stack[o->op->stackp].len_offset); + if ((res = ber_enclen(o, pos - o->op->stack[o->op->stackp].base_offset, + o->op->stack[o->op->stackp].lenlen, 1)) < 0) + { + odr_seterror(o, OLENOV, 37); + return 0; + } + odr_seek(o, ODR_S_END, 0); + if (res == 0) /* indefinite encoding */ + { +#ifdef ODR_DEBUG + fprintf(stderr, "[cons_end(%d): indefinite]", o->op->stackp); +#endif + if (odr_putc(o, 0) < 0 || odr_putc(o, 0) < 0) + return 0; + } +#ifdef ODR_DEBUG + else + { + fprintf(stderr, "[cons_end(%d): definite]", o->op->stackp); + } +#endif + o->op->stackp--; + return 1; + case ODR_PRINT: + o->op->stackp--; + o->indent--; + odr_prname(o, 0); + fprintf(o->print, "}\n"); + return 1; + default: + odr_seterror(o, OOTHER, 38); + return 0; } }