Updates.

[yaz-moved-to-github.git] / odr / odr_oct.c

diff --git a/odr/odr_oct.c b/odr/odr_oct.c
index c825983..4daccb3 100644 (file)
--- a/odr/odr_oct.c
+++ b/odr/odr_oct.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_oct.c,v $
- * Revision 1.1  1995-02-02 16:21:54  quinn
+ * Revision 1.2  1995-02-02 20:38:51  quinn
+ * Updates.
+ *
+ * Revision 1.1  1995/02/02  16:21:54  quinn
  * First kick.
  *
  */
@@ -45,3 +48,50 @@ int odr_octetstring(ODR o, ODR_OCT **p, int opt)
     }
     return ber_octetstring(o, *p, cons);
 }
+
+/*
+ * Friendlier interface to octetstring.
+ */
+int odr_visiblestring(ODR o, char **p, int opt)
+{
+    int cons = 0, res;
+    ODR_OCT *t;
+
+    if (o->t_class < 0)
+    {
+       o->t_class = ODR_UNIVERSAL;
+       o->t_tag = ODR_VISIBLESTRING;
+    }
+    if ((res = ber_tag(o, *p, o->t_class, o->t_tag, &cons)) < 0)
+       return 0;
+    if (!res)
+    {
+       *p = 0;
+       return opt;
+    }
+    if (o->direction == ODR_PRINT)
+    {
+       fprintf(o->print, "'%s'\n", *p);
+       return 1;
+    }
+    t = nalloc(o, sizeof(ODR_OCT));   /* wrapper for octstring */
+    if (o->direction == ODR_ENCODE)
+    {
+       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 = (char *) t->buf;
+       *(*p + t->len) = '\0';  /* ber_octs reserves space for this */
+    }
+    return 1;
+}