X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=util%2Fiso2709.c;h=d79e42283760c28482a2c7807d0e6c224735c3f3;hb=b9bf72fa7af887225b50f567f91c06ce4353d0c8;hp=6e6d99dc8ba7f91afd08ac5a626d9ec23fa802a7;hpb=16048786fd314f5f2dd29cd5bcfb4bcb1dee2ea5;p=egate.git

diff --git a/util/iso2709.c b/util/iso2709.c
index 6e6d99d..d79e422 100644
--- a/util/iso2709.c
+++ b/util/iso2709.c
@@ -4,7 +4,17 @@
  * Europagate, 1994-1995.
  *
  * $Log: iso2709.c,v $
- * Revision 1.12  1995/03/29 16:08:56  adam
+ * Revision 1.15  1995/03/31 10:42:41  adam
+ * Bug fix.
+ *
+ * Revision 1.14  1995/03/30  14:22:18  adam
+ * More work on new MARC anchor functions.
+ *
+ * Revision 1.13  1995/03/30  07:33:32  adam
+ * New 2709 function: iso2709_mk.
+ * First implementation of iso2709_a_insert.
+ *
+ * Revision 1.12  1995/03/29  16:08:56  adam
  * Better error recovery when using bad records.
  *
  * Revision 1.11  1995/03/28  16:07:07  adam
@@ -101,6 +111,28 @@ char *iso2709_read (FILE *inf)
     return buf;
 }
 
+Iso2709Rec iso2709_mk (void)
+{
+    Iso2709Rec p;
+
+    if (!(p = malloc (sizeof(*p))))
+        return NULL;
+
+    p->record_length = 0;
+    strncpyx (p->record_status, " ", 1);
+    strncpyx (p->implementation_codes, "    ", 4);
+    p->indicator_length = 2;
+    p->identifier_length = 2;
+    p->base_address = 0;
+    strncpyx (p->user_systems, "   ", 3);
+    p->length_data_entry = 4;
+    p->length_starting = 5;
+    p->length_implementation = 0;
+    strncpyx (p->future_use, " ", 1);
+
+    p->directory = NULL;
+    return p;
+}
 
 Iso2709Rec iso2709_cvt (const char *buf)
 {
@@ -142,6 +174,7 @@ Iso2709Rec iso2709_cvt (const char *buf)
         }
         (*dpp)->next = NULL;
         (*dpp)->fields = NULL;
+        (*dpp)->indicator = NULL;
         strncpyx ((*dpp)->tag, buf+pos, 3);
         pos += 3;
         (*dpp)->length = atoin (buf+pos, p->length_data_entry);
@@ -165,6 +198,11 @@ Iso2709Rec iso2709_cvt (const char *buf)
         int dpos = pos+dp->offset;
         int epos = pos+dp->offset+dp->length-1;
 
+        if (epos <= dpos)
+        {
+            iso2709_rm (p);
+            return NULL;
+        }
         fpp = &dp->fields;
 
         if (!(*fpp = malloc (sizeof(**fpp))))
@@ -204,11 +242,6 @@ Iso2709Rec iso2709_cvt (const char *buf)
             int dpos_n;
             if (p->identifier_length && identifier_flag)
             {
-                if (!((*fpp)->identifier = malloc (p->identifier_length+1)))
-                {
-                    iso2709_rm (p);
-                    return NULL;
-                }
                 strncpyx ((*fpp)->identifier, buf+dpos+1,
                           p->identifier_length-1);
                 dpos_n = dpos += p->identifier_length;
@@ -218,7 +251,7 @@ Iso2709Rec iso2709_cvt (const char *buf)
             }
             else
             {
-                (*fpp)->identifier = NULL;
+                *(*fpp)->identifier = '\0';
                 dpos_n = dpos;
                 while (buf[dpos_n] != ISO2709_FS && buf[dpos_n] != ISO2709_RS
                        && dpos_n < epos)
@@ -232,17 +265,17 @@ Iso2709Rec iso2709_cvt (const char *buf)
             strncpyx ((*fpp)->data, buf+dpos, dpos_n - dpos);
             dpos = dpos_n;
             
-            if (dpos == epos)
+            if (dpos >= epos)
             {
                 if (buf[dpos] != ISO2709_FS && buf[dpos] != ISO2709_RS)
                     fprintf (stderr, "Missing separator at end of field "
-                             "in %s %s\n", dp->tag, (*fpp)->identifier ?
-                             (*fpp)->identifier : "");
+                             "in %s %s\n", dp->tag, (*fpp)->identifier);
                 break;
             }
             if (buf[dpos] == ISO2709_FS || buf[dpos] == ISO2709_RS)
             {
-                fprintf (stderr, "Unexpected separator inside field\n");
+                fprintf (stderr, "Unexpected separator inside field %s %s\n",
+                         dp->tag, (*fpp)->identifier);
                 break;
             }
             fpp = &(*fpp)->next;
@@ -267,7 +300,6 @@ void iso2709_rm (Iso2709Rec rec)
 
         for (field = dir->fields; field; field = field1)
         {
-            free (field->identifier);
             free (field->data);
             field1 = field->next;
             free (field);