projects
/
egate.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Timeout (idletime) adjustable. Minor changes in kernel.
[egate.git]
/
fml
/
fmlmem.c
diff --git
a/fml/fmlmem.c
b/fml/fmlmem.c
index
eabd8ad
..
e78fc3c
100644
(file)
--- a/
fml/fmlmem.c
+++ b/
fml/fmlmem.c
@@
-2,7
+2,14
@@
* FML interpreter. Europagate, 1995
*
* $Log: fmlmem.c,v $
* FML interpreter. Europagate, 1995
*
* $Log: fmlmem.c,v $
- * Revision 1.9 1995/02/27 09:01:20 adam
+ * 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.
*
* Regular expression support. Argument passing by name option. New FML
* function strlen.
*
@@
-161,7
+168,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 fml_atom_str (struct fml_atom *a, char *str)
{
- int len = 0;
+ int i, len = 0;
assert (a);
while (a->next)
assert (a);
while (a->next)
@@
-171,9
+178,14
@@
int fml_atom_str (struct fml_atom *a, char *str)
len += FML_ATOM_BUF;
a = a->next;
}
len += FML_ATOM_BUF;
a = a->next;
}
+ for (i=0; i<FML_ATOM_BUF && a->buf[i]; i++)
+ ;
if (str)
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;
}
return len;
}
@@
-277,3
+289,26
@@
void fml_node_stat (Fml fml)
if (fml->debug & 2)
printf ("<<node=%d, atom=%d>>", no_nodes, no_atoms);
}
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;
+}