notmuch-deliver: Advance imported files to maildrop-2.5.2 release.

diff --git a/contrib/notmuch-deliver/maildrop/numlib/configure.in b/contrib/notmuch-deliver/maildrop/numlib/configure.in
index 0c52a0142efb2baa39a8200efdd928304a11a3ce..fc977aa9de54a37135349a36a1d05060f1877363 100644 (file)
--- a/contrib/notmuch-deliver/maildrop/numlib/configure.in
+++ b/contrib/notmuch-deliver/maildrop/numlib/configure.in
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.in,v 1.6 2004/12/10 02:34:46 mrsam Exp $
+dnl $Id: configure.in,v 1.7 2010/03/19 01:09:26 mrsam Exp $
 dnl
-dnl Copyright 1998 - 2004 Double Precision, Inc.  See COPYING for
+dnl Copyright 1998 - 2010 Double Precision, Inc.  See COPYING for
 dnl distribution information.
 
 AC_PREREQ(2.59)
@@ -29,7 +29,12 @@ dnl Checks for libraries.
 
 dnl Checks for header files.
 
-AC_CHECK_HEADERS(unistd.h)
+AC_CHECK_HEADERS(unistd.h stdint.h)
+
+AC_CHECK_TYPE(int64_t, [ : ],
+                      [
+                      AC_DEFINE_UNQUOTED(int64_t,long long,[default definition of int64_t])
+                      ])
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_TYPE_UID_T

diff --git a/contrib/notmuch-deliver/maildrop/numlib/numlib.h b/contrib/notmuch-deliver/maildrop/numlib/numlib.h
index d356c6d3f9f7600d19e7f01398955ffa51d85f2e..7928aa7e075b089fe54c86182d91c6665e634f9d 100644 (file)
--- a/contrib/notmuch-deliver/maildrop/numlib/numlib.h
+++ b/contrib/notmuch-deliver/maildrop/numlib/numlib.h
@@ -2,7 +2,7 @@
 #define        numlib_h
 
 /*
-** Copyright 1998 - 2003 Double Precision, Inc.
+** Copyright 1998 - 2010 Double Precision, Inc.
 ** See COPYING for distribution information.
 */
 
@@ -10,12 +10,16 @@
 extern "C" {
 #endif
 
-static const char numlib_h_rcsid[]="$Id: numlib.h,v 1.10 2004/01/11 02:47:33 mrsam Exp $";
+static const char numlib_h_rcsid[]="$Id: numlib.h,v 1.11 2010/03/19 01:09:26 mrsam Exp $";
 
 #if    HAVE_CONFIG_H
 #include       "../numlib/config.h" /* VPATH build */
 #endif
 
+#if    HAVE_STDINT_H
+#include       <stdint.h>
+#endif
+
 #include       <sys/types.h>
 #include       <time.h>
 
@@ -25,6 +29,7 @@ static const char numlib_h_rcsid[]="$Id: numlib.h,v 1.10 2004/01/11 02:47:33 mrs
 
 char   *libmail_str_time_t(time_t, char *);
 char   *libmail_str_off_t(off_t, char *);
+char   *libmail_str_int64_t(int64_t, char *);
 char   *libmail_str_pid_t(pid_t, char *);
 char   *libmail_str_dev_t(dev_t, char *);
 char   *libmail_str_ino_t(ino_t, char *);

diff --git a/contrib/notmuch-deliver/maildrop/numlib/strofft.c b/contrib/notmuch-deliver/maildrop/numlib/strofft.c
index d93edcbe1ed0872e1e13c2660df4ce50ec27d275..3435148e7ccd33b602947971818c4e5dd9b42bd3 100644 (file)
--- a/contrib/notmuch-deliver/maildrop/numlib/strofft.c
+++ b/contrib/notmuch-deliver/maildrop/numlib/strofft.c
@@ -1,5 +1,5 @@
 /*
-** Copyright 1998 - 2002 Double Precision, Inc.
+** Copyright 1998 - 2010 Double Precision, Inc.
 ** See COPYING for distribution information.
 */
 
@@ -9,7 +9,7 @@
 #include       "numlib.h"
 #include       <string.h>
 
-static const char rcsid[]="$Id: strofft.c,v 1.5 2003/01/05 04:01:17 mrsam Exp $";
+static const char rcsid[]="$Id: strofft.c,v 1.6 2010/03/19 01:09:26 mrsam Exp $";
 
 char *libmail_str_off_t(off_t t, char *arg)
 {
@@ -35,3 +35,31 @@ char *libmail_str_off_t(off_t t, char *arg)
 
        return (strcpy(arg, p));
 }
+
+char *libmail_str_int64_t(int64_t t, char *arg)
+{
+       char    buf[NUMBUFSIZE];
+       char    *p=buf+sizeof(buf)-1;
+       int     isneg=0;
+
+       if (t < 0)
+       {
+               t= -t;
+               isneg=1;
+       }
+
+       *p=0;
+       do
+       {
+               *--p= '0' + (t % 10);
+               t=t / 10;
+       } while(t);
+
+       if (isneg)
+               *--p='-';
+
+       return (strcpy(arg, p));
+}
+
+
+