Implement functions with variable number of arguments and 'run' mode.

* mfd/symtab.c (function_install): Take additional argument.
* mfd/lex.l: New tokens `vaptr', `...' and ARGX.
* mfd/snarf.m4 (MF_VASTRING): New define.
* mfd/gram.y: Handle functions with variable number of arguments,
$(expr), and vaptr() expressions.  This raises shift/reduce
expectation to 29 conflicts. 
(parmtype_function): Return dtype_string for
arguments from vararg list.
(FUNC_HIDDEN_ARGS): Return 1 if f->varargs is set.
(type_to_string): Handle pointer argument.
(function_call): Handle function->varargs.
(node_type): Handle node_type_argx, and node_type_vaptr.
(cast_arg_list): Handle variable number of arguments.
(cast_to): Handle dtype_pointer as dtype_number.
* mfd/drivers.c (argx, vaptr): New node types.
(code_type_call): Handle variable number of arguments.
(code_cast): Handle dtype_pointer as dtype_number.
* mfd/mailfromd.h (MAILFROMD_RUN): New define.
(struct argx_node): New type.
(struct node): Add argx_node.
(struct function): New member `varargs'.
(function_install): Add varargs.
(mailfromd_run): New prototype.
* mfd/prog.c (env_vaptr, env_get_reg): New functions.
(env_make_frame0): New function.
(instr_xmemstk): New instruction handler.
* mfd/opcodes (XMEMSTK): New opcode.
* mfd/prog.h (env_get_reg, env_vaptr): New protos.
* mfd/main.c (options): New option `--run'.
(main): Handle `run' mode.
* mfd/Makefile.am (M4_FILES): Add bi_getopt.m4.
* NEWS: Update.


git-svn-id: file:///svnroot/mailfromd/trunk@1669 7a8a7f39-df28-0410-adc6-e0d955640f24

14 files changed, 573 insertions, 55 deletions

diff --git a/ChangeLog b/ChangeLog
index db7d7df9..3116aef7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,40 @@
+2008-09-16  Sergey Poznyakoff  <gray@gnu.org.ua>
+
+        Implement functions with variable number of arguments and 'run' mode.
+        
+        * mfd/symtab.c (function_install): Take additional argument.
+        * mfd/lex.l: New tokens `vaptr', `...' and ARGX.
+        * mfd/snarf.m4 (MF_VASTRING): New define.
+        * mfd/gram.y: Handle functions with variable number of arguments,
+        $(expr), and vaptr() expressions.  This raises shift/reduce
+        expectation to 29 conflicts. 
+        (parmtype_function): Return dtype_string for
+        arguments from vararg list.
+        (FUNC_HIDDEN_ARGS): Return 1 if f->varargs is set.
+        (type_to_string): Handle pointer argument.
+        (function_call): Handle function->varargs.
+        (node_type): Handle node_type_argx, and node_type_vaptr.
+        (cast_arg_list): Handle variable number of arguments.
+        (cast_to): Handle dtype_pointer as dtype_number.
+        * mfd/drivers.c (argx, vaptr): New node types.
+        (code_type_call): Handle variable number of arguments.
+        (code_cast): Handle dtype_pointer as dtype_number.
+        * mfd/mailfromd.h (MAILFROMD_RUN): New define.
+        (struct argx_node): New type.
+        (struct node): Add argx_node.
+        (struct function): New member `varargs'.
+        (function_install): Add varargs.
+        (mailfromd_run): New prototype.
+        * mfd/prog.c (env_vaptr, env_get_reg): New functions.
+        (env_make_frame0): New function.
+        (instr_xmemstk): New instruction handler.
+        * mfd/opcodes (XMEMSTK): New opcode.
+        * mfd/prog.h (env_get_reg, env_vaptr): New protos.
+        * mfd/main.c (options): New option `--run'.
+        (main): Handle `run' mode.
+        * mfd/Makefile.am (M4_FILES): Add bi_getopt.m4.
+        * NEWS: Update.
+
 2008-09-15  Sergey Poznyakoff  <gray@gnu.org.ua>
 
         * tests/alias.at: New file.
diff --git a/NEWS b/NEWS
index 90975a06..d44443ac 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Mailfromd NEWS -- history of user-visible changes. 2008-09-15
+Mailfromd NEWS -- history of user-visible changes. 2008-09-16
 Copyright (C) 2005, 2006, 2007, 2008 Sergey Poznyakoff
 See the end of file for copying conditions.
 
@@ -19,6 +19,8 @@ It can be converted to a usual string using the `body_string' function
 
 * Changes to MFL
 
+** Function aliases
+
 Functions can have several names. Alternative function names, or
 aliases, are introduced by `alias' statement, placed between the
 function declaration and return type declaration, e.g.:
@@ -32,6 +34,30 @@ done
 
 Any number of aliases is allowed.
 
+** Functions with variable number of arguments
+
+Ellipsis as the last argument in a list of formal arguments to a
+function indicates that this function takes a variable number of
+arguments. For example:
+
+  func foo (string a ; string b, ...)
+
+Actual arguments passed in a list of variable arguments have string
+data type.  A special construct is provided to access these arguments:
+
+  $(expr)
+
+where expr is any valid MFL expression, evaluating to a number.  This
+construct returns exprth argument from the variable argument list.
+
+FIXME: Document it.
+
+** getopt and varptr
+
+New function `getopt' is provided.
+
+FIXME: Document it.
+
 * New MFL functions
 
 ** body_string
@@ -93,6 +119,20 @@ the end of the string.  Thus:
   substring("mailfrom",4,-1) => "from"
   substring("mailfrom",4,-2) => "fro"
 
+* New operation mode.
+
+When given `--run' command line option, mailfromd looks for a function
+named `main' and invokes it, passing the rest of command line as its
+arguments.  The function `main' must be declared as:
+
+  func main(...) returns number
+
+The return value from this function is used as the exit code.
+
+Command line arguments may be processed using `getopt' builtin function.
+
+FIXME: Document it.
+  
 * New programs:
 
 ** smap.
@@ -172,7 +212,7 @@ Quarantines the message using the given reason.
 
 * mtasim
 
-New command line options `--usage' and `--group' allow to specify user
+New command line options `--user' and `--group' allow to specify user
 name and a list of additional groups when the program is run with
 `root' privileges.
  
diff --git a/mfd/Makefile.am b/mfd/Makefile.am
index 136ab520..829454be 100644
--- a/mfd/Makefile.am
+++ b/mfd/Makefile.am
@@ -23,6 +23,7 @@ M4_FILES=\
  bi_body.m4\
  bi_db.m4\
  bi_dns.m4\
+ bi_getopt.m4\
  bi_gettext.m4\
  bi_header.m4\
  bi_io.m4\
diff --git a/mfd/bi_getopt.m4 b/mfd/bi_getopt.m4
new file mode 100644
index 00000000..70a7e555
--- /dev/null
+++ b/mfd/bi_getopt.m4
@@ -0,0 +1,129 @@
+/* This file is part of Mailfromd.             -*- c -*-
+   Copyright (C) 2008 Sergey Poznyakoff
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+
+#include <unistd.h>
+#include <stdlib.h>
+#include <getopt.h>
+
+MF_VAR(optarg, STRING);
+MF_VAR(optind, NUMBER);
+
+MF_DEFUN_VARARGS(getopt, STRING, NUMBER argc, NUMBER argoff)
+{
+        int rc;
+        int long_idx;
+        static char xargc;
+        static char **xargv;
+        static struct option *option;
+        static char *optstr;
+        static char *loptstr;
+        
+        if (argc) {
+                size_t i, n;
+                size_t serial = 256;
+                
+                xargc = argc + 1;
+                xargv = xcalloc(xargc+1, sizeof(xargv[0]));
+                xargv[0] = script_file;
+                for (i = 0; i < argc; i++)
+                        xargv[i+1] = MF_VASTRING(argoff + i);
+                xargv[i+1] = NULL;
+
+                n = MF_VA_COUNT();
+                if (n) {
+                        size_t i, j;
+                        size_t len;
+                        char *str;
+                        size_t size, lsize, lcnt;
+                        
+                        MF_VA_START();
+
+                        size = lsize = lcnt = 0;
+                        for (i = 0; i < n; i++) {
+                                MF_VA_ARG(i, STRING, str);
+                                len = strcspn(str, ",");
+                                size += len;
+                                if (str[len]) {
+                                        lcnt++;
+                                        lsize += strlen(str + len);
+                                }
+                        }
+
+                        optstr = xrealloc(optstr, size + 1);
+                        loptstr = xrealloc(loptstr, lsize + 1);
+                        option = xreall