* configure.ac: Check for locale.h

* src/db.c, src/bi_sprintf.m4, src/prog.c, src/bi_db.m4,
src/engine.c: Fix format arguments (ported from
branches/gmach@{2008-01-28 and 2008-01-09).
* src/main.c, src/mtasim.c: Include locale.h


git-svn-id: file:///svnroot/mailfromd/trunk@1603 7a8a7f39-df28-0410-adc6-e0d955640f24

10 files changed, 38 insertions, 26 deletions

diff --git a/ChangeLog b/ChangeLog
index e547c40e..0335e494 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1 +1,9 @@
+2008-02-04  Sergey Poznyakoff  <gray@gnu.org.ua>
+
+        * configure.ac: Check for locale.h
+        * src/db.c, src/bi_sprintf.m4, src/prog.c, src/bi_db.m4,
+        src/engine.c: Fix format arguments (ported from
+        branches/gmach@{2008-01-28 and 2008-01-09).
+        * src/main.c, src/mtasim.c: Include locale.h
+
 2008-01-21  Sergey Poznyakoff  <gray@gnu.org.ua>
diff --git a/configure.ac b/configure.ac
index 056f46d4..59723359 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,3 +49,3 @@ AC_CHECK_LIB(resolv, res_query)
 AC_HEADER_STDC
-AC_CHECK_HEADERS([stdlib.h unistd.h sysexits.h paths.h])
+AC_CHECK_HEADERS([stdlib.h unistd.h sysexits.h paths.h locale.h])
 
diff --git a/gacopyz/server.c b/gacopyz/server.c
index a4a05e49..1c1f1085 100644
--- a/gacopyz/server.c
+++ b/gacopyz/server.c
@@ -1,3 +1,3 @@
 /* This file is part of gacopyz.
-   Copyright (C) 2007 Sergey Poznyakoff
+   Copyright (C) 2007, 2008 Sergey Poznyakoff
 
@@ -121,3 +121,2 @@ del_def(gacopyz_srv_t srv, const char *name, size_t len)
         struct gacopyz_macro_def *def = find_def(srv, name, len);
-        size_t n;
   
@@ -300,3 +299,2 @@ gacopyz_srv_create(gacopyz_srv_t *p, const char *name,
 {
-        int i;
         gacopyz_srv_t srv = calloc(1, sizeof(*srv));
@@ -806,3 +804,2 @@ gacopyz_srv_connect(gacopyz_srv_t srv)
         char *path;
-        int rc;
         
diff --git a/src/bi_db.m4 b/src/bi_db.m4
index bb0b9f48..f366008f 100644
--- a/src/bi_db.m4
+++ b/src/bi_db.m4
@@ -1,3 +1,3 @@
-/* This file is part of mailfromd.             -*- c -*-
-   Copyright (C) 2006, 2007 Sergey Poznyakoff
+/* This file is part of Mailfromd.             -*- c -*-
+   Copyright (C) 2006, 2007, 2008 Sergey Poznyakoff
 
@@ -139,3 +139,3 @@ MF_DEFUN(dbdel, VOID, STRING dbname, STRING keystr, OPTIONAL, NUMBER null)
                   _("Failed to delete data `%s' from `%s': %s"),
-                  key,
+                  keystr,
                   dbname,
@@ -240,5 +240,6 @@ MF_DEFUN(greylist, NUMBER, STRING email, NUMBER interval)
                                 if (mu_dbm_insert(&db, key, contents, 1))
-                                        mu_error(_("Cannot insert datum `%s' in "
+                                        mu_error(_("Cannot insert datum `%-.*s' in "
                                                    "greylist database %s: %s"),
-                                                 key,
+                                                 MU_DATUM_SIZE(key),
+                                                 (char*)MU_DATUM_PTR(key),
                                                  greylist_format->dbname,
@@ -261,5 +262,5 @@ MF_DEFUN(greylist, NUMBER, STRING email, NUMBER interval)
                 if (mu_dbm_insert(&db, key, contents, 1))
-                        mu_error(_("Cannot insert datum `%s' in greylist "
+                        mu_error(_("Cannot insert datum `%-.*s' in greylist "
                                    "database %s: %s"),
-                                 key,
+                                 MU_DATUM_SIZE(key), (char*)MU_DATUM_PTR(key),
                                  greylist_format->dbname,
diff --git a/src/bi_sprintf.m4 b/src/bi_sprintf.m4
index 3f3f434d..afd63d32 100644
--- a/src/bi_sprintf.m4
+++ b/src/bi_sprintf.m4
@@ -1,3 +1,3 @@
-/* This file is part of mailfromd.             -*- c -*-
-   Copyright (C) 2007 Sergey Poznyakoff
+/* This file is part of Mailfromd.             -*- c -*-
+   Copyright (C) 2007, 2008 Sergey Poznyakoff
 
@@ -378,3 +378,3 @@ MF_DEFUN_VARARGS(sprintf, STRING, STRING format)
                                         flags &= ~FMT_PADZERO;
-                                snprintf(buf+1, sizeof(buf)-1, "%o", num);
+                                snprintf(buf+1, sizeof(buf)-1, "%lo", num);
                                 str = buf + 2;
diff --git a/src/db.c b/src/db.c
index d8efaa6f..4ab865da 100644
--- a/src/db.c
+++ b/src/db.c
@@ -1,3 +1,3 @@
-/* This file is part of mailfromd.
-   Copyright (C) 2005, 2006, 2007 Sergey Poznyakoff
+/* This file is part of Mailfromd.
+   Copyright (C) 2005, 2006, 2007, 2008 Sergey Poznyakoff
 
@@ -130,3 +130,3 @@ db_enumerate(DBM_FILE *db, db_enum_func fun, void *data)
                                  MU_DATUM_SIZE(key), MU_DATUM_SIZE(key),
-                                 MU_DATUM_PTR(key),
+                                 (char*) MU_DATUM_PTR(key),
                                  db->name,
@@ -329,3 +329,3 @@ db_compact_func(DBM_DATUM key, DBM_DATUM contents, void *data)
                                  MU_DATUM_SIZE(key), MU_DATUM_SIZE(key),
-                                 MU_DATUM_PTR(key),
+                                 (char*) MU_DATUM_PTR(key),
                                  dp->ndb.name,
diff --git a/src/engine.c b/src/engine.c
index a2b26f50..b40e75ed 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -1287,3 +1287,3 @@ check_pidfile(char *name)
         if (unlink(pidfile)) {
-                mu_error(_("Cannot unlink pidfile `%s'"),
+                mu_error(_("Cannot unlink pidfile `%s': %s"),
                          name, mu_strerror(errno));
diff --git a/src/main.c b/src/main.c
index 6efb0e8e..416916b2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,3 +1,3 @@
 /* This file is part of mailfromd.
-   Copyright (C) 2005, 2006, 2007 Sergey Poznyakoff
+   Copyright (C) 2005, 2006, 2007, 2008 Sergey Poznyakoff
 
@@ -35,2 +35,5 @@
 #include <netdb.h>
+#ifdef HAVE_LOCALE_H
+# include <locale.h>
+#endif
 
diff --git a/src/mtasim.c b/src/mtasim.c
index 2a12a436..8940b7a8 100644
--- a/src/mtasim.c
+++ b/src/mtasim.c
@@ -2,3 +2,3 @@
    This file is part of Mailfromd.
-   Copyright (C) 2003, 2004, 2007 The Anubis Team.
+   Copyright (C) 2003, 2004, 2007, 2008 The Anubis Team.
 
@@ -38,2 +38,5 @@
 #endif
+#ifdef HAVE_LOCALE_H
+# include <locale.h>
+#endif
 
diff --git a/src/prog.c b/src/prog.c
index 4d9724cf..abb9ce8a 100644
--- a/src/prog.c
+++ b/src/prog.c
@@ -1,3 +1,3 @@
 /* This file is part of mailfromd.
-   Copyright (C) 2006, 2007 Sergey Poznyakoff
+   Copyright (C) 2006, 2007, 2008 Sergey Poznyakoff
 
@@ -412,3 +412,3 @@ runtime_stack_trace(eval_environ_t env)
                 if (ploc)
-                        mu_error("%04d: %s:%lu: %s",
+                        mu_error("%04lu: %s:%lu: %s",
                                  (unsigned long) pc,
@@ -417,3 +417,3 @@ runtime_stack_trace(eval_environ_t env)
                 else
-                        mu_error("%04d: %s",
+                        mu_error("%04lu: %s",
                                  (unsigned long) pc,
@@ -1089,3 +1089,3 @@ instr_div(eval_environ_t env)
                 env_throw(env, mf_divzero,
-                          "Division by zero at %08x", env->pc);
+                          "Division by zero at %08lx", (unsigned long)env->pc);
         push(env, (STKVAL) (a / b));