X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_oct.c;h=7ff12e1824116b4b51ca8b46378e324ccb329359;hb=88ad85bd973c764146777e7cfe2e4a56c71994b9;hp=c8259835b43d9380423f262d5cca42b13fae9f54;hpb=a7d28a25277a208edb9c44d124f179cc2be6db70;p=yaz-moved-to-github.git

diff --git a/odr/odr_oct.c b/odr/odr_oct.c
index c825983..7ff12e1 100644
--- a/odr/odr_oct.c
+++ b/odr/odr_oct.c
@@ -4,7 +4,19 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_oct.c,v $
- * Revision 1.1  1995-02-02 16:21:54  quinn
+ * Revision 1.5  1995-02-09 15:51:49  quinn
+ * Works better now.
+ *
+ * Revision 1.4  1995/02/07  14:13:46  quinn
+ * Bug fixes.
+ *
+ * Revision 1.3  1995/02/03  17:04:38  quinn
+ * *** empty log message ***
+ *
+ * Revision 1.2  1995/02/02  20:38:51  quinn
+ * Updates.
+ *
+ * Revision 1.1  1995/02/02  16:21:54  quinn
  * First kick.
  *
  */
@@ -15,7 +27,7 @@
  * 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)
 {
     int res, cons = 0;
 
@@ -24,8 +36,13 @@ int odr_octetstring(ODR o, ODR_OCT **p, int opt)
     	o->t_class = ODR_UNIVERSAL;
     	o->t_tag = ODR_OCTETSTRING;
     }
+    if (o->direction == ODR_DECODE)
+    	*p = 0;
     if ((res = ber_tag(o, *p, o->t_class, o->t_tag, &cons)) < 0)
+    {
+    	*p = 0;
     	return 0;
+    }
     if (!res)
     {
     	*p = 0;
@@ -33,15 +50,67 @@ int odr_octetstring(ODR o, ODR_OCT **p, int opt)
     }
     if (o->direction == ODR_PRINT)
     {
-    	fprintf(o->print, "OCTETSTRING(len=%d)\n", (*p)->len);
+    	fprintf(o->print, "%sOCTETSTRING(len=%d)\n", odr_indent(o), (*p)->len);
     	return 1;
     }
-    if (o->direction == ODR_DECODE && !*p)
+    if (o->direction == ODR_DECODE)
     {
-    	*p = nalloc(o, sizeof(ODR_OCT));
+    	*p = nalloc(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;
+    *p = 0;
+    return 0;
+}
+
+/*
+ * Friendlier interface to octetstring.
+ */
+int odr_cstring(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_OCTETSTRING;
+    }
+    if (o->direction == ODR_DECODE)
+    	*p = 0;
+    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'%s'\n", odr_indent(o), *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;
 }