update to current 4.4

SCCS-vsn: contrib/emacs-18.57/etc/loadst.c 5.3
SCCS-vsn: contrib/emacs-18.57/etc/env.c 5.2
SCCS-vsn: contrib/emacs-18.57/etc/emacsclient.c 5.2
SCCS-vsn: contrib/emacs-18.57/etc/movemail.c 5.2

diff --git a/usr/src/contrib/emacs-18.57/etc/emacsclient.c b/usr/src/contrib/emacs-18.57/etc/emacsclient.c
index f91b402..5dde247 100644 (file)
--- a/usr/src/contrib/emacs-18.57/etc/emacsclient.c
+++ b/usr/src/contrib/emacs-18.57/etc/emacsclient.c
@@ -53,9 +53,11 @@ main (argc, argv)
 #include <errno.h>
 #include <sys/stat.h>
 
 #include <errno.h>
 #include <sys/stat.h>
 

+#ifndef BSD4_4

 extern int sys_nerr;
 extern char *sys_errlist[];
 extern int errno;
 extern int sys_nerr;
 extern char *sys_errlist[];
 extern int errno;

+#endif

 
 main (argc, argv)
      int argc;
 
 main (argc, argv)
      int argc;

diff --git a/usr/src/contrib/emacs-18.57/etc/env.c b/usr/src/contrib/emacs-18.57/etc/env.c
index bc449c0..bddf560 100644 (file)
--- a/usr/src/contrib/emacs-18.57/etc/env.c
+++ b/usr/src/contrib/emacs-18.57/etc/env.c
@@ -88,6 +88,7 @@
 #endif /* EMACS */
 
 #include <stdio.h>
 #endif /* EMACS */
 
 #include <stdio.h>

+#include <errno.h>

 
 extern int execvp ();
 extern char *index ();
 
 extern int execvp ();
 extern char *index ();


@@ -196,8 +197,10 @@ main (argc, argv, envp)
     }
   else
     {
     }
   else
     {

+#ifndef BSD4_4

       extern int errno, sys_nerr;
       extern char *sys_errlist[];
       extern int errno, sys_nerr;
       extern char *sys_errlist[];

+#endif

 
       environ = nenv;
       (void) execvp (*argv, argv);
 
       environ = nenv;
       (void) execvp (*argv, argv);

diff --git a/usr/src/contrib/emacs-18.57/etc/movemail.c b/usr/src/contrib/emacs-18.57/etc/movemail.c
index 5d11899..8f2e000 100644 (file)
--- a/usr/src/contrib/emacs-18.57/etc/movemail.c
+++ b/usr/src/contrib/emacs-18.57/etc/movemail.c
@@ -230,7 +230,7 @@ main (argc, argv)
   /* Stride, xenix have file locking, but no ftruncate.  This mess will do. */
   (void) close (open (inname, O_CREAT | O_TRUNC | O_RDWR, 0666));
 #else
   /* Stride, xenix have file locking, but no ftruncate.  This mess will do. */
   (void) close (open (inname, O_CREAT | O_TRUNC | O_RDWR, 0666));
 #else

-  (void) ftruncate (indesc, 0L);
+  (void) ftruncate (indesc, (off_t)0);

 #endif /* STRIDE or XENIX */
 #endif /* MAIL_USE_FLOCK */
   close (indesc);
 #endif /* STRIDE or XENIX */
 #endif /* MAIL_USE_FLOCK */
   close (indesc);