/*
- * Copyright (C) 1994, Index Data I/S
- * All rights reserved.
+ * Copyright (c) 1995-2002, Index Data
+ * See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
- * $Log: odr_oct.c,v $
- * Revision 1.2 1995-02-02 20:38:51 quinn
- * Updates.
- *
- * Revision 1.1 1995/02/02 16:21:54 quinn
- * First kick.
- *
+ * $Id: odr_oct.c,v 1.17 2002-07-25 12:51:08 adam Exp $
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
-#include <odr.h>
+#include <yaz/log.h>
+#include "odr-priv.h"
/*
* Top level octet string en/decoder.
* Returns 1 on success, 0 on error.
*/
-int odr_octetstring(ODR o, ODR_OCT **p, int opt)
+int odr_octetstring(ODR o, Odr_oct **p, int opt, const char *name)
{
int res, cons = 0;
+ if (o->error)
+ return 0;
if (o->t_class < 0)
{
o->t_class = ODR_UNIVERSAL;
o->t_tag = ODR_OCTETSTRING;
}
- if ((res = ber_tag(o, *p, o->t_class, o->t_tag, &cons)) < 0)
+ if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt)) < 0)
return 0;
if (!res)
- {
- *p = 0;
return opt;
- }
if (o->direction == ODR_PRINT)
{
- fprintf(o->print, "OCTETSTRING(len=%d)\n", (*p)->len);
+ int i;
+ odr_prname(o, name);
+ fprintf(o->print, "OCTETSTRING(len=%d)", (*p)->len);
+ for (i = 0; i<(*p)->len; i++)
+ {
+ if (i < 5 || i > ((*p)->len - 4))
+ {
+ fprintf (o->print, " %02X", (*p)->buf[i]);
+ }
+ else if (i == 5)
+ fprintf (o->print, " .. ");
+ }
+ fprintf(o->print, "\n");
return 1;
}
- if (o->direction == ODR_DECODE && !*p)
+ if (o->direction == ODR_DECODE)
{
- *p = nalloc(o, sizeof(ODR_OCT));
+ *p = (Odr_oct *)odr_malloc(o, sizeof(Odr_oct));
(*p)->size= 0;
(*p)->len = 0;
(*p)->buf = 0;
}
- return ber_octetstring(o, *p, cons);
+ if (ber_octetstring(o, *p, cons))
+ return 1;
+ o->error = OOTHER;
+ return 0;
}
/*
* Friendlier interface to octetstring.
*/
-int odr_visiblestring(ODR o, char **p, int opt)
+int odr_cstring(ODR o, char **p, int opt, const char *name)
{
int cons = 0, res;
- ODR_OCT *t;
+ Odr_oct *t;
+ if (o->error)
+ return 0;
if (o->t_class < 0)
{
o->t_class = ODR_UNIVERSAL;
- o->t_tag = ODR_VISIBLESTRING;
+ o->t_tag = ODR_OCTETSTRING;
}
- if ((res = ber_tag(o, *p, o->t_class, o->t_tag, &cons)) < 0)
+ if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt)) < 0)
return 0;
if (!res)
- {
- *p = 0;
return opt;
- }
if (o->direction == ODR_PRINT)
{
+ odr_prname(o, name);
fprintf(o->print, "'%s'\n", *p);
return 1;
}
- t = nalloc(o, sizeof(ODR_OCT)); /* wrapper for octstring */
+ t = (Odr_oct *)odr_malloc(o, sizeof(Odr_oct)); /* wrapper for octstring */
if (o->direction == ODR_ENCODE)
{
t->buf = (unsigned char *) *p;
}
return 1;
}
+
+/*
+ * iconv interface to octetstring.
+ */
+int odr_iconv_string(ODR o, char **p, int opt, const char *name)
+{
+ int cons = 0, res;
+ Odr_oct *t;
+
+ if (o->error)
+ return 0;
+ if (o->t_class < 0)
+ {
+ o->t_class = ODR_UNIVERSAL;
+ o->t_tag = ODR_OCTETSTRING;
+ }
+ if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt)) < 0)
+ return 0;
+ if (!res)
+ return opt;
+ if (o->direction == ODR_PRINT)
+ {
+ odr_prname(o, name);
+ fprintf(o->print, "'%s'\n", *p);
+ return 1;
+ }
+ t = (Odr_oct *)odr_malloc(o, sizeof(Odr_oct)); /* wrapper for octstring */
+ if (o->direction == ODR_ENCODE)
+ {
+ t->buf = 0;
+#if HAVE_ICONV_H
+ if (o->op->iconv_handle != (iconv_t)(-1))
+ {
+ size_t inleft = strlen(*p);
+ char *inbuf = *p;
+ size_t outleft = 4 * inleft + 2;
+ char *outbuf = odr_malloc (o, outleft);
+ size_t ret;
+
+ t->buf = outbuf;
+
+ ret = iconv (o->op->iconv_handle, &inbuf, &inleft,
+ &outbuf, &outleft);
+ if (ret == (size_t)(-1))
+ {
+ o->error = ODATA;
+ return 0;
+ }
+ t->size = t->len = outbuf - (char*) t->buf;
+ }
+#endif
+ if (!t->buf)
+ {
+ t->buf = (unsigned char *) *p;
+ t->size = t->len = strlen(*p);
+ }
+ }
+ else
+ {
+ t->size= 0;
+ t->len = 0;
+ t->buf = 0;
+ }
+ if (!ber_octetstring(o, t, cons))
+ return 0;
+ if (o->direction == ODR_DECODE)
+ {
+ *p = 0;
+#if HAVE_ICONV_H
+ if (o->op->iconv_handle != (iconv_t)(-1))
+ {
+ size_t inleft = t->len;
+ char *inbuf = t->buf;
+ size_t outleft = 4 * inleft + 2;
+ char *outbuf = odr_malloc (o, outleft);
+ size_t ret;
+
+ *p = outbuf;
+
+ ret = iconv (o->op->iconv_handle, &inbuf, &inleft,
+ &outbuf, &outleft);
+ if (ret == (size_t)(-1))
+ {
+ o->error = ODATA;
+ return 0;
+ }
+ inleft = outbuf - (char*) *p;
+
+ (*p)[inleft] = '\0'; /* null terminate it */
+ }
+#endif
+ if (!*p)
+ {
+ *p = (char *) t->buf;
+ *(*p + t->len) = '\0'; /* ber_octs reserves space for this */
+ }
+ }
+ return 1;
+}