Uniformly use grecs memory management functions.

* gnulib.modules: Remove unneded modules.
* ident/ident.h: Remove xalloc.h, include errno.h
* ident/ident.c: Use standard allocation functions instead of x*
* ident/pam.c: Remove.
* ident/provider.c: Remove.
* ident/system.c: Remove.

* src/meta.c: Remove.
* src/Makefile.am: Remove meta.c
* src/progman.c: Use grecs_* allocation functions instead of x*.
(notify): Use wordsplit to expand variables within message.
Rename variables: program-name to program_name;
canonical-program-name to canonical_program_name.

* doc/pies.texi: Update.

* src/depmap.c: Use grecs_* allocation functions instead of x*.
(depmap_end): New function.

* src/diag.c (logmsg_vprintf): Use grecs_txtacc instead of obstack.
* src/pies.h (depmap_end): New proto.
Remove unused includes.

* src/acl.c: Use grecs_* allocation functions instead of x*.
* src/ctl.c: Likewise.
* src/inetd.c: Likewise.
* src/limits.c: Likewise.
* src/meta1gram.y: Likewise.
* src/meta1lex.l: Likewise.
* src/pies.c: Likewise.
* src/socket.c: Likewise.
* src/sysvinit.c: Likewise.
* src/userprivs.c: Likewise.

24 files changed, 360 insertions, 395 deletions

diff --git a/.gitignore b/.gitignore
index 216d2e5..11f9326 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+/ABOUT-NLS
 /ABOUT-NLS~
 *.a
 *.la
diff --git a/doc/pies.texi b/doc/pies.texi
index 46e1b91..7ad5008 100644
--- a/doc/pies.texi
+++ b/doc/pies.texi
@@ -1681,8 +1681,8 @@ The table below lists all available variables and their expansions:
 @caption{Notification Variables}
 @multitable @columnfractions 0.5 0.5
 @headitem Variable @tab Expansion
-@item canonical-program-name @tab @samp{pies}
-@item program-name @tab Program name of the @command{pies} binary.
+@item canonical_program_name @tab @samp{pies}
+@item program_name @tab Program name of the @command{pies} binary.
 @item package      @tab Package name (@samp{Pies}).
 @item instance     @tab Instance name (@pxref{instances}).
 @item version      @tab Package version (@value{VERSION}).
@@ -1712,7 +1712,7 @@ message is used instead:
 
 @smallexample
 From: <>
-X-Agent: $@{canonical-program-name@} ($@{package@} $@{version@})
+X-Agent: $@{canonical_program_name@} ($@{package@} $@{version@})
 Subject: Component $@{component@} $@{termination@} $@{retcode@}.
 
 @end smallexample
@@ -2299,7 +2299,7 @@ return-code (EX_USAGE, EX_CONFIG) @{
   notify "root";
   message <<- EOT
     From: Pies <>
-    X-Agent: $@{canonical-program-name@} ($@{package@} $@{version@})
+    X-Agent: $@{canonical_program_name@} ($@{package@} $@{version@})
     Subject: Component $@{component@} disabled.
     
     Component "$@{component@}" has terminated with code $@{retcode@},
@@ -2307,7 +2307,7 @@ return-code (EX_USAGE, EX_CONFIG) @{
     I will not restart it automatically.  Please fix its configuration
     and restart it manually at your earliest convenience.
     
-    To restart, run ``$@{program-name@} -R $@{component@}''
+    To restart, run ``$@{program_name@} -R $@{component@}''
     ---
     Wuff-wuff,
     Pies
diff --git a/gnulib.modules b/gnulib.modules
index 2612e75..9e9d255 100644
--- a/gnulib.modules
+++ b/gnulib.modules
@@ -9,9 +9,6 @@ fprintftime
 gettext
 inttostr
 inttypes
-obstack
 progname
 quotearg
 sysexits
-xalloc
-xvasprintf
diff --git a/ident/ident.c b/ident/ident.c
index dbf3f9b..75d51fa 100644
--- a/ident/ident.c
+++ b/ident/ident.c
@@ -1,5 +1,5 @@
 /* This file is part of GNU Pies.
-   Copyright (C) 2015 Sergey Poznyakoff
+   Copyright (C) 2015-2016 Sergey Poznyakoff
 
    GNU Pies is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,10 +19,20 @@
 pies_identity_t
 pies_identity_create (char const *user)
 {
-  pies_identity_t id = xmalloc (sizeof (*id));
-  id->provider = NULL;
-  id->username = xstrdup (user);
-  id->data = NULL;
+  pies_identity_t id = malloc (sizeof (*id));
+  if (id)
+    {
+      id->provider = NULL;
+      id->data = NULL;
+      id->username = strdup (user);
+      if (!id)
+        {
+          int ec = errno;
+          free (id);
+          errno = ec;
+          id = NULL;
+        }
+    }
   return id;
 }
     
diff --git a/ident/ident.h b/ident/ident.h
index 313926c..c262f58 100644
--- a/ident/ident.h
+++ b/ident/ident.h
@@ -1,5 +1,5 @@
 /* This file is part of GNU Pies.
-   Copyright (C) 2015 Sergey Poznyakoff
+   Copyright (C) 2015-2016 Sergey Poznyakoff
 
    GNU Pies is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
    along with GNU Pies.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
-#include "xalloc.h"
+#include <errno.h>
 #include "libpies.h"
 #include "grecs.h"
 #include "identity.h"
diff --git a/ident/pam.c b/ident/pam.c
index 7302242..96ac02c 100644
--- a/ident/pam.c
+++ b/ident/pam.c
@@ -1,5 +1,5 @@
 /* This file is part of GNU Pies.
-   Copyright (C) 2015 Sergey Poznyakoff
+   Copyright (C) 2015-2016 Sergey Poznyakoff
 
    GNU Pies is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -183,7 +183,7 @@ static int
 configure (struct grecs_node *node, pies_identity_provider_t provider)
 {
   int i;
-  struct pam_identity_provider_data *data = xcalloc (1, sizeof (*data));
+  struct pam_identity_provider_data *data = grecs_calloc (1, sizeof (*data));
   provider->data = data;
   for (i = 0; pam_kw[i].ident; i++)
     pam_kw[i].varptr = data;
diff --git a/ident/provider.c b/ident/provider.c
index dd7fc3d..8b9f076 100644
--- a/ident/provider.c
+++ b/ident/provider.c
@@ -1,5 +1,5 @@
 /* This file is part of GNU Pies.
-   Copyright (C) 2015 Sergey Poznyakoff
+   Copyright (C) 2015-2016 Sergey Poznyakoff
 
    GNU Pies is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@ idmech_copy (void *a, void *b)
   pies_identity_mechanism_t mb = b;
 
   *ma = *mb;
-  ma->name = xstrdup (mb->name);
+  ma->name = grecs_strdup (mb->name);
   return 0;
 }
 
@@ -38,14 +38,14 @@ pies_identity_mechanism_register (pies_identity_mechanism_t mech)
         
   if (!idmech_symtab)
     {
-      idmech_symtab = grecs_symtab_create (sizeof(*mech),
+      idmech_symtab = grecs_symtab_create (sizeof (*mech),
                                            NULL,
                                            NULL,
                                            idmech_copy,
                                            NULL,
                                            NULL);
       if (!idmech_symtab)
-        grecs_alloc_die();
+        grecs_alloc_die ();
     }
 
   install = 1;
@@ -135,8 +135,8 @@ pies_config_provider (struct grecs_node *node)
       return 1;
     }
 
-  prov = xcalloc (1, sizeof (*prov));
-  prov->name = xstrdup (name);
+  prov = grecs_calloc (1, sizeof (*prov));
+  prov->name = grecs_strdup (name);
   prov->mech = mp;
   prov->locus = node->locus;