1 files changed, 296 insertions, 261 deletions

diff --git a/src/progman.c b/src/progman.c
index 9383aae..cee6775 100644
--- a/src/progman.c
+++ b/src/progman.c
@@ -1,18 +1,18 @@
-/* This file is part of Mailfromd.
+/* This file is part of Pies.
    Copyright (C) 2007, 2008, 2009 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 of the License, or (at your
-   option) any later version.
+   Pies 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,
+   Pies 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/>. */
+   You should have received a copy of the GNU General Public License
+   along with Pies.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include "pies.h"
 
@@ -172,13 +172,11 @@ static char *
 redir_tag (struct prog *master, int type)
 {
   static char *redirstr[2] = { "stdout", "stderr" };
-  char *str = NULL;
-  if (type < MU_ARRAY_SIZE(redirstr))
-    asprintf (&str, "%s/%s", master->tag, redirstr[type]);
+  char *str;
+  if (type < ARRAY_SIZE(redirstr))
+    str = xasprintf ("%s/%s", master->tag, redirstr[type]);
   else
-    asprintf (&str, "%s/%d", master->tag, type);
-  if (!str)
-    xalloc_die ();
+    str = xasprintf ("%s/%d", master->tag, type);
   return str;
 }
 
@@ -261,11 +259,10 @@ prog_rebuild_prerequisites (struct prog *prog)
 
   if (comp->prereq)
     {
-      mu_list_count (comp->prereq, &depc);
+      depc = gl_list_size (comp->prereq);
       if (depc == 1)
         {
-          char *item;
-          mu_list_get (comp->prereq, 0, (void**)&item);
+          const char *item = gl_list_get_at (comp->prereq, 0);
           if (strcmp (item, "all") == 0)
             {
               dep_all = 1;
@@ -274,7 +271,10 @@ prog_rebuild_prerequisites (struct prog *prog)
                   depc++;
             }
           else if (strcmp (item, "none") == 0)
-            mu_list_destroy (&comp->prereq);
+            {
+              gl_list_free (comp->prereq);
+              comp->prereq = NULL;
+            }
         }
     }
 
@@ -294,16 +294,13 @@ prog_rebuild_prerequisites (struct prog *prog)
         }
       else
         {
-          mu_iterator_t itr = NULL;
-          mu_list_get_iterator (comp->prereq, &itr);
-          for (mu_iterator_first (itr), depc = 0;
-               !mu_iterator_is_done (itr); mu_iterator_next (itr), depc++)
+          const void *p;
+          gl_list_iterator_t itr = gl_list_iterator (comp->prereq);
+          while (gl_list_iterator_next (&itr, &p, NULL))
             {
-              char *str;
-              mu_iterator_current (itr, (void**)&str);
-              prog->prereq[depc] = str;
+              prog->prereq[depc++] = (char*) p;
             }
-          mu_iterator_destroy (&itr);
+          gl_list_iterator_free (&itr);
         }
     }
   prog->prereq[depc] = NULL;
@@ -341,9 +338,9 @@ redirect_to_file (struct prog *master, int stream)
                  0644 & ~master->v.p.comp->umask);
   if (fd == -1)
     {
-      mu_error (_("cannot open output file %s: %s"),
+      logmsg (LOG_ERR, _("cannot open output file %s: %s"),
                 master->v.p.comp->redir[stream].v.file,
-                mu_strerror (errno));
+                strerror (errno));
       return -1;
     }
   /* Fix file ownership */
@@ -405,9 +402,9 @@ open_redirector (struct prog *master, int stream)
       _exit (0);
       
     case -1:
-      mu_diag_output (MU_DIAG_CRIT,
+      logmsg (LOG_CRIT,
                       _("cannot run redirector `%s': fork failed: %s"),
-                      master->tag, mu_strerror (errno));
+                      master->tag, strerror (errno));
       return -1;
 
     default:
@@ -592,7 +589,7 @@ prog_start (struct prog *prog)
 
   if (prog->v.p.count > MAXSPAWN)
     {
-      mu_error (ngettext (
+      logmsg (LOG_NOTICE, ngettext (
                        "%s is respawning too fast, disabled for %d minute",
                        "%s is respawning too fast, disabled for %d minutes",
                        SLEEPTIME / 60),
@@ -609,12 +606,12 @@ prog_start (struct prog *prog)
       break;
 
     case pies_comp_pass_fd:
-      MU_DEBUG1 (pies_debug, MU_DEBUG_TRACE1, _("unlinking %s\n"),
-                 prog->v.p.comp->pass_fd_socket);
+      debug (1, (_("unlinking %s"), prog->v.p.comp->pass_fd_socket));
       if (unlink (prog->v.p.comp->pass_fd_socket) && errno != ENOENT)
         {
-          mu_error (_("cannot unlink %s: %s"), prog->v.p.comp->pass_fd_socket,
-                    mu_strerror (errno));
+          logmsg (LOG_ERR, _("cannot unlink %s: %s"), 
+                    prog->v.p.comp->pass_fd_socket,
+                    strerror (errno));
           return;
         }
       /* fall through */
@@ -630,7 +627,7 @@ prog_start (struct prog *prog)
         }
       if (listen (prog->v.p.socket, 8))
         {
-          mu_error ("listen: %s", mu_strerror (errno));
+          logmsg (LOG_ERR, "listen: %s", strerror (errno));
           close (prog->v.p.socket);
           prog->v.p.socket = -1;
           prog->v.p.status = status_disabled;
@@ -644,15 +641,14 @@ prog_start (struct prog *prog)
         return;
     }
   
-  MU_DEBUG1 (pies_debug, MU_DEBUG_TRACE1, _("starting %s\n"), prog->tag);
+  debug (1, (_("starting %s"), prog->tag));
   
   if (prog->v.p.comp->rmfile)
     {
-      MU_DEBUG1 (pies_debug, MU_DEBUG_TRACE1, _("unlinking %s\n"),
-                 prog->v.p.comp->rmfile);
+      debug (1, (_("unlinking %s"), prog->v.p.comp->rmfile));
       if (unlink (prog->v.p.comp->rmfile) && errno != ENOENT)
-        mu_error (_("%s: cannot remove file `%s': %s"),
-                  prog->tag, prog->v.p.comp->rmfile, mu_strerror (errno));
+        logmsg (LOG_ERR, _("%s: cannot remove file `%s': %s"),
+                  prog->tag, prog->v.p.comp->rmfile, strerror (errno));
     }
       
   redir[RETR_OUT] = open_redirector (prog, RETR_OUT);
@@ -665,22 +661,22 @@ prog_start (struct prog *prog)
       signal_setup (SIG_DFL);
       if (prog->v.p.comp->dir)
         {
-          MU_DEBUG1 (pies_debug, MU_DEBUG_TRACE1, _("chdir %s\n"),
-                     prog->v.p.comp->dir);
+          debug (1, (_("chdir %s"), prog->v.p.comp->dir));
           if (chdir (prog->v.p.comp->dir))
-            mu_error (_("%s: cannot change to directory %s: %s"),
-                      prog->tag, prog->v.p.comp->dir, mu_strerror (errno));
+            logmsg (LOG_ERR, _("%s: cannot change to directory %s: %s"),
+                      prog->tag, prog->v.p.comp->dir, strerror (errno));
         }
                        
       environ = env_setup (prog->v.p.comp->env);
-      if (mu_debug_check_level (pies_debug, MU_DEBUG_TRACE4))
+      if (debug_level >= 4)
         {
           int i;
           for (i = 0; environ[i]; i++)
-            __MU_DEBUG1 (pies_debug, MU_DEBUG_TRACE4, "%s ", environ[i]);
-          mu_debug_printf (pies_debug, MU_DEBUG_TRACE4, "\n");
+            logmsg_printf (LOG_DEBUG, "%s ", environ[i]);
+          logmsg_printf (LOG_DEBUG, "\n");
         }
-      mf_priv_setup (&prog->v.p.comp->privs);
+
+      pies_priv_setup (&prog->v.p.comp->privs);
       if (prog->v.p.comp->umask)
         umask (prog->v.p.comp->umask);
 
@@ -688,16 +684,16 @@ prog_start (struct prog *prog)
                   prog->v.p.comp->limits ?
                      prog->v.p.comp->limits : pies_limits);