X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=fml%2Ffmlcalls.c;h=d2f4cfce200ea58e633dd6d7ad768ff40eb964dc;hb=e1ec9d39463f431383547891f38e30f2ff17842c;hp=5e73f0e332a2a44f81d29d2107ac47359fac483e;hpb=5f82d212861388cc73741917b38f67d773d01549;p=egate.git

diff --git a/fml/fmlcalls.c b/fml/fmlcalls.c
index 5e73f0e..d2f4cfc 100644
--- a/fml/fmlcalls.c
+++ b/fml/fmlcalls.c
@@ -1,8 +1,62 @@
 /*
+ * 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: fmlcalls.c,v $
- * Revision 1.1  1995/02/09 16:06:07  adam
+ * Revision 1.5  1995/05/16 09:39:33  adam
+ * LICENSE.
+ *
+ * Revision 1.4  1995/02/23  08:32:04  adam
+ * Changed header.
+ *
+ * Revision 1.2  1995/02/10  15:50:55  adam
+ * MARC interface implemented. Minor bugs fixed. fmltest can
+ * be used to format single MARC records. New function '\list'
+ * implemented.
+ *
+ * Revision 1.1  1995/02/09  16:06:07  adam
  * FML can be called from the outside multiple times by the functions:
  * fml_exec_call and fml_exec_call_str.
  * An interactive parameter (-i) to fmltest starts a shell-like
@@ -15,22 +69,46 @@
 
 #include "fmlp.h"
 
-static const char *str_ptr;
+static const char **str_args;
 static int eof_mark;
 static int str_reader (void)
 {
-    if (!*str_ptr)
-        return eof_mark;
-    return *str_ptr++;
+    int c;
+    while (! (c = **str_args))
+    {
+        if (! str_args[1])
+            return eof_mark;
+        ++str_args;
+    }   
+    ++ *str_args;
+    return c;
 }
 
+void fml_exec_call_argv (Fml fml, const char **argv)
+{
+    int (*old_func)(void) = fml->read_func;
+
+    fml->read_func = str_reader;
+    str_args = argv;
+    eof_mark = fml->eof_mark;
+    fml_exec_call (fml);
+    fml->read_func = old_func;
+}
+
+
 void fml_exec_call_str (Fml fml, const char *str)
 {
     int (*old_func)(void) = fml->read_func;
+    const char *argv[2];
+
+    argv[0] = str;
+    argv[1] = NULL;
 
     fml->read_func = str_reader;
-    str_ptr = str;
+    str_args = argv;
     eof_mark = fml->eof_mark;
     fml_exec_call (fml);
     fml->read_func = old_func;
 }
+
+