Improve logging

* po/POTFILES.in: Add missing source files.
* grecs: Upgrade.
* src/diag.c (pies_diag_printer): New function.
(logfuncall): New function.
* src/pies.h: Add new prototypes.
* src/pies.c (main): Initialize grecs_print_diag_fun
* src/acl.c: Uniformly use double-quotes in messages.  Use
logfuncall where applicable.
* src/comp.c: Likewise.
* src/ctl.c: Likewise.
* src/inetd-bi.c: Likewise.
* src/inetd.c: Likewise.
* src/limits.c: Likewise.
* src/piesctl.c: Likewise.
* src/progman.c: Likewise.
* src/socket.c: Likewise.
* src/sysvinit.c: Likewise.

15 files changed, 111 insertions, 116 deletions

diff --git a/grecs b/grecs
-Subproject 07838fb2e9ed5769074add028e052a3b667e67e
+Subproject 8241dc04501f62b613f17f5c165f915a216ba30
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6923cb6..2496b6e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -39 +39,16 @@ lib/netrc.c
 lib/pp.c
+
+grecs/src/cidr.c
+grecs/src/format.c
+grecs/src/grecs-gram.y
+grecs/src/grecs-lex.l
+grecs/src/json-gram.y
+grecs/src/meta1-gram.y
+grecs/src/meta1-lex.l
+grecs/src/opthelp.c
+grecs/src/path-parser.c
+grecs/src/preproc.c
+grecs/src/sockaddr.c
+grecs/src/symtab.c
+grecs/src/tree.c
+grecs/src/wordsplit.c
diff --git a/src/acl.c b/src/acl.c
index 53e5dd8..7b834c9 100644
--- a/src/acl.c
+++ b/src/acl.c
@@ -179,3 +179,3 @@ _parse_sockaddr (struct acl_entry *entry, const grecs_value_t *value)
           grecs_error (&entry->locus, 0,
-                       _("socket name too long: `%s'"), string);
+                       _("socket name too long: %s"), string);
           return 1;
@@ -202,3 +202,3 @@ _parse_sockaddr (struct acl_entry *entry, const grecs_value_t *value)
               grecs_error (&entry->locus, 0,
-                           _("cannot resolve host name: `%s'"), string);
+                           _("cannot resolve host name: %s"), string);
               if (p)
@@ -239,3 +239,3 @@ _parse_sockaddr (struct acl_entry *entry, const grecs_value_t *value)
                   grecs_error (&entry->locus, 0,
-                               _("invalid netmask: `%s'"), p);
+                               _("invalid netmask: %s"), p);
                   return 1;
@@ -246,3 +246,3 @@ _parse_sockaddr (struct acl_entry *entry, const grecs_value_t *value)
             {
-              grecs_error (&entry->locus, 0, _("invalid netmask: `%s'"), p);
+              grecs_error (&entry->locus, 0, _("invalid netmask: %s"), p);
               return 1;
@@ -283,3 +283,3 @@ _parse_from (struct acl_entry *entry, size_t argc, grecs_value_t **argv)
     {
-      grecs_error (&entry->locus, 0, _("expected `from', but found list"));
+      grecs_error (&entry->locus, 0, _("expected \"from\", but found list"));
       return 1;
@@ -288,3 +288,3 @@ _parse_from (struct acl_entry *entry, size_t argc, grecs_value_t **argv)
     {
-      grecs_error (&entry->locus, 0, _("expected `from', but found `%s'"),
+      grecs_error (&entry->locus, 0, _("expected \"from\", but found \"%s\""),
                     argv[0]->v.string);
@@ -298,3 +298,3 @@ _parse_from (struct acl_entry *entry, size_t argc, grecs_value_t **argv)
       grecs_error (&entry->locus, 0,
-                   _("unexpected end of statement after `from'"));
+                   _("unexpected end of statement after \"from\""));
       return 1;
@@ -323,3 +323,3 @@ _parse_from (struct acl_entry *entry, size_t argc, grecs_value_t **argv)
     {
-      grecs_warning (&entry->locus, 0, _("junk after `from' list"));
+      grecs_warning (&entry->locus, 0, _("junk after from-list"));
       return 1;
@@ -356,4 +356,4 @@ _parse_sub_acl (struct acl_entry *entry, size_t argc, grecs_value_t **argv)
         {
-          grecs_error (&entry->locus, 0, _("ACL not defined: `%s'"),
-                        argv[0]->v.string);
+          grecs_error (&entry->locus, 0, _("ACL not defined: %s"),
+                       argv[0]->v.string);
           return 1;
@@ -434,3 +434,3 @@ parse_acl_line (grecs_locus_t *locus, int allow, pies_acl_t acl,
           {
-            grecs_error (&entry->locus, 0, _("unknown word `%s'"),
+            grecs_error (&entry->locus, 0, _("unknown word: %s"),
                          value->v.string);
diff --git a/src/comp.c b/src/comp.c
index 43772c2..7babae7 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -542,3 +542,3 @@ component_verify (struct component *comp, grecs_locus_t *locus)
         COMPERR (grecs_error,
-                 "%s", _("`internal' used without `service'"));
+                 "%s", _("\"internal\" used without \"service\""));
       else
@@ -554,3 +554,3 @@ component_verify (struct component *comp, grecs_locus_t *locus)
             COMPERR (grecs_error,
-                     "%s", _("`internal' used with `command'"));
+                     "%s", _("\"internal\" used with \"command\""));
         }
@@ -567,3 +567,3 @@ component_verify (struct component *comp, grecs_locus_t *locus)
         COMPERR (grecs_error,
-                 "%s", _("both `tcpmux' and `tcpmuxplus' used"));
+                 "%s", _("both \"tcpmux\" and \"tcpmuxplus\" used"));
       else if (!comp->service)
@@ -571,3 +571,3 @@ component_verify (struct component *comp, grecs_locus_t *locus)
         COMPERR (grecs_error,
-                 "%s", _("`internal' used without `service'"));
+                 "%s", _("\"internal\" used without \"service\""));
     }
@@ -662,3 +662,3 @@ component_verify (struct component *comp, grecs_locus_t *locus)
       COMPERR (grecs_error,
-               "%s", _("stdout translation invalid in this mode"));
+               "%s", _("stdout redirection invalid in this mode"));
       comp->redir[RETR_OUT].type = redir_null;
diff --git a/src/ctl.c b/src/ctl.c
index 7d44cf1..fd7bfdc 100644
--- a/src/ctl.c
+++ b/src/ctl.c
@@ -1247,3 +1247,3 @@ ctl_accept (int socket, void *data)
     {
-      logmsg (LOG_ERR, _("accept failed: %s"), strerror (errno));
+      logfuncall ("accept", NULL, errno);
       return 1;
@@ -1291,4 +1291,3 @@ ctl_open (void)
     {
-      logmsg (LOG_CRIT, _("can't listen on control socket %s: %s"),
-              control.url->string, strerror (errno));
+      logfuncall ("listen", control.url->string, errno);
       return -1;
diff --git a/src/diag.c b/src/diag.c
index f601daf..eaf9bed 100644
--- a/src/diag.c
+++ b/src/diag.c
@@ -229,34 +229,12 @@ logmsg_printf (int prio, const char *fmt, ...)
 void
-grecs_print_diag (grecs_locus_t *locus, int err, int errcode, const char *msg)
+pies_diag_printer (grecs_locus_t const *locus, int err, int errcode,
+                   const char *msg)
 {
-  char *locstr = NULL;
-        
   if (locus)
     {
-      size_t size = 0;
+      char *locstr = NULL;
+      size_t locsize  = 0;
+
+      grecs_asprint_locus (&locstr, &locsize, locus);
 
-      if (locus->beg.col == 0)
-        grecs_asprintf (&locstr, &size, "%s:%u",
-                        locus->beg.file,
-                        locus->beg.line);
-      else if (strcmp (locus->beg.file, locus->end.file))
-        grecs_asprintf (&locstr, &size, "%s:%u.%u-%s:%u.%u",
-                        locus->beg.file,
-                        locus->beg.line, locus->beg.col,
-                        locus->end.file,
-                        locus->end.line, locus->end.col);
-      else if (locus->beg.line != locus->end.line)
-        grecs_asprintf (&locstr, &size, "%s:%u.%u-%u.%u",
-                        locus->beg.file,
-                        locus->beg.line, locus->beg.col,
-                        locus->end.line, locus->end.col);
-      else
-        grecs_asprintf (&locstr, &size, "%s:%u.%u-%u",
-                        locus->beg.file,
-                        locus->beg.line, locus->beg.col,
-                        locus->end.col);
-    }
-  
-  if (locstr)
-    {
       if (errcode)
@@ -279 +257,9 @@ grecs_print_diag (grecs_locus_t *locus, int err, int errcode, const char *msg)
   
+void
+logfuncall (const char *fun, const char *arg, int err)
+{
+  if (arg)
+    grecs_error (NULL, err, _("%s: %s failed"), arg, fun);
+  else
+    grecs_error (NULL, err, _("%s failed"), fun);
+}
diff --git a/src/inetd-bi.c b/src/inetd-bi.c
index 7ce4b39..2032123 100644
--- a/src/inetd-bi.c
+++ b/src/inetd-bi.c
@@ -230,3 +230,4 @@ qotd_read (char *text)
     {
-      logmsg (LOG_ERR, _("cannot open %s: %s"), qotdfile, strerror (errno));
+      logmsg (LOG_ERR, _("cannot open file %s: %s"), qotdfile,
+              strerror (errno));
       strncpy (text, QOTD_DEF, QOTD_MAX);
diff --git a/src/inetd.c b/src/inetd.c
index ee16078..40fb6fe 100644
--- a/src/inetd.c
+++ b/src/inetd.c
@@ -357,4 +357,6 @@ inetd_conf_dir (const char *name)
         {
-          logmsg (LOG_ERR, _("cannot stat %s/%s: %s"),
-                  name, ent->d_name, strerror (errno));
+          int ec = errno;
+          char *name = mkfilename (name, ent->d_name, NULL);
+          logfuncall ("stat", name, ec);
+          free (name);
           errs |= 1;
@@ -385,3 +387,3 @@ inetd_config_parse (const char *file)
     {
-      logmsg (LOG_ERR, _("cannot stat %s: %s"), file, strerror (errno));
+      logfuncall ("stat", file, errno);
       return 1;
diff --git a/src/limits.c b/src/limits.c
index 7387b9d..2893ff6 100644
--- a/src/limits.c
+++ b/src/limits.c
@@ -59,4 +59,4 @@ do_set_limit (int rlimit, rlim_t limit)
     {
-      logmsg (LOG_NOTICE, _("error setting limit: %s"),
-              strerror (errno));
+      //FIXME: arg?
+      logfuncall ("setrlimit", NULL, errno);
       return 1;
@@ -72,4 +72,3 @@ set_prio (int prio)
     {
-      logmsg (LOG_NOTICE, _("error setting priority: %s"),
+      logfuncall ("setpriority", NULL, errno);