X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=fml%2Ffmlmem.c;h=70b3e2c130b58cb4d8c53bf72241b0ddc922bf69;hb=4938d0c2e8f4e1eec397c2bfbbc7e23fd150c369;hp=eabd8adc9458e8643d96a71034895e4d297abd4f;hpb=22157698623135d4e8a4910eea084c96b46773db;p=egate.git

diff --git a/fml/fmlmem.c b/fml/fmlmem.c
index eabd8ad..70b3e2c 100644
--- a/fml/fmlmem.c
+++ b/fml/fmlmem.c
@@ -1,8 +1,64 @@
 /*
+ * Copyright (c) 1995, the EUROPAGATE consortium (see below).
+ *
+ * The EUROPAGATE consortium members are:
+ *
+ *    University College Dublin
+ *    Danmarks Teknologiske Videnscenter
+ *    An Chomhairle Leabharlanna
+ *    Consejo Superior de Investigaciones Cientificas
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation, in whole or in part, for any purpose, is hereby granted,
+ * provided that:
+ *
+ * 1. This copyright and permission notice appear in all copies of the
+ * software and its documentation. Notices of copyright or attribution
+ * which appear at the beginning of any file must remain unchanged.
+ *
+ * 2. The names of EUROPAGATE or the project partners may not be used to
+ * endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * 3. Users of this software (implementors and gateway operators) agree to
+ * inform the EUROPAGATE consortium of their use of the software. This
+ * information will be used to evaluate the EUROPAGATE project and the
+ * software, and to plan further developments. The consortium may use
+ * the information in later publications.
+ * 
+ * 4. Users of this software agree to make their best efforts, when
+ * documenting their use of the software, to acknowledge the EUROPAGATE
+ * consortium, and the role played by the software in their work.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ * IN NO EVENT SHALL THE EUROPAGATE CONSORTIUM OR ITS MEMBERS BE LIABLE
+ * FOR ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF
+ * ANY KIND, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
+ * OR PROFITS, WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND
+ * ON ANY THEORY OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE
+ * USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+/*
  * FML interpreter. Europagate, 1995
  *
  * $Log: fmlmem.c,v $
- * Revision 1.9  1995/02/27 09:01:20  adam
+ * Revision 1.13  1996/01/29 17:52:05  adam
+ * Minor change - removed unnecessary &.
+ *
+ * Revision 1.12  1995/05/16  09:39:34  adam
+ * LICENSE.
+ *
+ * Revision 1.11  1995/03/02  10:18:48  adam
+ * Bug fix.
+ *
+ * Revision 1.10  1995/03/02  08:06:03  adam
+ * Fml function strsub implemented. New test files marc[45].fml.
+ * New test options in fmltest.
+ *
+ * Revision 1.9  1995/02/27  09:01:20  adam
  * Regular expression support. Argument passing by name option. New FML
  * function strlen.
  *
@@ -110,7 +166,7 @@ static struct fml_atom *atom_copy (Fml fml, struct fml_atom *a)
     a0 = a1 = atom_malloc (fml);
     while (a)
     {
-        memcpy (&a1->buf, &a->buf, FML_ATOM_BUF);
+        memcpy (a1->buf, a->buf, FML_ATOM_BUF);
         if (!a->next)
             break;
         a = a->next;
@@ -161,7 +217,7 @@ int fml_atom_cmp (Fml fml, struct fml_atom *a1, struct fml_atom *a2)
 
 int fml_atom_str (struct fml_atom *a, char *str)
 {
-    int len = 0;
+    int i, len = 0;
 
     assert (a);
     while (a->next)
@@ -171,9 +227,14 @@ int fml_atom_str (struct fml_atom *a, char *str)
         len += FML_ATOM_BUF;
         a = a->next;
     }
+    for (i=0; i<FML_ATOM_BUF && a->buf[i]; i++)
+        ;
     if (str)
-        strcpy (str+len, a->buf);
-    len += strlen(str+len);
+    {
+        memcpy (str+len, a->buf, i);
+        str[len+i] = 0;
+    }
+    len += i;
     return len;
 }
 
@@ -277,3 +338,26 @@ void fml_node_stat (Fml fml)
     if (fml->debug & 2)
         printf ("<<node=%d, atom=%d>>", no_nodes, no_atoms);
 }
+
+struct fml_atom *fml_atom_strsub (Fml fml, struct fml_atom *a, int o, int l)
+{
+    static char buf[512];
+    char *cp;
+    struct fml_atom *an;
+    int ol = fml_atom_len (a);
+
+    if (ol >= 510)
+    {
+        cp = malloc (ol + 1);
+        assert (cp);
+    }
+    else
+        cp = buf;
+    fml_atom_str (a, buf);
+    if (o + l < ol)
+        buf[o+l] = '\0';
+    an = fml_atom_alloc (fml, buf+o);
+    if (ol >= 510)
+        free (cp);
+    return an;
+}