Rewrite debugging and logging support.

The mu_debug_t object and associated functions have been removed.
New debugging functions are based on the logstream interface.

* include/mailutils/debug.hm4: Remove.
* include/mailutils/debug.h: New file.
* include/mailutils/Makefile.am (BUILT_SOURCES,EXTRA_DIST): Remove debug.h,
debug.hm4.

* mu-aux/debugdef.m4: Remove.
* mu-aux/debcat.awk: New file.
* mu-aux/Makefile.am (EXTRA_DIST): Replace debugdef.m4 with debcat.awk.

* include/mailutils/sys/dbgstream.h: Remove.
* include/mailutils/sys/debug.h: Remove.
* include/mailutils/sys/Makefile.am (sysinclude_HEADERS): Remove debug.h
and dbgstream.h, add debcat.h
* include/mailutils/sys/.gitignore: Add debcat.h.

* libmailutils/diag/dbgstderr.c: Remove.
* libmailutils/diag/dbgsyslog.c: Remove.
* libmailutils/diag/gdebug.c: Remove.
* libmailutils/diag/debcat: New file.
* libmailutils/diag/Makefile.am (libdiag_la_SOURCES): Remove these
sources.
* libmailutils/diag/debug.c: Rewrite from scratch.
* libmailutils/diag/diag.c: Rewrite from scratch.

* libmailutils/diag/syslog.c (mu_diag_syslog_printer): Remove function.
(mu_log_syslog, mu_log_print_severity): New variables.

* libmailutils/stream/dbgstream.c: Remove.
* libmailutils/stream/Makefile.am (libstream_la_SOURCES): Remove dbgstream.c..
* libmailutils/stdstream/Makefile.am (libstdstream_la_SOURCES): Add
dbgstream.c.
* libmailutils/stream/logstream.c (_mu_severity_str): Change strings
to lower case.
(_log_write): Improve handling of unrecognized escapes.
(_log_ctl): Handle MU_LOGSTREAM_ADVANCE_LOCUS_LINE and
MU_LOGSTREAM_ADVANCE_LOCUS_COL.

* libmailutils/mailbox/folder.c (mu_folder_has_debug)
(mu_folder_get_debug, mu_folder_set_debug): Remove functions.

* mu-aux/debcat.awk: New file.
* libmailutils/stdstream/dbgstream.c: New file.

* comsat/action.c: Use new debug/log functions.
* comsat/comsat.c: Likewise.
* examples/aclck.c: Likewise.
* examples/echosrv.c: Likewise.
* examples/msg-send.c: Likewise.
* examples/nntpclient.c: Likewise.
* examples/numaddr.c: Likewise.
* frm/common.c: Likewise.
* imap4d/imap4d.c: Likewise.
* imap4d/io.c: Likewise.
* imap4d/util.c: Likewise.
* libmailutils/auth/mu_auth.c: Likewise.
* libmailutils/base/amd.c: Likewise.
* libmailutils/cfg/driver.c: Likewise.
* libmailutils/cfg/format.c: Likewise.
* libmailutils/cfg/lexer.l: Likewise.
* libmailutils/cfg/parser.y: Likewise.
* libmailutils/mailbox/mailbox.c: Likewise.
* libmailutils/mailbox/mbx_default.c: Likewise.
* libmailutils/mailer/mailer.c: Likewise.
* libmailutils/mailer/progmailer.c: Likewise.
* libmailutils/server/acl.c: Likewise.
* libmailutils/server/ipsrv.c: Likewise.
* libmailutils/server/msrv.c: Likewise.
* libmailutils/tests/wicket.c: Likewise.
* libmu_argp/auth.c: Likewise.
* libmu_argp/cmdline.c: Likewise.
* libmu_argp/common.c: Likewise.
* libmu_auth/ldap.c: Likewise.
* libmu_cfg/acl.c: Likewise.
* libmu_cfg/auth.c: Likewise.
* libmu_cfg/common.c: Likewise.
* libmu_cfg/ldap.c: Likewise.
* libmu_cfg/sieve.c: Likewise.
* libmu_cfg/sql.c: Likewise.
* libmu_scm/mu_message.c: Likewise.
* libmu_sieve/prog.c: Likewise.
* libmu_sieve/runtime.c: Likewise.
* libproto/imap/trace.c: Likewise.
* libproto/mailer/mbox.c: Likewise.
* libproto/mailer/prog.c: Likewise.
* libproto/mailer/sendmail.c: Likewise.
* libproto/mailer/smtp.c: Likewise.
* libproto/mailer/smtp_trace.c: Likewise.
* libproto/mbox/folder.c: Likewise.
* libproto/mbox/mbox.c: Likewise.
* libproto/nntp/folder.c: Likewise.
* libproto/nntp/nntp_debug.c: Likewise.
* libproto/pop/mbox.c: Likewise.
* libproto/pop/pop3_trace.c: Likewise.
* maidag/guile.c: Likewise.
* maidag/lmtp.c: Likewise.
* maidag/maidag.c: Likewise.
* maidag/util.c: Likewise.
* mail/mail.c: Likewise.
* mail/mailvar.c: Likewise.
* mail/send.c: Likewise.
* mail/source.c: Likewise.
* mh/mh_argp.c: Likewise.
* mh/send.c: Likewise.
* mimeview/mimeview.c: Likewise.
* movemail/movemail.c: Likewise.
* mu/wicket.c: Likewise.
* pop3d/extra.c: Likewise.
* pop3d/pop3d.c: Likewise.
* readmsg/readmsg.c: Likewise.
* sieve/sieve.c: Likewise.
* testsuite/mimetest.c: Likewise.

* libmu_sieve/sieve-priv.h (mu_sieve_machine) <parse_error_printer>
<error_printer, debug_printer, debug>: Remove.
<errstream>: New member.
(mu_sv_compile_error, mu_sv_print_value_list)
(mu_sv_print_tag_list): Change prototypes.

* libmu_sieve/actions.c: Use new sieve debug functions.
* libmu_sieve/extensions/list.c: Likewise.
* libmu_sieve/extensions/moderator.c: Likewise.
* libmu_sieve/extensions/pipe.c: Likewise.
* libmu_sieve/extensions/spamd.c: Likewise.
* libmu_sieve/extensions/timestamp.c: Likewise.
* libmu_sieve/extensions/vacation.c: Likewise.
* libmu_sieve/sieve.y : Likewise.
* libmu_sieve/sieve.l: Likewise.
* libmu_sieve/tests.c: Likewise.
* libmu_sieve/util.c: Rewrite diagnostic support.
* /maidag/sieve.c: Use new debug/log and sieve diagnostic functions.

* mu/mu.c (main): Remove call to mu_stdstream_setup. It is called
by mu_app_init now.

* libmailutils/base/wicket.c (mu_wicket_stream_match_url): Change signature.
* libmailutils/cfg/gocs.c (mu_gocs_logging_init): Rewrite.
* libmailutils/mailbox/message.c (mu_message_save_to_mailbox): Remove
mu_debug_t argument.
* libmailutils/stdstream/basestr.c (mu_stdstream_setup): Minor fixes.
* libmailutils/stdstream/strerr.c (mu_stdstream_strerr_create): Do
not install filter stream if tag is NULL.
(mu_stdstream_strerr_setup): New function.
* libmu_argp/muinit.c (mu_app_init): Set mu_log_tag.
Call mu_stdstream_setup.
* libmu_scm/mu_dbgport.c: Rewrite port support.

* include/mailutils/acl.h (mu_acl_get_debug)
(mu_acl_set_debug): Remove prototypes.
* include/mailutils/auth.h (mu_wicket_stream_match_url): Change signature.
* include/mailutils/cfg.h (mu_cfg_locus_t): Remove typedef, use
struct mu_locus instead.
(mu_cfg_locus): Remove declaration.
(mu_cfg_node)<locus>: Change type.
(mu_cfg_node)<debug>: Remove.
(mu_cfg_vperror,mu_cfg_perror)
(mu_cfg_parse_error,mu_cfg_format_error): Remove prototypes.
(mu_cfg_callback_t): Change signature.  All uses updated.
(mu_cfg_get_debug): Remove prototype.
(mu_cfg_assert_value_type, mu_cfg_string_value_cb): Change signature.
(mu_cfg_tree_set_debug): Remove prototype.
(mu_cfg_tree_create_node): Change signature.
* include/mailutils/diag.h (MU_DIAG_): Redefine via MU_LOG_ constants.
(mu_diag_get_debug,mu_diag_set_debug): Remove.
(mu_diag_cont_vprintf, mu_diag_cont_printf)
(mu_diag_at_locus): New functions.
* include/mailutils/folder.h (mu_folder_has_debug)
(mu_folder_get_debug, mu_folder_set_debug): Remove prototypes.
* include/mailutils/gocs.h (mu_gocs_logging): Remove structure.
(mu_gocs_debug)<errpfx>: Remove.
* include/mailutils/guile.h (mu_scm_make_debug_port): Change prototype.
* include/mailutils/mailbox.h (mu_mailbox_has_debug)
(mu_mailbox_get_debug,mu_mailbox_set_debug): Remove.
* include/mailutils/mailer.h (mu_mailer_get_debug)
(mu_mailer_set_debug): Remove.
* include/mailutils/message.h (mu_message_save_to_mailbox): Change
signature.
* include/mailutils/mu_auth.h (mu_auth_set_debug): Remove proto.
* include/mailutils/nntp.h (mu_nntp_set_debug): Remove.
* include/mailutils/progmailer.h (mu_progmailer_set_debug): Remove proto.
* include/mailutils/server.h (mu_ip_server_set_debug)
(mu_ip_server_get_debug): Remove proto.

* include/mailutils/sieve.h (mu_sieve_locus_t): Remove.
Use struct mu_locus instead.
(mu_sieve_printf_t, mu_sieve_parse_error_t): Remove.
(mu_sieve_action_log_t): Change signature.
(mu_sieve_machine_init): Change signature.
(mu_sieve_machine_init_ex): New function.
(mu_sieve_get_diag_stream)
(mu_sieve_set_diag_stream): New functions.
(mu_sieve_set_data): New function.
(mu_sieve_get_locus): Change signature.
(mu_sieve_set_error,mu_sieve_set_parse_error)
(mu_sieve_set_debug,mu_sieve_set_debug_object): Remove protos.
* include/mailutils/stdstream.h (mu_stdstream_strerr_setup): New proto.
* include/mailutils/stream.h (MU_LOGSTREAM_ADVANCE_LOCUS_LINE)
(MU_LOGSTREAM_ADVANCE_LOCUS_COL): New ioctls.
(mu_dbgstream_create): Change signature.
* include/mailutils/sys/folder.h (_mu_folder) <debug>: Remove.
* include/mailutils/sys/mailbox.h (_mu_mailbox) <debug>: Remove.
* include/mailutils/sys/mailer.h (_mu_mailer) <debug>: Remove.
* include/mailutils/sys/nntp.h (_mu_nntp) <debug>: Remove.
* include/mailutils/syslog.h (mu_log_syslog)
(mu_log_print_severity): New externs.
* include/mailutils/types.hin (_mu_debug, mu_debug_t): Remove.
* lib/tcpwrap.h: Remove unused prototypes.

* imap4d/imap4d.h: Include mailutils/stdstream.h
* mail/mail.h: Likewise.
* pop3d/pop3d.h: Likewise.

* mh/comp.c (main): Bugfix.

* po/POTFILES.in: Update.
* TODO: Update.

1 files changed, 29 insertions, 66 deletions

diff --git a/libmu_sieve/sieve.y b/libmu_sieve/sieve.y
index c09dd37ee..c7ba97a4d 100644
--- a/libmu_sieve/sieve.y
+++ b/libmu_sieve/sieve.y
@@ -29,9 +29,6 @@ mu_sieve_machine_t mu_sieve_machine;
 int mu_sieve_error_count;
 
 static void branch_fixup (size_t start, size_t end);
-static int _sieve_default_error_printer (void *, const char *, va_list);
-static int _sieve_default_parse_error (void *, const char *, int,
-				       const char *, va_list);
 %}
 
 %union {
@@ -347,11 +344,11 @@ yyerror (const char *s)
 }
 
 int
-mu_sieve_machine_init (mu_sieve_machine_t *pmach, void *data)
+mu_sieve_machine_init_ex (mu_sieve_machine_t *pmach,
+			  void *data, mu_stream_t errstream)
 {
   int rc;
   mu_sieve_machine_t mach;
-  size_t level;
   
   mach = malloc (sizeof (*mach));
   if (!mach)
@@ -363,36 +360,34 @@ mu_sieve_machine_init (mu_sieve_machine_t *pmach, void *data)
       free (mach);
       return rc;
     }
-  
-  mach->data = data;
-  mach->error_printer = _sieve_default_error_printer;
-  mach->parse_error_printer = _sieve_default_parse_error;
 
-  level = mu_global_debug_level ("sieve");
-  if (level)
-    {
-      mu_debug_create (&mach->debug, mach);
-      mu_debug_set_level (mach->debug, level);
-    }
+  mach->data = data;
+  mach->errstream = errstream;
+  mu_stream_ref (mu_strerr);
   
   *pmach = mach;
   return 0;
 }
 
 int
+mu_sieve_machine_init (mu_sieve_machine_t *pmach)
+{
+  return mu_sieve_machine_init_ex (pmach, NULL, mu_strerr);
+}
+
+int
 mu_sieve_machine_inherit (mu_sieve_machine_t const parent,
 			  mu_sieve_machine_t *pmach)
 {
   mu_sieve_machine_t child;
   int rc;
   
-  rc = mu_sieve_machine_init (&child, parent->data);
+  rc = mu_sieve_machine_init_ex (&child, parent->data, parent->errstream);
   if (rc)
     return rc;
+
   child->logger = parent->logger;
-  child->debug = parent->debug;
   child->debug_level = parent->debug_level;
-  child->debug_printer = parent->debug_printer;
   *pmach = child;
   return 0;
 }
@@ -427,12 +422,11 @@ mu_sieve_machine_dup (mu_sieve_machine_t const in, mu_sieve_machine_t *out)
 
   mach->debug_level = in->debug_level;
   
+  mach->errstream = in->errstream;
+  mu_stream_ref (mach->errstream);
+  
   mach->data = in->data;
-  mach->error_printer = in->error_printer;
-  mach->parse_error_printer = in->parse_error_printer;
-  mach->debug_printer = in->debug_printer;
   mach->logger = in->logger;
-  mach->debug = in->debug;
   mach->daemon_email = in->daemon_email;
 
   *out = mach;
@@ -440,28 +434,18 @@ mu_sieve_machine_dup (mu_sieve_machine_t const in, mu_sieve_machine_t *out)
 }
 
 void
-mu_sieve_set_error (mu_sieve_machine_t mach, mu_sieve_printf_t error_printer)
-{
-  mach->error_printer = error_printer ?
-                           error_printer : _sieve_default_error_printer;
-}
-
-void
-mu_sieve_set_parse_error (mu_sieve_machine_t mach, mu_sieve_parse_error_t p)
+mu_sieve_get_diag_stream (mu_sieve_machine_t mach, mu_stream_t *pstr)
 {
-  mach->parse_error_printer = p ? p : _sieve_default_parse_error;
+  *pstr = mach->errstream;
+  mu_stream_ref (*pstr);
 }
 
 void
-mu_sieve_set_debug (mu_sieve_machine_t mach, mu_sieve_printf_t debug)
+mu_sieve_set_diag_stream (mu_sieve_machine_t mach, mu_stream_t str)
 {
-  mach->debug_printer = debug;
-}
-
-void
-mu_sieve_set_debug_object (mu_sieve_machine_t mach, mu_debug_t dbg)
-{
-  mach->debug = dbg;
+  mu_stream_unref (mach->errstream);
+  mach->errstream = str;
+  mu_stream_ref (mach->errstream);
 }
 
 void
@@ -480,12 +464,7 @@ mu_mailer_t
 mu_sieve_get_mailer (mu_sieve_machine_t mach)
 {
   if (!mach->mailer)
-    {
-      mu_mailer_create (&mach->mailer, NULL);
-      if (mach->debug)
-	mu_mailer_set_debug (mach->mailer, mach->debug);
-    }
-
+    mu_mailer_create (&mach->mailer, NULL);
   return mach->mailer;
 }
 
@@ -507,8 +486,8 @@ mu_sieve_get_daemon_email (mu_sieve_machine_t mach)
       
       mu_get_user_email_domain (&domain);
       mach->daemon_email = mu_sieve_malloc (mach,
-					 sizeof(MAILER_DAEMON_PFX) +
-					 strlen (domain));
+					    sizeof(MAILER_DAEMON_PFX) +
+					    strlen (domain));
       sprintf (mach->daemon_email, "%s%s", MAILER_DAEMON_PFX, domain);
     }
   return mach->daemon_email;
@@ -556,6 +535,9 @@ void
 mu_sieve_machine_destroy (mu_sieve_machine_t *pmach)
 {
   mu_sieve_machine_t mach = *pmach;
+  /* FIXME: Restore stream state (locus & mode) */
+  mu_stream_ioctl (mach->errstream, MU_IOCTL_LOGSTREAM_SET_LOCUS, NULL);
+  mu_stream_destroy (&mach->errstream);
   mu_mailer_destroy (&mach->mailer);
   mu_list_do (mach->destr_list, _run_destructor, NULL);
   mu_list_destroy (&mach->destr_list);
@@ -656,24 +638,5 @@ branch_fixup (size_t start, size_t end)
   mu_sieve_machine->prog[start].pc = end - start - 1;
 }
 
-static int
-_sieve_default_error_printer (void *unused, const char *fmt, va_list ap)
-{
-  return mu_verror (fmt, ap);
-}
 
-static int
-_sieve_default_parse_error (void *unused, const char *filename, int lineno,
-			    const char *fmt, va_list ap)
-{
-  mu_debug_t debug;
-
-  mu_diag_get_debug (&debug);
-  if (filename)
-    mu_debug_set_locus (debug, filename, lineno);
-  mu_diag_vprintf (MU_DIAG_ERROR, fmt, ap);
-  mu_diag_printf (MU_DIAG_ERROR, "\n");
-  mu_debug_set_locus (debug, NULL, 0);
-  return 0;
-}