[Nmh-commits] nmh ChangeLog configure.in config/Makefile.in s... [nmh-1_3-branch]

[Peter Maydell]

CVSROOT:        /sources/nmh
Module name:    nmh
Branch:         nmh-1_3-branch
Changes by:     Peter Maydell <pm215>   08/05/04 16:22:56

Modified files:
        .              : ChangeLog configure.in 
        config         : Makefile.in 
        sbr            : Makefile.in dtime.c 
Added files:
        sbr            : memmove.c strerror.c 

Log message:
        * Fixes ported from trunk:
        * bug #23163: various minor fixes for the benefit of older Unixes 
        (specifically SunOS 4): reintroduce strerror() substitute 
implementation;
        provide memmove() substitute implementation
        * bug #23163: fix accidentally broken 'build outside source directory'
        * bug #23162: sbr/dtime.c: fix stray HAVE_TM_GMTOFF that wasn't updated
        to the new macro name.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/nmh/ChangeLog?cvsroot=nmh&only_with_tag=nmh-1_3-branch&r1=1.254.2.3&r2=1.254.2.4
http://cvs.savannah.gnu.org/viewcvs/nmh/configure.in?cvsroot=nmh&only_with_tag=nmh-1_3-branch&r1=1.82&r2=1.82.2.1
http://cvs.savannah.gnu.org/viewcvs/nmh/config/Makefile.in?cvsroot=nmh&only_with_tag=nmh-1_3-branch&r1=1.4&r2=1.4.2.1
http://cvs.savannah.gnu.org/viewcvs/nmh/sbr/Makefile.in?cvsroot=nmh&only_with_tag=nmh-1_3-branch&r1=1.24&r2=1.24.2.1
http://cvs.savannah.gnu.org/viewcvs/nmh/sbr/dtime.c?cvsroot=nmh&only_with_tag=nmh-1_3-branch&r1=1.5&r2=1.5.2.1
http://cvs.savannah.gnu.org/viewcvs/nmh/sbr/memmove.c?cvsroot=nmh&only_with_tag=nmh-1_3-branch&rev=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/nmh/sbr/strerror.c?cvsroot=nmh&only_with_tag=nmh-1_3-branch&rev=1.4.2.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/nmh/nmh/ChangeLog,v
retrieving revision 1.254.2.3
retrieving revision 1.254.2.4
diff -u -b -r1.254.2.3 -r1.254.2.4
--- ChangeLog   30 Apr 2008 19:07:19 -0000      1.254.2.3
+++ ChangeLog   4 May 2008 16:22:51 -0000       1.254.2.4
@@ -1,3 +1,18 @@
+2008-05-04  Peter Maydell  <address@hidden>
+
+       * Fixes ported from trunk:
+
+       * bug #23163: various minor fixes for the benefit of
+       older Unixes (specifically SunOS 4):
+       reintroduce strerror() substitute implementation
+       provide memmove() substitute implementation
+
+       * bug #23163: fix accidentally broken 'build outside
+       source directory' feature
+       
+       * bug #23162: sbr/dtime.c: fix stray HAVE_TM_GMTOFF that
+       wasn't updated to the new macro name.
+
 2008-04-30  Peter Maydell  <address@hidden>
 
        * Fixes ported from trunk: 

Index: configure.in
===================================================================
RCS file: /sources/nmh/nmh/configure.in,v
retrieving revision 1.82
retrieving revision 1.82.2.1
diff -u -b -r1.82 -r1.82.2.1
--- configure.in        11 Apr 2008 14:12:55 -0000      1.82
+++ configure.in        4 May 2008 16:22:52 -0000       1.82.2.1
@@ -1,7 +1,7 @@
 dnl
 dnl configure.in -- autoconf template for nmh
 dnl
-dnl $Id: configure.in,v 1.82 2008/04/11 14:12:55 opk Exp $
+dnl $Id: configure.in,v 1.82.2.1 2008/05/04 16:22:52 pm215 Exp $
 dnl
 
 dnl 2.13 definitely chokes; 2.53 is the earliest version I've tested.
@@ -534,7 +534,7 @@
     [Define to 1 if you have the `sigsetjmp'.]) AC_MSG_RESULT(yes)],
   [AC_MSG_RESULT(no)])
 
-AC_REPLACE_FUNCS(snprintf strdup)
+AC_REPLACE_FUNCS(memmove snprintf strerror strdup)
 
 dnl Look for the initgroups() declaration.  On AIX 4.[13], Solaris 4.1.3, and
 dnl ULTRIX 4.2A the function is defined in libc but there's no declaration in

Index: config/Makefile.in
===================================================================
RCS file: /sources/nmh/nmh/config/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -b -r1.4 -r1.4.2.1
--- config/Makefile.in  24 Dec 2005 17:53:26 -0000      1.4
+++ config/Makefile.in  4 May 2008 16:22:53 -0000       1.4.2.1
@@ -1,7 +1,7 @@
 #
 # Makefile for config subdirectory
 #
-# $Id: Makefile.in,v 1.4 2005/12/24 17:53:26 pm215 Exp $
+# $Id: Makefile.in,v 1.4.2.1 2008/05/04 16:22:53 pm215 Exp $
 #
 
 # nmh version
@@ -58,7 +58,7 @@
        ${srcdir}/version.sh $(VERSION) > version.c
 
 config.o: config.c
-       $(COMPILE2) config.c
+       $(COMPILE2) $<
 
 install:
 

Index: sbr/Makefile.in
===================================================================
RCS file: /sources/nmh/nmh/sbr/Makefile.in,v
retrieving revision 1.24
retrieving revision 1.24.2.1
diff -u -b -r1.24 -r1.24.2.1
--- sbr/Makefile.in     7 Jan 2006 15:22:20 -0000       1.24
+++ sbr/Makefile.in     4 May 2008 16:22:53 -0000       1.24.2.1
@@ -1,7 +1,7 @@
 #
 # Makefile for sbr subdirectory
 #
-# $Id: Makefile.in,v 1.24 2006/01/07 15:22:20 bress Exp $
+# $Id: Makefile.in,v 1.24.2.1 2008/05/04 16:22:53 pm215 Exp $
 #
 
 SHELL = /bin/sh
@@ -34,6 +34,8 @@
 LINT   = @LINT@
 LINTFLAGS = @LINTFLAGS@ 
 
+LIBOBJS = @LIBOBJS@
+
 mailspool    = @mailspool@
 sendmailpath = @sendmailpath@
 
@@ -78,9 +80,9 @@
        m_msgdef.c mf.c utils.c
 
 # source for compatibility functions
-COMPAT = snprintf.c strdup.c
+COMPAT = memmove.c snprintf.c strdup.c strerror.c
 
-OBJS = $(SRCS:.c=.o)
+OBJS = $(SRCS:.c=.o) $(LIBOBJS)
 
 # auxiliary files
 AUX = Makefile.in sigmsg.awk dtimep.lex
@@ -102,13 +104,13 @@
 # Note that some lexes (for example flex 2.5.4) require that there
 # be no space between -o and the output filename.
 dtimep.c: dtimep.lex
-       $(LEX) -o$@ dtimep.lex
+       $(LEX) -o$@ $<
 
 client.o: client.c
-       $(COMPILE2) client.c
+       $(COMPILE2) $<
 
 mts.o: mts.c
-       $(COMPILE2) mts.c
+       $(COMPILE2) $<
 
 pidstatus.o: sigmsg.h
 

Index: sbr/dtime.c
===================================================================
RCS file: /sources/nmh/nmh/sbr/dtime.c,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -b -r1.5 -r1.5.2.1
--- sbr/dtime.c 11 Apr 2008 14:12:55 -0000      1.5
+++ sbr/dtime.c 4 May 2008 16:22:53 -0000       1.5.2.1
@@ -2,7 +2,7 @@
 /*
  * dtime.c -- time/date routines
  *
- * $Id: dtime.c,v 1.5 2008/04/11 14:12:55 opk Exp $
+ * $Id: dtime.c,v 1.5.2.1 2008/05/04 16:22:53 pm215 Exp $
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -169,7 +169,7 @@
     if (tm->tm_isdst)
        tw.tw_flags |= TW_DST;
 
-#ifdef HAVE_TM_GMTOFF
+#ifdef HAVE_STRUCT_TM_TM_GMTOFF
     tw.tw_zone = tm->tm_gmtoff / 60;
     if (tm->tm_isdst)                  /* if DST is in effect */
        tw.tw_zone -= 60;               /* reset to normal offset */

Index: sbr/memmove.c
===================================================================
RCS file: sbr/memmove.c
diff -N sbr/memmove.c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ sbr/memmove.c       4 May 2008 16:22:55 -0000       1.1.2.2
@@ -0,0 +1,11 @@
+/* public domain function from Jan Wolter Unix Incompatibility Notes */
+/* http://unixpapa.com/incnote/ */
+char *memmove(char *dst, char *src, int n)
+{
+  if (src > dst)
+    for ( ; n > 0; n--)
+      *(dst++)= *(src++);
+  else
+    for (dst+= n-1, src+= n-1; n > 0; n--)
+      *(dst--)= *(src--);
+}

Index: sbr/strerror.c
===================================================================
RCS file: sbr/strerror.c
diff -N sbr/strerror.c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ sbr/strerror.c      4 May 2008 16:22:56 -0000       1.4.2.2
@@ -0,0 +1,21 @@
+
+/*
+ * strerror.c -- get error message string
+ *
+ * $Id: strerror.c,v 1.4.2.2 2008/05/04 16:22:56 pm215 Exp $
+ */
+
+#include <h/mh.h>
+
+extern int sys_nerr;
+extern char *sys_errlist[];
+
+
+char *
+strerror (int errnum)
+{
+   if (errnum > 0 && errnum < sys_nerr)
+       return sys_errlist[errnum];
+   else
+       return NULL;
+}