Switch to the latest Grecs.

* Makefile.am (ChangeLog): Use git2chg.awk to build it.
* NEWS: Update.
* bootstrap.conf (gnulib_modules): Grecs does not depend on gnulib any more.
* configure.ac: Version 1.2.90.
Define GRECS_HOST_PROJECT_INCLUDES, remove grecs Makefiles from
AC_CONFIG_FILES: it is now done by GRECS_SETUP itself.
* gnulib.modules (gitlog-to-changelog,argp): Remove.
(configmake): New module.
* grecs: Update to a52ab6c6.
* lib/libpies.h: Remove redefinitions of _() and N_().
* src/Makefile.am: Update for the recent grecs.
* src/acl.c: Rewrite using Grecs support for lists and symtabs.
* src/acl.h: Likewise.
* src/diag.c: Likewise.
* src/inetd.c: Likewise.
* src/meta1gram.y: Likewise.
* src/meta1lex.h: Likewise.
* src/meta1lex.l: Likewise.
* src/pies.c: Likewise.
* src/pies.h: Likewise.
* src/progman.c: Likewise.
* src/userprivs.c: Likewise.

1 files changed, 34 insertions, 6 deletions

diff --git a/src/diag.c b/src/diag.c
index 53bc044..fe057d0 100644
--- a/src/diag.c
+++ b/src/diag.c
@@ -1,5 +1,5 @@
 /* This file is part of GNU Pies.
-   Copyright (C) 2009, 2010 Sergey Poznyakoff
+   Copyright (C) 2009, 2010, 2011 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
@@ -125,15 +125,43 @@ logmsg_printf (int prio, const char *fmt, ...)
 void
 grecs_print_diag (grecs_locus_t *locus, int err, int errcode, const char *msg)
 {
+  char *locstr = NULL;
+	
   if (locus)
     {
+      size_t size = 0;
+
+      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)
-	logmsg (err ? LOG_ERR : LOG_WARNING, "%s:%lu: %s: %s",
-		locus->file, (unsigned long)locus->line, msg,
-		strerror (errcode));
+	logmsg (err ? LOG_ERR : LOG_WARNING, "%s: %s: %s",
+		locstr, msg, strerror (errcode));
       else
-	logmsg (err ? LOG_ERR : LOG_WARNING, "%s:%lu: %s",
-		locus->file, (unsigned long)locus->line, msg);
+	logmsg (err ? LOG_ERR : LOG_WARNING, "%s: %s",
+		locstr, msg);
+      free (locstr);
     }
   else
     {