[SCM] GNU Mailutils branch, master, updated. release-2.2-270-g2cbe825

[Sergey Poznyakoff]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=2cbe825eb999f224ce756510dbd7123bc76ec924

The branch, master has been updated
       via  2cbe825eb999f224ce756510dbd7123bc76ec924 (commit)
      from  04c2931bb963fefd4654ef2de2cf0667cf8a333d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2cbe825eb999f224ce756510dbd7123bc76ec924
Author: Sergey Poznyakoff <address@hidden>
Date:   Tue Dec 7 23:03:33 2010 +0200

    comsat: add a way to specify alternative biffrc file name; new biffrc 
statement: tty
    
    * comsat/comsat.c (options): New option --file.
    (biffrc): New variable.
    (comsatd_parse_opt): Handle the --file option.
    (open_tty): New function.
    (notify_user): Open the tty using open_tty function and a default
    set of filters.
    (main): Hanlde --file option.
    * comsat/action.c (run_user_action): Implement the `tty' statement.
    * comsat/comsat.h (biffrc): New extern.
    (open_tty): New function.
    
    mu: accept a chain of filters.
    
    * mu/filter.c (filter_doc, filter_docstring): Update.
    (mutool_filter): Accept a filter chain.

-----------------------------------------------------------------------

Summary of changes:
 comsat/action.c |   21 +++++++-
 comsat/comsat.c |  153 ++++++++++++++++++++++++++++++++++++++++++-------------
 comsat/comsat.h |    2 +
 mu/filter.c     |   70 +++++++++++++++++++------
 4 files changed, 191 insertions(+), 55 deletions(-)

diff --git a/comsat/action.c b/comsat/action.c
index dcb2563..46afde5 100644
--- a/comsat/action.c
+++ b/comsat/action.c
@@ -331,7 +331,7 @@ run_user_action (mu_stream_t tty, mu_message_t msg)
   mu_stream_t input;
   int nact = 0;
 
-  input = open_rc (BIFF_RC, tty);
+  input = open_rc (biffrc, tty);
   if (input)
     {
       char *stmt = NULL;
@@ -384,8 +384,23 @@ run_user_action (mu_stream_t tty, mu_message_t msg)
                      if (!ws.ws_wordv[i])
                        break;
                    }
-                 
-                 if (strcmp (ws.ws_wordv[0], "echo") == 0)
+
+                 if (strcmp (ws.ws_wordv[0], "tty") == 0)
+                   {
+                     mu_stream_t ntty = open_tty (ws.ws_wordv[1],
+                                                  ws.ws_wordc - 2,
+                                                  ws.ws_wordv + 2);
+                     if (!ntty)
+                       {
+                         mu_stream_printf (tty,
+                                           _(".biffrc:%d: cannot open tty\n"),
+                                           locus.mu_line);
+                         break;
+                       }
+                     mu_stream_destroy (&tty);
+                     tty = ntty;
+                   }
+                 else if (strcmp (ws.ws_wordv[0], "echo") == 0)
                    {
                      int argc = ws.ws_wordc - 1;
                      char **argv = ws.ws_wordv + 1;
diff --git a/comsat/comsat.c b/comsat/comsat.c
index faf18be..c757bc4 100644
--- a/comsat/comsat.c
+++ b/comsat/comsat.c
@@ -66,6 +66,8 @@ static struct argp_option options[] =
   { "inetd",  'i', 0, 0, N_("run in inetd mode"), 0 },
   { "daemon", 'd', N_("NUMBER"), OPTION_ARG_OPTIONAL,
     N_("runs in daemon mode with a maximum of NUMBER children"), 0 },
+  { "file", 'f', N_("FILE"), 0,
+    N_("read FILE instead of .biffrc"), 0 },
   { NULL, 0, NULL, 0, NULL, 0 }
 };
 
@@ -110,6 +112,7 @@ static int change_user (const char *user);
 
 static int reload = 0;
 int test_mode;
+char *biffrc = BIFF_RC;
 
 struct mu_cfg_param comsat_cfg_param[] = {
   { "allow-biffrc", mu_cfg_bool, &allow_biffrc, 0, NULL,
@@ -147,6 +150,10 @@ comsatd_parse_opt (int key, char *arg, struct argp_state 
*state)
        mu_argp_node_list_new (lst, "max-children", arg);
       break;
 
+    case 'f':
+      biffrc = arg;
+      break;
+      
     case 'i':
       mu_argp_node_list_new (lst, "mode", "inetd");
       break;
@@ -236,7 +243,7 @@ comsat_process (char *buffer, size_t rdlen)
     {
       if (require_tty)
        return;
-      strcpy (tty, "/dev/null");
+      tty[0] = 0;
     }
 
   /* Child: do actual I/O */
@@ -377,50 +384,112 @@ need_crlf (mu_stream_t str)
 #endif
 }
 
+static mu_stream_t
+_open_tty (const char *device, int argc, char **argv)
+{
+  mu_stream_t dev, base_dev, prev_stream;
+  int status;
+  
+  status = mu_file_stream_create (&dev, device, MU_STREAM_WRITE);
+  if (status)
+    {
+      mu_error (_("cannot open device %s: %s"),
+               device, mu_strerror (status));
+      return NULL;
+    }
+  mu_stream_set_buffer (dev, mu_buffer_line, 0);
+
+  prev_stream = base_dev = dev;
+  while (argc)
+    {
+      int i;
+      int mode;
+      int qmark;
+      char *fltname;
+      
+      fltname = argv[0];
+      if (fltname[0] == '?')
+       {
+         qmark = 1;
+         fltname++;
+       }
+      else
+       qmark = 0;
+      
+      if (fltname[0] == '~')
+       {
+         mode = MU_FILTER_DECODE;
+         fltname++;
+       }
+      else
+       {
+         mode = MU_FILTER_ENCODE;
+       }
+      
+      for (i = 1; i < argc; i++)
+       if (strcmp (argv[i], "+") == 0)
+         break;
+      
+      if (qmark == 0 || need_crlf (base_dev))
+       {
+         status = mu_filter_create_args (&dev, prev_stream, fltname,
+                                         i, (const char **)argv,
+                                         mode, MU_STREAM_WRITE);
+         mu_stream_unref (prev_stream);
+         if (status)
+           {
+             mu_error (_("cannot open filter stream: %s"),
+                       mu_strerror (status));
+             return NULL;
+           }
+         prev_stream = dev;
+       }
+      argc -= i;
+      argv += i;
+      if (argc)
+       {
+         argc--;
+         argv++;
+       }
+    }
+  return dev;
+}
+
+mu_stream_t
+open_tty (const char *device, int argc, char **argv)
+{
+  mu_stream_t dev;
+
+  if (!device || !*device || strcmp (device, "null") == 0)
+    {
+      int rc = mu_nullstream_create (&dev, MU_STREAM_WRITE);
+      if (rc)
+       mu_error (_("cannot open null stream: %s"), mu_strerror (rc));
+    }
+  else
+    dev = _open_tty (device, argc, argv); 
+  return dev;
+}
+
 /* NOTE: Do not bother to free allocated memory, as the program exits
    immediately after executing this */
 static void
 notify_user (const char *user, const char *device, const char *path,
             mu_message_qid_t qid)
 {
-  mu_stream_t out, dev;
+  mu_stream_t dev;
   mu_mailbox_t mbox = NULL;
   mu_message_t msg;
+  static char *default_filters[] = { "7bit", "+", "?CRLF", NULL };
   int status;
 
   if (change_user (user))
     return;
-  status = mu_file_stream_create (&dev, device, MU_STREAM_WRITE);
-  if (status)
-    {
-      mu_error (_("cannot open device %s: %s"), device, mu_strerror (status));
-      return;
-    }
-  mu_stream_set_buffer (dev, mu_buffer_line, 0);
-  
-  status = mu_filter_create (&out, dev, "7bit", MU_FILTER_ENCODE,
-                            MU_STREAM_WRITE);
-  mu_stream_unref (dev);
-  if (status)
-    {
-      mu_error (_("cannot create 7bit filter: %s"), mu_strerror (status));
-      return;      
-    }
-  
-  if (need_crlf (out))
-    {
-      mu_stream_t str;
-      status = mu_filter_create (&str, out, "CRLF", MU_FILTER_ENCODE,
-                                MU_STREAM_WRITE);
-      mu_stream_unref (out);
-      if (status)
-       {
-         mu_error (_("cannot create crlf filter: %s"), mu_strerror (status));
-         return;
-       }
-      out = str;
-    }
 
+  dev = open_tty (device, MU_ARRAY_SIZE (default_filters) - 1,
+                 default_filters);
+  if (!dev)
+    return;
   if (!path)
     {
       path = mailbox_path (user);
@@ -445,8 +514,8 @@ notify_user (const char *user, const char *device, const 
char *path,
       return; /* FIXME: Notify the user, anyway */
     }
 
-  run_user_action (out, msg);
-  mu_stream_destroy (&out);
+  run_user_action (dev, msg);
+  mu_stream_destroy (&dev);
 }
 
 /* Search utmp for the local user */
@@ -613,7 +682,20 @@ main (int argc, char **argv)
              user = pw->pw_name;
            }
        }
-                 
+
+      if (biffrc[0] == '.')
+       {
+         char *cwd = mu_getcwd ();
+         biffrc = mu_make_file_name (cwd, biffrc);
+         if (!biffrc)
+           {
+             mu_error ("%s", mu_strerror (ENOMEM));
+             exit (1);
+           }
+         mu_normalize_path (biffrc);
+         free (cwd);
+       }
+      
       notify_user (user, "/dev/tty", argv[0], argv[1]);
       exit (0);
     }
@@ -655,4 +737,3 @@ main (int argc, char **argv)
   
   return c != 0;
 }
-
diff --git a/comsat/comsat.h b/comsat/comsat.h
index e23aaba..8368c6f 100644
--- a/comsat/comsat.h
+++ b/comsat/comsat.h
@@ -77,6 +77,8 @@ extern int maxlines;
 extern const char *username;
 extern char *hostname;
 extern struct daemon_param daemon_param;
+extern char *biffrc;
 
 void run_user_action (mu_stream_t str, mu_message_t msg);
+mu_stream_t open_tty (const char *device, int argc, char **argv);
 
diff --git a/mu/filter.c b/mu/filter.c
index c455b6d..8d9c222 100644
--- a/mu/filter.c
+++ b/mu/filter.c
@@ -23,9 +23,9 @@
 #include "argp.h"
 #include "mu.h"
 
-static char filter_doc[] = N_("mu filter - apply a filter to the input");
-char filter_docstring[] = N_("apply a filter to the input");
-static char filter_args_doc[] = N_("NAME [ARGS]");
+static char filter_doc[] = N_("mu filter - apply a chain of filters to the 
input");
+char filter_docstring[] = N_("apply a chain of filters to the input");
+static char filter_args_doc[] = N_("[~]NAME [ARGS] [+ [~]NAME [ARGS]...]");
 
 static struct argp_option filter_options[] = {
   { "encode", 'e', NULL, 0, N_("encode the input (default)") },
@@ -126,12 +126,23 @@ list_filters ()
   return mu_list_do (list, filter_printer, NULL);
 }
 
+static int
+negate_filter_mode (int mode)
+{
+  if (mode == MU_FILTER_DECODE)
+    return MU_FILTER_ENCODE;
+  else if (mode == MU_FILTER_ENCODE)
+    return MU_FILTER_DECODE;
+  abort ();
+}
+
 int
 mutool_filter (int argc, char **argv)
 {
   int rc, index;
-  mu_stream_t flt;
+  mu_stream_t flt, prev_stream;
   const char *fltname;
+  int mode;
   
   if (argp_parse (&filter_argp, argc, argv, ARGP_IN_ORDER, &index, NULL))
     return 1;
@@ -155,20 +166,47 @@ mutool_filter (int argc, char **argv)
       return 1;
     }
 
-  fltname = argv[0];
-
-  if (line_length_option)
-    reset_line_length (fltname, line_length);
-
-  rc = mu_filter_create_args (&flt, mu_strin, fltname,
-                             argc, (const char **)argv,
-                             filter_mode, MU_STREAM_READ);
-  if (rc)
+  prev_stream = mu_strin;
+  do
     {
-      mu_error (_("cannot open filter stream: %s"), mu_strerror (rc));
-      return 1;
-    }
+      int i;
+      
+      fltname = argv[0];
+      if (fltname[0] == '~')
+       {
+         mode = negate_filter_mode (filter_mode);
+         fltname++;
+       }
+      else
+       mode = filter_mode;
 
+      for (i = 1; i < argc; i++)
+       if (strcmp (argv[i], "+") == 0)
+         break;
+      
+      if (line_length_option)
+       reset_line_length (fltname, line_length);
+
+      rc = mu_filter_create_args (&flt, prev_stream, fltname,
+                                 i, (const char **)argv,
+                                 mode, MU_STREAM_READ);
+      mu_stream_unref (prev_stream);
+      if (rc)
+       {
+         mu_error (_("cannot open filter stream: %s"), mu_strerror (rc));
+         return 1;
+       }
+      prev_stream = flt;
+      argc -= i;
+      argv += i;
+      if (argc)
+       {
+         argc--;
+         argv++;
+       }
+    }
+  while (argc);
+  
   rc = mu_stream_copy (mu_strout, flt, 0, NULL);
 
   if (rc)


hooks/post-receive
-- 
GNU Mailutils