[Nmh-commits] [SCM] The nmh Mail Handling System branch, master, updated. 2c3d90ed127ab47e695350367ca3c34d4324bcc4

[Ken Hornstein]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The nmh Mail Handling System".

The branch, master has been updated
       via  2c3d90ed127ab47e695350367ca3c34d4324bcc4 (commit)
       via  811c11557492b9a6e6bd5ae45bb5597647ba5c99 (commit)
       via  01943d78230ead5bcc568e8a87d3cdbaac1f5584 (commit)
      from  ae6d25b39b09560916481983b30d3b09ccf9390e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=2c3d90ed127ab47e695350367ca3c34d4324bcc4


commit 2c3d90ed127ab47e695350367ca3c34d4324bcc4
Author: Ken Hornstein <address@hidden>
Date:   Wed Jan 11 15:04:39 2012 -0500

    Completely remove the use of TIME_WITH_SYS_TIME (I removed the autoconf
    test but never removed the code, and this caused some problems on systems
    that needed some prototypes in <time.h>).

diff --git a/sbr/dtimep.lex b/sbr/dtimep.lex
index 0191086..29c4dd0 100644
--- a/sbr/dtimep.lex
+++ b/sbr/dtimep.lex
@@ -160,16 +160,10 @@ static int day_map[] = {
                        --cp; }
 
 #ifdef ADJUST_NUMERIC_ONLY_TZ_OFFSETS_WRT_DST
-# ifdef TIME_WITH_SYS_TIME
+# ifdef HAVE_SYS_TIME_H
 #  include <sys/time.h>
-#  include <time.h>
-# else
-#  ifdef HAVE_SYS_TIME_H
-#   include <sys/time.h>
-#  else
-#   include <time.h>
-#  endif
 # endif
+#include <time.h>
 
 static void
 zonehack (struct tws *tw)
diff --git a/sbr/fmt_compile.c b/sbr/fmt_compile.c
index a180c56..a86661e 100644
--- a/sbr/fmt_compile.c
+++ b/sbr/fmt_compile.c
@@ -13,16 +13,10 @@
 #include <h/fmt_scan.h>
 #include <h/fmt_compile.h>
 
-#ifdef TIME_WITH_SYS_TIME
+#ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
-# include <time.h>
-#else
-# ifdef TM_IN_SYS_TIME
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
 #endif
+#include <time.h>
 
 /*
  * hash table for deciding if a component is "interesting"
diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index 8d03836..9784919 100644
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -13,16 +13,10 @@
 #include <h/tws.h>
 #include <h/fmt_compile.h>
 
-#ifdef TIME_WITH_SYS_TIME
+#ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
-# include <time.h>
-#else
-# ifdef TM_IN_SYS_TIME
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
 #endif
+#include <time.h>
 #ifdef MULTIBYTE_SUPPORT
 #  include <wctype.h>
 #  include <wchar.h>
diff --git a/sbr/lock_file.c b/sbr/lock_file.c
index c4353b5..c7dffcf 100644
--- a/sbr/lock_file.c
+++ b/sbr/lock_file.c
@@ -19,16 +19,10 @@
 #include <h/signals.h>
 #include <h/utils.h>
 
-#ifdef TIME_WITH_SYS_TIME
+#ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
-# include <time.h>
-#else
-# ifdef TM_IN_SYS_TIME
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
 #endif
+#include <time.h>
 #include <errno.h>
 
 #ifdef HAVE_FCNTL_H
diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index ea2bcd6..2a3f899 100644
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -27,16 +27,10 @@
 #include <h/mhparse.h>
 #include <h/utils.h>
 
-#ifdef TIME_WITH_SYS_TIME
+#ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
-# include <time.h>
-#else
-# ifdef TM_IN_SYS_TIME
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
 #endif
+#include <time.h>
 
 
 extern int debugsw;
diff --git a/uip/mhcachesbr.c b/uip/mhcachesbr.c
index 807cf60..cf9087b 100644
--- a/uip/mhcachesbr.c
+++ b/uip/mhcachesbr.c
@@ -21,16 +21,10 @@
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
 
-#ifdef TIME_WITH_SYS_TIME
+#ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
-# include <time.h>
-#else
-# ifdef TM_IN_SYS_TIME
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
 #endif
+#include <time.h>
 
 extern int debugsw;
 
diff --git a/uip/picksbr.c b/uip/picksbr.c
index bd4c263..4afd094 100644
--- a/uip/picksbr.c
+++ b/uip/picksbr.c
@@ -12,16 +12,10 @@
 #include <h/picksbr.h>
 #include <h/utils.h>
 
-#ifdef TIME_WITH_SYS_TIME
+#ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
-# include <time.h>
-#else
-# ifdef TM_IN_SYS_TIME
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
 #endif
+#include <time.h>
 
 static struct swit parswit[] = {
 #define        PRAND                   0
diff --git a/uip/post.c b/uip/post.c
index 6429cb4..515e1d5 100644
--- a/uip/post.c
+++ b/uip/post.c
@@ -23,16 +23,10 @@
 #include <setjmp.h>
 #include <signal.h>
 
-#ifdef TIME_WITH_SYS_TIME
+#ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
-# include <time.h>
-#else
-# ifdef TM_IN_SYS_TIME
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
 #endif
+#include <time.h>
 
 #ifdef SMTPMTS
 # include <mts/smtp/smtp.h>
diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index f0c84f5..6215219 100644
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -16,16 +16,10 @@
 #include <h/tws.h>
 #include <h/utils.h>
 
-#ifdef TIME_WITH_SYS_TIME
+#ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
-# include <time.h>
-#else
-# ifdef TM_IN_SYS_TIME
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
 #endif
+#include <time.h>
 
 int debugsw = 0;               /* global */
 int forwsw  = 1;

http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=811c11557492b9a6e6bd5ae45bb5597647ba5c99


commit 811c11557492b9a6e6bd5ae45bb5597647ba5c99
Author: Ken Hornstein <address@hidden>
Date:   Wed Jan 11 14:52:23 2012 -0500

    Ignore a.out.DSYM (this file sometims shows up when using the debugger)

diff --git a/.gitignore b/.gitignore
index fbd844a..8cf8b22 100644
--- a/.gitignore
+++ b/.gitignore
@@ -80,4 +80,5 @@
 *.1
 *.5
 *.8
+a.out.DSYM
 RPM/

http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=01943d78230ead5bcc568e8a87d3cdbaac1f5584


commit 01943d78230ead5bcc568e8a87d3cdbaac1f5584
Author: Ken Hornstein <address@hidden>
Date:   Wed Jan 11 14:48:45 2012 -0500

    Fix two errors in the conversion to m_mktemp2():
    
    - There was an off-by-one error that prevented the temporary file
      from being created in the same directory as the message it was being
      linked to.
    - When using "dist", the assumption was that the temporary file would not
      exist when m_scratch was called (it wanted to link() to the name).  This
      was solved by simply unlink()ing the temporary file after it was created.

diff --git a/sbr/m_mktemp.c b/sbr/m_mktemp.c
index aa25636..9f99119 100644
--- a/sbr/m_mktemp.c
+++ b/sbr/m_mktemp.c
@@ -121,7 +121,7 @@ m_mktemp2 (
         /* No directory component */
         return m_mktemp(pfx_in, fd_ret, fp_ret);
     }
-    n = (int)(cp-dir_in-1); /* Length of dir component */
+    n = (int)(cp-dir_in); /* Length of dir component */
     snprintf(buffer, sizeof(buffer), "%.*s%s", n, dir_in, pfx_in);
     return m_mktemp(buffer, fd_ret, fp_ret);
 }
diff --git a/uip/send.c b/uip/send.c
index 39d425f..62bf60a 100644
--- a/uip/send.c
+++ b/uip/send.c
@@ -426,6 +426,7 @@ go_to_it:
            && altmsg) {
        vec[vecp++] = "-dist";
        distfile = getcpy (m_mktemp2 (altmsg, invo_name, NULL, NULL));
+       unlink(distfile);
        if (link (altmsg, distfile) == NOTOK) {
            if (errno != EXDEV
 #ifdef EISREMOTE
diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index 7db5c58..c3d93ff 100644
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -1313,6 +1313,7 @@ sendit (char *sp, char **arg, char *file, int pushed)
            && altmsg) {
        vec[vecp++] = "-dist";
        distfile = getcpy (m_mktemp2(altmsg, invo_name, NULL, NULL));
+       unlink(distfile);
        if (link (altmsg, distfile) == NOTOK)
            adios (distfile, "unable to link %s to", altmsg);
     } else {

-----------------------------------------------------------------------

Summary of changes:
 .gitignore        |    1 +
 sbr/dtimep.lex    |   10 ++--------
 sbr/fmt_compile.c |   10 ++--------
 sbr/fmt_scan.c    |   10 ++--------
 sbr/lock_file.c   |   10 ++--------
 sbr/m_mktemp.c    |    2 +-
 uip/mhbuildsbr.c  |   10 ++--------
 uip/mhcachesbr.c  |   10 ++--------
 uip/picksbr.c     |   10 ++--------
 uip/post.c        |   10 ++--------
 uip/send.c        |    1 +
 uip/sendsbr.c     |   10 ++--------
 uip/whatnowsbr.c  |    1 +
 13 files changed, 22 insertions(+), 73 deletions(-)


hooks/post-receive
-- 
The nmh Mail Handling System