Fixed stupid bug in str2oid routine.

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

diff --git a/odr/odr_util.c b/odr/odr_util.c
index 0ea1c08..cfa28cc 100644 (file)
--- a/odr/odr_util.c
+++ b/odr/odr_util.c
@@ -1,11 +1,17 @@
 #include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
 #include <odr.h>
+#include <oid.h>
 
 char *odr_indent(ODR o)
 {
     static char buf[512];
+    int i = o->indent;
 
     memset(buf, ' ', 512);
+    if (i >= 128)
+       i = 127;
     buf[o->indent * 4] = 0;
     return buf;
 }
@@ -29,52 +35,33 @@ int odp_more_chunks(ODR o, unsigned char *base, int len)
         return o->bp - base < len;
 }
 
-/* OID utilities */
-
-void odr_oidcpy(Odr_oid *t, Odr_oid *s)
-{
-    while ((*(t++) = *(s++)) > -1);
-}
-
-void odr_oidcat(Odr_oid *t, Odr_oid *s)
-{
-    while (*t > -1)
-       t++;
-    while ((*(t++) = *(s++)) > -1);
-}
-
-int odr_oidcmp(Odr_oid *o1, Odr_oid *o2)
-{
-    while (*o1 == *o2 && *o1 > -1)
-    {
-       o1++;
-       o2++;
-    }
-    if (*o1 == *o2)
-       return 0;
-    else if (*o1 > *o2)
-       return 1;
-    else
-       return -1;
-}
-
-int odr_oidlen(Odr_oid *o)
-{
-    int len = 0;
-
-    while (*(o++) >= 0)
-       len++;
-    return len;
-}
-
 Odr_oid *odr_oiddup(ODR odr, Odr_oid *o)
 {
     Odr_oid *r;
 
     if (!o)
        return 0;
-    if (!(r = odr_malloc(odr, (odr_oidlen(o) + 1) * sizeof(Odr_oid))))
+    if (!(r = odr_malloc(odr, (oid_oidlen(o) + 1) * sizeof(int))))
        return 0;
-    odr_oidcpy(r, o);
+    oid_oidcpy(r, o);
     return r;
 }
+
+Odr_oid *odr_getoidbystr(ODR o, char *str)
+{
+    int num = 1, i = 0;
+    char *p = str;
+    Odr_oid *ret;
+
+    if (!isdigit(*str))
+       return 0;
+    while ((p = strchr(p, '.')))
+       num++, p++;
+    ret = odr_malloc(o, sizeof(*ret)*(num + 1));
+    p = str;
+    do
+       ret[i++] = atoi(p);
+    while ((p = strchr(p, '.')) && ++p);
+    ret[i] = -1;
+    return ret;
+}