/*
- * Copyright (c) 1995-1999, Index Data
+ * Copyright (c) 1995-2001, Index Data
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: ber_oct.c,v $
- * Revision 1.14 1999-11-30 13:47:11 adam
+ * Revision 1.17 2001-06-26 12:14:15 adam
+ * When BER decoding a null byte is appended to the OCTET buffer.
+ *
+ * Revision 1.16 2000/02/29 13:44:55 adam
+ * Check for config.h (currently not generated).
+ *
+ * Revision 1.15 2000/01/31 13:15:21 adam
+ * Removed uses of assert(3). Cleanup of ODR. CCL parser update so
+ * that some characters are not surrounded by spaces in resulting term.
+ * ILL-code updates.
+ *
+ * Revision 1.14 1999/11/30 13:47:11 adam
* Improved installation. Moved header files to include/yaz.
*
* Revision 1.13 1999/04/20 09:56:48 adam
* First kick.
*
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <yaz/odr.h>
return 0;
}
o->bp += res;
- o->left -= res;
if (cons) /* fetch component strings */
{
base = o->bp;
{
c = (unsigned char *)odr_malloc(o, p->size += len + 1);
if (p->len)
+ {
memcpy(c, p->buf, p->len);
+ /* the final null is really not part of the buffer, but */
+ /* it saves somes applications that assumes C strings */
+ c[p->len] = '\0';
+ }
p->buf = c;
}
if (len)
+ {
memcpy(p->buf + p->len, o->bp, len);
+ p->buf[p->len] = '\0'; /* make it a C string, just in case */
+ }
p->len += len;
o->bp += len;
- o->left -= len;
return 1;
case ODR_ENCODE:
if ((res = ber_enclen(o, p->len, 5, 0)) < 0)