Move the "#endif XXX" and "XXX {" stuff from n.sh into o.sh changing pre.patch to...

diff --git a/lib/libx_c/compat-4.1/gtty.c b/lib/libx_c/compat-4.1/gtty.c
index 0793068..8ebc24e 100644 (file)
--- a/lib/libx_c/compat-4.1/gtty.c
+++ b/lib/libx_c/compat-4.1/gtty.c
@@ -17,6 +17,5 @@ static char sccsid[] = "@(#)gtty.c    5.2 (Berkeley) 3/9/86";
 /*#include <sgtty.h>*/
 
 int gtty(fd, ap) int fd; struct sgttyb *ap; {
-
        return(ioctl(fd, TIOCGETP, ap));
 }

diff --git a/lib/libx_c/compat-4.1/stty.c b/lib/libx_c/compat-4.1/stty.c
index dabc3f2..1cc6458 100644 (file)
--- a/lib/libx_c/compat-4.1/stty.c
+++ b/lib/libx_c/compat-4.1/stty.c
@@ -17,6 +17,5 @@ static char sccsid[] = "@(#)stty.c    5.2 (Berkeley) 3/9/86";
 /*#include <sgtty.h>*/
 
 int stty(fd, ap) int fd; struct sgttyb *ap; {
-
        return(ioctl(fd, TIOCSETP, ap));
 }

diff --git a/lib/libx_c/gen/ndbm.c b/lib/libx_c/gen/ndbm.c
index db00341..056e3c3 100644 (file)
--- a/lib/libx_c/gen/ndbm.c
+++ b/lib/libx_c/gen/ndbm.c
@@ -7,7 +7,7 @@
 /*#include <sys/param.h> gen.h*/
 #include <sys/stat.h>
 #ifdef __STDC__
-/*#include <stdarg.h> stdio.h*/
+#include <stdarg.h>
 #define _va_start(argp, arg) va_start(argp, arg)
 #else
 #include <varargs.h>

diff --git a/lib/libx_c/gen/syslog.c b/lib/libx_c/gen/syslog.c
index 4d65054..7bf841c 100644 (file)
--- a/lib/libx_c/gen/syslog.c
+++ b/lib/libx_c/gen/syslog.c
@@ -8,6 +8,13 @@
 /*#include <sys/time.h> sys/proc.h*/
 #include <sys/wait.h>
 /*#include <time.h> sys/proc.h*/
+#ifdef __STDC__
+#include <stdarg.h>
+#define _va_start(argp, arg) va_start(argp, arg)
+#else
+#include <varargs.h>
+#define _va_start(argp, arg) va_start(argp)
+#endif
 
 /*
  * Copyright (c) 1983 Regents of the University of California.
@@ -43,6 +50,7 @@ static char sccsid[] = "@(#)syslog.c  5.9 (Berkeley) 5/7/86";
 /*#include <sys/syslog.h>*/
 /*#include <netdb.h>*/
 /*#include <strings.h>*/
+/*#include <varargs.h>*/
 
 #define        MAXLINE 1024                    /* max message size */
 #define NULL   0                       /* manifest */
@@ -65,11 +73,17 @@ static struct sockaddr SyslogAddr;  /* AF_UNIX address of local logger */
 extern int errno, sys_nerr;
 extern char *sys_errlist[];
 
-void syslog(pri, fmt, p0, p1, p2, p3, p4) int pri; char *fmt; int p0; int p1; int p2; int p3; int p4; {
+#ifdef __STDC__
+void syslog(int pri, char *fmt, ...)
+#else
+void syslog(pri, fmt, va_alist) int pri; char *fmt; va_dcl
+#endif
+{
        char buf[MAXLINE + 1], outline[MAXLINE + 1];
        register char *b, *f, *o;
        register int c;
        long now;
+       va_list argp;
        int pid, olderrno = errno;
 
        /* see if we should just throw out this message */
@@ -122,7 +136,9 @@ void syslog(pri, fmt, p0, p1, p2, p3, p4) int pri; char *fmt; int p0; int p1; in
        }
        *b++ = '\n';
        *b = '\0';
-       sprintf(o, buf, p0, p1, p2, p3, p4);
+       _va_start(argp, fmt);
+       vsprintf(o, buf, argp);
+       va_end(argp);
        c = strlen(outline);
        if (c > MAXLINE)
                c = MAXLINE;

diff --git a/lib/libx_c/generated.txt b/lib/libx_c/generated.txt
index 9df40df..9fe4126 100644 (file)
--- a/lib/libx_c/generated.txt
+++ b/lib/libx_c/generated.txt
@@ -117,7 +117,6 @@ sys/umount.c
 sys/unlink.c
 sys/utimes.c
 sys/vhangup.c
-sys/vopen.c
 sys/wait.c
 sys/wait3.c
 sys/write.c

diff --git a/lib/libx_c/n.sh b/lib/libx_c/n.sh
index 41c837c..c25ee55 100755 (executable)
--- a/lib/libx_c/n.sh
+++ b/lib/libx_c/n.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-rm -rf *.c *.h *.a *.o *.[ch].nocomm *.[ch].protos *.[ch].protos.nocomm *.temp.c *.[ch].usedby *.[ch].uses arpa compat-4.1 compat-sys5 csu gen inet linux machine net netimp netinet netns ns pascal protocols stdio sys vax vaxif vaxmba vaxuba xx*
+rm -rf .xify *.c *.h *.a *.o *.[ch].nocomm *.[ch].protos *.[ch].protos.nocomm *.temp.c *.[ch].usedby *.[ch].uses arpa compat-4.1 compat-sys5 csu gen inet linux machine net netimp netinet netns ns pascal protocols stdio sys vax vaxif vaxmba vaxuba xx*
 
 find ../libc \( -name '*.[cs]' -o -name Makefile \) -print |\
 sed -e 's:^\.\./libc/::' |\
@@ -113,34 +113,6 @@ do
   done
 done
 
-find . -name '*.[ch]' -print |\
-sed -e 's:^\./::' |\
-while read i
-do
-  echo "i=$i"
-
-  sed -e 's/^\(#[       ]*\(else\|endif\)\)\([^0-9A-Za-z_].*\)\?/\1/' -i $i
-
-  rm -f xx*
-  csplit -b '%05d' -q $i '/^[   ]*{[    ]*$/' '{*}'
-  for j in xx*
-  do
-    :
-  done
-  for k in xx*
-  do
-    if test $k != xx00000
-    then
-      sed -ne '2,$p' -i $k
-    fi
-    if test $k != $j
-    then
-      sed -e '$s/$/ {/' -i $k
-    fi
-  done
-  cat xx* >$i
-done
-
 rm -rf ../libx_c.pre
 cp -r ../libx_c ../libx_c.pre
 patch --strip 1 <pre.patch

diff --git a/lib/libx_c/o.sh b/lib/libx_c/o.sh
index ec96cfe..e0f9821 100755 (executable)
--- a/lib/libx_c/o.sh
+++ b/lib/libx_c/o.sh
@@ -2,6 +2,34 @@
 
 sed -e 's/^/:/;s/ /::/g;s/$/:/' <conflicts.txt >conflicts.temp
 
+find . -name '*.[ch]' -print |\
+sed -e 's:^\./::' |\
+while read i
+do
+  echo "i=$i"
+
+  sed -e 's/^\(#[       ]*\(else\|endif\)\)\([^0-9A-Za-z_].*\)\?/\1/' -i $i
+
+  rm -f xx*
+  csplit -b '%05d' -q $i '/^[   ]*{[    ]*$/' '{*}'
+  for j in xx*
+  do
+    :
+  done
+  for k in xx*
+  do
+    if test $k != xx00000
+    then
+      sed -ne '2,$p' -i $k
+    fi
+    if test $k != $j
+    then
+      sed -e '$s/$/ {/' -i $k
+    fi
+  done
+  cat xx* >$i
+done
+
 find . -name '*.[ch]' -print |\
 sed -e 's:^\./::' |\
 while read i

diff --git a/lib/libx_c/pre.patch b/lib/libx_c/pre.patch
index c5cb72b..a7abedc 100644 (file)
--- a/lib/libx_c/pre.patch
+++ b/lib/libx_c/pre.patch
@@ -1,6 +1,6 @@
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/compat-4.1/ftime.c libx_c/compat-4.1/ftime.c
---- libx_c.pre/compat-4.1/ftime.c      2017-01-20 15:07:14.059375297 +1100
-+++ libx_c/compat-4.1/ftime.c  2017-01-20 15:07:14.067375318 +1100
+--- libx_c.pre/compat-4.1/ftime.c      2017-01-22 19:31:08.958329247 +1100
++++ libx_c/compat-4.1/ftime.c  2017-01-22 18:45:33.000000000 +1100
 @@ -10,18 +10,20 @@
  
  #include <sys/types.h>
@@ -27,34 +27,36 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 +/*};*/
  
  ftime(tp)
-       register struct timeb *tp; {
+       register struct timeb *tp;
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/compat-4.1/gtty.c libx_c/compat-4.1/gtty.c
---- libx_c.pre/compat-4.1/gtty.c       2017-01-20 15:07:14.059375297 +1100
-+++ libx_c/compat-4.1/gtty.c   2017-01-20 15:07:14.067375318 +1100
-@@ -15,7 +15,7 @@
+--- libx_c.pre/compat-4.1/gtty.c       2017-01-22 19:31:08.958329247 +1100
++++ libx_c/compat-4.1/gtty.c   2017-01-22 18:53:43.000000000 +1100
+@@ -15,8 +15,7 @@
  #include <sgtty.h>
  
  gtty(fd, ap)
--      struct sgtty *ap; {
-+      struct sgttyb *ap; {
- 
+-      struct sgtty *ap;
++      struct sgttyb *ap;
+ {
+-
        return(ioctl(fd, TIOCGETP, ap));
  }
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/compat-4.1/stty.c libx_c/compat-4.1/stty.c
---- libx_c.pre/compat-4.1/stty.c       2017-01-20 15:07:14.059375297 +1100
-+++ libx_c/compat-4.1/stty.c   2017-01-20 15:07:14.067375318 +1100
-@@ -15,7 +15,7 @@
+--- libx_c.pre/compat-4.1/stty.c       2017-01-22 19:31:08.958329247 +1100
++++ libx_c/compat-4.1/stty.c   2017-01-22 18:53:37.000000000 +1100
+@@ -15,8 +15,7 @@
  #include <sgtty.h>
  
  stty(fd, ap)
--      struct sgtty *ap; {
-+      struct sgttyb *ap; {
- 
+-      struct sgtty *ap;
++      struct sgttyb *ap;
+ {
+-
        return(ioctl(fd, TIOCSETP, ap));
  }
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/compat-4.1/times.c libx_c/compat-4.1/times.c
---- libx_c.pre/compat-4.1/times.c      2017-01-20 15:07:14.059375297 +1100
-+++ libx_c/compat-4.1/times.c  2017-01-20 15:07:14.067375318 +1100
+--- libx_c.pre/compat-4.1/times.c      2017-01-22 19:31:08.958329247 +1100
++++ libx_c/compat-4.1/times.c  2017-01-22 18:45:33.000000000 +1100
 @@ -10,16 +10,18 @@
  
  #include <sys/time.h>
@@ -79,10 +81,10 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 +/*};*/
  
  times(tmsp)
-       register struct tms *tmsp; {
+       register struct tms *tmsp;
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/compat-4.1/vtimes.c libx_c/compat-4.1/vtimes.c
---- libx_c.pre/compat-4.1/vtimes.c     2017-01-20 15:07:14.059375297 +1100
-+++ libx_c/compat-4.1/vtimes.c 2017-01-20 15:07:14.067375318 +1100
+--- libx_c.pre/compat-4.1/vtimes.c     2017-01-22 19:31:08.958329247 +1100
++++ libx_c/compat-4.1/vtimes.c 2017-01-22 18:45:33.000000000 +1100
 @@ -10,23 +10,25 @@
  
  #include <sys/time.h>
@@ -120,11 +122,11 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 +/*};*/
  
  vtimes(par, chi)
-       register struct vtimes *par, *chi; {
+       register struct vtimes *par, *chi;
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/compat-sys5/memccpy.c libx_c/compat-sys5/memccpy.c
---- libx_c.pre/compat-sys5/memccpy.c   2017-01-20 15:07:14.067375318 +1100
-+++ libx_c/compat-sys5/memccpy.c       2017-01-20 15:07:14.067375318 +1100
-@@ -13,11 +13,15 @@
+--- libx_c.pre/compat-sys5/memccpy.c   2017-01-22 19:31:08.962329268 +1100
++++ libx_c/compat-sys5/memccpy.c       2017-01-22 18:53:54.000000000 +1100
+@@ -13,12 +13,16 @@
  #endif
  
  char *
@@ -132,7 +134,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 -      register char *t, *f;
 +memccpy(_t, _f, c, n)
 +      void *_t, *_f;
-       register c, n; {
+       register c, n;
+ {
 +#define t (*(char **)&_t)
 +#define f (*(char **)&_f)
        while (--n >= 0)
@@ -143,9 +146,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 +#undef f
  }
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/compat-sys5/memchr.c libx_c/compat-sys5/memchr.c
---- libx_c.pre/compat-sys5/memchr.c    2017-01-20 15:07:14.067375318 +1100
-+++ libx_c/compat-sys5/memchr.c        2017-01-20 15:07:14.067375318 +1100
-@@ -12,12 +12,14 @@
+--- libx_c.pre/compat-sys5/memchr.c    2017-01-22 19:31:08.962329268 +1100
++++ libx_c/compat-sys5/memchr.c        2017-01-22 18:54:09.000000000 +1100
+@@ -12,13 +12,15 @@
  static char sccsid[] = "@(#)memchr.c  5.2 (Berkeley) 86/03/09";
  #endif
  
@@ -155,7 +158,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 +void *
 +memchr(_s, c, n)
 +      void *_s;
-       register c, n; {
+       register c, n;
+ {
 +#define s (*(char **)&_s)
        while (--n >= 0)
                if (*s++ == c)
@@ -164,9 +168,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 +#undef s
  }
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/compat-sys5/memcmp.c libx_c/compat-sys5/memcmp.c
---- libx_c.pre/compat-sys5/memcmp.c    2017-01-20 15:07:14.067375318 +1100
-+++ libx_c/compat-sys5/memcmp.c        2017-01-20 15:07:14.067375318 +1100
-@@ -12,11 +12,15 @@
+--- libx_c.pre/compat-sys5/memcmp.c    2017-01-22 19:31:08.962329268 +1100
++++ libx_c/compat-sys5/memcmp.c        2017-01-22 18:54:14.000000000 +1100
+@@ -12,12 +12,16 @@
  static char sccsid[] = "@(#)memcmp.c  5.2 (Berkeley) 86/03/09";
  #endif
  
@@ -174,7 +178,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 -      register char *s1, *s2;
 +memcmp(_s1, _s2, n)
 +      void *_s1, *_s2;
-       register n; {
+       register n;
+ {
 +#define s1 (*(char **)&_s1)
 +#define s2 (*(char **)&_s2)
        while (--n >= 0)
@@ -185,9 +190,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 +#undef s2
  }
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/compat-sys5/memcpy.c libx_c/compat-sys5/memcpy.c
---- libx_c.pre/compat-sys5/memcpy.c    2017-01-20 15:07:14.067375318 +1100
-+++ libx_c/compat-sys5/memcpy.c        2017-01-20 15:07:14.067375318 +1100
-@@ -12,14 +12,18 @@
+--- libx_c.pre/compat-sys5/memcpy.c    2017-01-22 19:31:08.962329268 +1100
++++ libx_c/compat-sys5/memcpy.c        2017-01-22 18:54:20.000000000 +1100
+@@ -12,15 +12,19 @@
  static char sccsid[] = "@(#)memcpy.c  5.2 (Berkeley) 86/03/09";
  #endif
  
@@ -197,7 +202,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 +void *
 +memcpy(_t, _f, n)
 +      void *_t, *_f;
-       register n; {
+       register n;
+ {
 +#define t (*(char **)&_t)
 +#define f (*(char **)&_f)
        register char *p = t;
@@ -210,9 +216,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 +#undef f
  }
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/compat-sys5/memset.c libx_c/compat-sys5/memset.c
---- libx_c.pre/compat-sys5/memset.c    2017-01-20 15:07:14.067375318 +1100
-+++ libx_c/compat-sys5/memset.c        2017-01-20 15:07:14.067375318 +1100
-@@ -12,14 +12,16 @@
+--- libx_c.pre/compat-sys5/memset.c    2017-01-22 19:31:08.962329268 +1100
++++ libx_c/compat-sys5/memset.c        2017-01-22 18:54:02.000000000 +1100
+@@ -12,15 +12,17 @@
  static char sccsid[] = "@(#)memset.c  5.2 (Berkeley) 86/03/09";
  #endif
  
@@ -222,7 +228,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 +void *
 +memset(_s, c, n)
 +      void *_s;
-       register c, n; {
+       register c, n;
+ {
 +#define s (*(char **)&_s)
        register char *p = s;
  
@@ -233,7 +240,7 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 +#undef s
  }
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/fcntl.h libx_c/fcntl.h
---- libx_c.pre/fcntl.h 2017-01-20 15:07:14.059375297 +1100
+--- libx_c.pre/fcntl.h 2017-01-22 19:31:08.954329226 +1100
 +++ libx_c/fcntl.h     1970-01-01 10:00:00.000000000 +1000
 @@ -1,40 +0,0 @@
 -/*
@@ -277,9 +284,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 -#define       FEXCL           04000           /* error if already created */
 -#endif
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/gen/bcmp.c libx_c/gen/bcmp.c
---- libx_c.pre/gen/bcmp.c      2017-01-20 15:07:14.067375318 +1100
-+++ libx_c/gen/bcmp.c  2017-01-20 15:07:14.067375318 +1100
-@@ -11,10 +11,11 @@
+--- libx_c.pre/gen/bcmp.c      2017-01-22 19:31:08.962329268 +1100
++++ libx_c/gen/bcmp.c  2017-01-22 18:54:55.000000000 +1100
+@@ -11,11 +11,12 @@
  /*
   * bcmp -- vax cmpc3 instruction
   */
@@ -287,14 +294,15 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 -      register char *b1, *b2;
 +bcmp(_b1, _b2, length)
 +      void *_b1, *_b2;
-       register int length; {
+       register int length;
+ {
 -
 +#define b1 (*(char **)&_b1)
 +#define b2 (*(char **)&_b2)
        if (length == 0)
                return (0);
        do
-@@ -22,4 +23,6 @@
+@@ -23,4 +24,6 @@
                        break;
        while (--length);
        return(length);
@@ -302,9 +310,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 +#undef b2
  }
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/gen/bcopy.c libx_c/gen/bcopy.c
---- libx_c.pre/gen/bcopy.c     2017-01-20 15:07:14.067375318 +1100
-+++ libx_c/gen/bcopy.c 2017-01-20 15:07:14.071375330 +1100
-@@ -11,9 +11,11 @@
+--- libx_c.pre/gen/bcopy.c     2017-01-22 19:31:08.962329268 +1100
++++ libx_c/gen/bcopy.c 2017-01-22 18:57:53.000000000 +1100
+@@ -11,10 +11,12 @@
  /*
   * bcopy -- vax movc3 instruction
   */
@@ -312,13 +320,14 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 -      register char *src, *dst;
 +bcopy(_src, _dst, length)
 +      void *_src, *_dst;
-       register int length; {
+       register int length;
+ {
 +#define src (*(char **)&_src)
 +#define dst (*(char **)&_dst)
        if (length && src != dst)
                if ((u_int)dst < (u_int)src)
                        if (((int)src | (int)dst | length) & 3)
-@@ -23,7 +25,7 @@
+@@ -24,7 +26,7 @@
                        else {
                                length >>= 2;
                                do      /* copy by longs */
@@ -327,7 +336,7 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
                                while (--length);
                        }
                else {                  /* copy backwards */
-@@ -36,9 +38,11 @@
+@@ -37,9 +39,11 @@
                        else {
                                length >>= 2;
                                do      /* copy by shorts */
@@ -341,9 +350,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 +#undef dst
  }
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/gen/bzero.c libx_c/gen/bzero.c
---- libx_c.pre/gen/bzero.c     2017-01-20 15:07:14.067375318 +1100
-+++ libx_c/gen/bzero.c 2017-01-20 15:07:14.071375330 +1100
-@@ -11,13 +11,14 @@
+--- libx_c.pre/gen/bzero.c     2017-01-22 19:31:08.962329268 +1100
++++ libx_c/gen/bzero.c 2017-01-22 19:05:53.000000000 +1100
+@@ -11,14 +11,15 @@
  /*
   * bzero -- vax movc5 instruction
   */
@@ -351,7 +360,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 -      register char *b;
 +bzero(_b, length)
 +      void *_b;
-       register int length; {
+       register int length;
+ {
 -
 +#define b (*(char **)&_b)
        if (length)
@@ -362,16 +372,17 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 +#undef b
  }
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/gen/calloc.c libx_c/gen/calloc.c
---- libx_c.pre/gen/calloc.c    2017-01-20 15:07:14.067375318 +1100
-+++ libx_c/gen/calloc.c        2017-01-20 15:07:14.071375330 +1100
-@@ -5,11 +5,11 @@
+--- libx_c.pre/gen/calloc.c    2017-01-22 19:31:08.962329268 +1100
++++ libx_c/gen/calloc.c        2017-01-22 19:06:21.000000000 +1100
+@@ -5,12 +5,12 @@
  /*
   * Calloc - allocate and clear memory block
   */
 -char *
 +void *
  calloc(num, size)
-       register unsigned num, size; {
+       register unsigned num, size;
+ {
 -      extern char *malloc();
 -      register char *p;
 +      extern void *malloc();
@@ -379,29 +390,30 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
  
        size *= num;
        if (p = malloc(size))
-@@ -18,7 +18,7 @@
+@@ -19,7 +19,7 @@
  }
  
  cfree(p, num, size)
 -      char *p;
 +      void *p;
        unsigned num;
-       unsigned size; {
-       free(p);
+       unsigned size;
+ {
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/gen/fakcu.c libx_c/gen/fakcu.c
---- libx_c.pre/gen/fakcu.c     2017-01-20 15:07:14.067375318 +1100
-+++ libx_c/gen/fakcu.c 2017-01-20 15:07:14.071375330 +1100
-@@ -6,5 +6,6 @@
+--- libx_c.pre/gen/fakcu.c     2017-01-22 19:31:08.962329268 +1100
++++ libx_c/gen/fakcu.c 2017-01-22 18:57:44.000000000 +1100
+@@ -6,6 +6,7 @@
   * Null cleanup routine to resolve reference in exit() 
   * if not using stdio.
   */
 +void
- _cleanup() {
+ _cleanup()
+ {
  }
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/gen/getpass.c libx_c/gen/getpass.c
---- libx_c.pre/gen/getpass.c   2017-01-20 15:07:14.067375318 +1100
-+++ libx_c/gen/getpass.c       2017-01-20 15:07:14.071375330 +1100
-@@ -15,8 +15,8 @@
+--- libx_c.pre/gen/getpass.c   2017-01-22 19:31:08.962329268 +1100
++++ libx_c/gen/getpass.c       2017-01-22 18:45:33.000000000 +1100
+@@ -16,8 +16,8 @@
        register c;
        FILE *fi;
        static char pbuf[9];
@@ -413,9 +425,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
        if ((fi = fdopen(open("/dev/tty", 2), "r")) == NULL)
                fi = stdin;
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/gen/getusershell.c libx_c/gen/getusershell.c
---- libx_c.pre/gen/getusershell.c      2017-01-20 15:07:14.067375318 +1100
-+++ libx_c/gen/getusershell.c  2017-01-20 15:07:14.071375330 +1100
-@@ -62,7 +62,7 @@
+--- libx_c.pre/gen/getusershell.c      2017-01-22 19:31:08.962329268 +1100
++++ libx_c/gen/getusershell.c  2017-01-22 18:45:33.000000000 +1100
+@@ -66,7 +66,7 @@
        register char **sp, *cp;
        register FILE *fp;
        struct stat statb;
@@ -424,7 +436,7 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
  
        if (shells != NULL)
                free((char *)shells);
-@@ -76,7 +76,7 @@
+@@ -80,7 +80,7 @@
                (void)fclose(fp);
                return(okshells);
        }
@@ -434,11 +446,11 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
                return(okshells);
        }
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/gen/insque.c libx_c/gen/insque.c
---- libx_c.pre/gen/insque.c    2017-01-20 15:07:14.067375318 +1100
-+++ libx_c/gen/insque.c        2017-01-20 15:07:14.071375330 +1100
+--- libx_c.pre/gen/insque.c    2017-01-22 19:31:08.962329268 +1100
++++ libx_c/gen/insque.c        2017-01-22 18:45:33.000000000 +1100
 @@ -8,16 +8,19 @@
  static char sccsid[] = "@(#)insque.c  5.1 (Berkeley) 1/27/87";
- #endif
+ #endif LIBC_SCCS and not lint
  
 +#include <gen.h>
 +
@@ -459,14 +471,14 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 +/*};*/
  
  insque(e, prev)
-       register struct vaxque *e, *prev; {
+       register struct vaxque *e, *prev;
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/gen/isatty.c libx_c/gen/isatty.c
---- libx_c.pre/gen/isatty.c    2017-01-20 15:07:14.067375318 +1100
+--- libx_c.pre/gen/isatty.c    2017-01-22 19:31:08.962329268 +1100
 +++ libx_c/gen/isatty.c        1970-01-01 10:00:00.000000000 +1000
-@@ -1,17 +0,0 @@
+@@ -1,18 +0,0 @@
 -#if defined(LIBC_SCCS) && !defined(lint)
 -static char sccsid[] = "@(#)isatty.c  5.2 (Berkeley) 3/9/86";
--#endif
+-#endif LIBC_SCCS and not lint
 -
 -/*
 - * Returns 1 iff file is a tty
@@ -474,7 +486,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 -
 -#include <sgtty.h>
 -
--isatty(f) {
+-isatty(f)
+-{
 -      struct sgttyb ttyb;
 -
 -      if (ioctl(f, TIOCGETP, &ttyb) < 0)
@@ -482,8 +495,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 -      return(1);
 -}
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/gen/malloc.c libx_c/gen/malloc.c
---- libx_c.pre/gen/malloc.c    2017-01-20 15:07:14.067375318 +1100
-+++ libx_c/gen/malloc.c        2017-01-20 15:07:14.071375330 +1100
+--- libx_c.pre/gen/malloc.c    2017-01-22 19:31:08.962329268 +1100
++++ libx_c/gen/malloc.c        2017-01-22 18:59:48.000000000 +1100
 @@ -82,7 +82,7 @@
  #if defined(DEBUG) || defined(RCHECK)
  #define       ASSERT(p)   if (!(p)) botch("p")
@@ -491,37 +504,39 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 -static
 +static void
  botch(s)
-       char *s; {
-       fprintf(stderr, "\r\nassertion botched: %s\r\n", s);
-@@ -93,7 +93,7 @@
+       char *s;
+ {
+@@ -94,7 +94,7 @@
  #define       ASSERT(p)
  #endif
  
 -char *
 +void *
  malloc(nbytes)
-       unsigned nbytes; {
-       register union overhead *op;
-@@ -177,6 +177,7 @@
+       unsigned nbytes;
+ {
+@@ -179,6 +179,7 @@
  /*
   * Allocate more memory to the indicated bucket.
   */
 +void
  morecore(bucket)
-       int bucket; {
-       register union overhead *op;
-@@ -217,8 +218,9 @@
+       int bucket;
+ {
+@@ -220,9 +221,10 @@
        }
  }
  
 +void
  free(cp)
--      char *cp; {
-+      void *cp; {
+-      char *cp;
+-{   
++      void *cp;
++{
        register int size;
        register union overhead *op;
  
-@@ -257,9 +259,9 @@
+@@ -261,11 +263,11 @@
   */
  int realloc_srchlen = 4;      /* 4 should be plenty, -1 =>'s whole list */
  
@@ -530,20 +545,23 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
  realloc(cp, nbytes)
 -      char *cp; 
 +      void *cp; 
-       unsigned nbytes; {
+       unsigned nbytes;
+-{   
++{
        register u_int onb, i;
        union overhead *op;
-@@ -352,6 +354,7 @@
+       char *res;
+@@ -358,6 +360,7 @@
   * for each size category, the second showing the number of mallocs -
   * frees for each size category.
   */
 +void
  mstats(s)
-       char *s; {
-       register int i, j;
+       char *s;
+ {
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/gen/ndbm.c libx_c/gen/ndbm.c
---- libx_c.pre/gen/ndbm.c      2017-01-20 15:07:14.067375318 +1100
-+++ libx_c/gen/ndbm.c  2017-01-20 15:07:14.071375330 +1100
+--- libx_c.pre/gen/ndbm.c      2017-01-22 19:31:08.962329268 +1100
++++ libx_c/gen/ndbm.c  2017-01-22 19:08:55.000000000 +1100
 @@ -14,6 +14,7 @@
  #include <stdio.h>
  #include <errno.h>
@@ -552,21 +570,22 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
  
  #define BYTESIZ 8
  #undef setbit
-@@ -24,9 +25,11 @@
+@@ -24,10 +25,12 @@
  extern  int errno;
  
  DBM *
 -dbm_open(file, flags, mode)
 +dbm_open(file, flags, va_alist)
        char *file;
--      int flags, mode; {
+-      int flags, mode;
 +      int flags;
-+      va_dcl {
++      va_dcl
+ {
 +      va_list argp;
        struct stat statb;
        register DBM *db;
  
-@@ -39,12 +42,16 @@
+@@ -40,12 +43,16 @@
                flags = (flags & ~03) | O_RDWR;
        strcpy(db->dbm_pagbuf, file);
        strcat(db->dbm_pagbuf, ".pag");
@@ -586,8 +605,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
                goto bad1;
        fstat(db->dbm_dirf, &statb);
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/gen/perror.c libx_c/gen/perror.c
---- libx_c.pre/gen/perror.c    2017-01-20 15:07:14.067375318 +1100
-+++ libx_c/gen/perror.c        2017-01-20 15:07:14.071375330 +1100
+--- libx_c.pre/gen/perror.c    2017-01-22 19:31:08.962329268 +1100
++++ libx_c/gen/perror.c        2017-01-22 18:45:43.000000000 +1100
 @@ -17,7 +17,7 @@
  
  int   errno;
@@ -595,12 +614,12 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 -char  *sys_errlist[];
 +extern char   *sys_errlist[];
  perror(s)
-       char *s; {
-       struct iovec iov[4];
+       char *s;
+ {
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/gen/popen.c libx_c/gen/popen.c
---- libx_c.pre/gen/popen.c     2017-01-20 15:07:14.067375318 +1100
+--- libx_c.pre/gen/popen.c     2017-01-22 19:31:08.962329268 +1100
 +++ libx_c/gen/popen.c 1970-01-01 10:00:00.000000000 +1000
-@@ -1,77 +0,0 @@
+@@ -1,79 +0,0 @@
 -/*
 - * Copyright (c) 1980 Regents of the University of California.
 - * All rights reserved.  The Berkeley software License Agreement
@@ -609,7 +628,7 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 -
 -#if defined(LIBC_SCCS) && !defined(lint)
 -static char sccsid[] = "@(#)popen.c   5.4 (Berkeley) 3/26/86";
--#endif
+-#endif LIBC_SCCS and not lint
 -
 -#include <stdio.h>
 -#include <signal.h>
@@ -626,7 +645,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 -FILE *
 -popen(cmd,mode)
 -      char *cmd;
--      char *mode; {
+-      char *mode;
+-{
 -      int p[2];
 -      int myside, hisside, pid;
 -
@@ -664,7 +684,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 -}
 -
 -pclose(ptr)
--      FILE *ptr; {
+-      FILE *ptr;
+-{
 -      int child, pid, status, omask;
 -
 -      child = popen_pid[fileno(ptr)];
@@ -679,9 +700,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 -      return (pid == -1 ? -1 : status);
 -}
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/gen/qsort.c libx_c/gen/qsort.c
---- libx_c.pre/gen/qsort.c     2017-01-20 15:07:14.067375318 +1100
-+++ libx_c/gen/qsort.c 2017-01-20 15:07:14.071375330 +1100
-@@ -32,11 +32,13 @@
+--- libx_c.pre/gen/qsort.c     2017-01-22 19:31:08.962329268 +1100
++++ libx_c/gen/qsort.c 2017-01-22 19:06:02.000000000 +1100
+@@ -32,12 +32,14 @@
   * It's not...
   */
  
@@ -692,12 +713,13 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 +      void    *_base;
        int     n;
        int     size;
-       int     (*compar)(); {
+       int     (*compar)();
+ {
 +#define base ((char *)_base)
        register char c, *i, *j, *lo, *hi;
        char *min, *max;
  
-@@ -89,6 +91,7 @@
+@@ -90,6 +92,7 @@
                        }
                }
        }
@@ -705,19 +727,23 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
  }
  
  /*
-@@ -106,7 +109,7 @@
+@@ -107,10 +110,9 @@
   * (And there are only three places where this is done).
   */
  
 -static
 +static void
  qst(base, max)
-       char *base, *max; {
+-      char *base, *max;
+-{
++      char *base, *max; {
        register char c, *i, *j, *jj;
+       register int ii;
+       char *mid, *tmp;
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/gen/random.c libx_c/gen/random.c
---- libx_c.pre/gen/random.c    2017-01-20 15:07:14.067375318 +1100
-+++ libx_c/gen/random.c        2017-01-20 15:07:14.071375330 +1100
-@@ -222,7 +222,7 @@
+--- libx_c.pre/gen/random.c    2017-01-22 19:31:08.962329268 +1100
++++ libx_c/gen/random.c        2017-01-22 18:45:57.000000000 +1100
+@@ -224,7 +224,7 @@
        if(  n  <  BREAK_1  )  {
            if(  n  <  BREAK_0  )  {
                fprintf( stderr, "initstate: not enough state (%d bytes) with which to do jack; ignored.\n" );
@@ -727,11 +753,11 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
            rand_type = TYPE_0;
            rand_deg = DEG_0;
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/gen/regex.c libx_c/gen/regex.c
---- libx_c.pre/gen/regex.c     2017-01-20 15:07:14.067375318 +1100
-+++ libx_c/gen/regex.c 2017-01-20 15:07:14.071375330 +1100
+--- libx_c.pre/gen/regex.c     2017-01-22 19:31:08.962329268 +1100
++++ libx_c/gen/regex.c 2017-01-22 18:45:57.000000000 +1100
 @@ -8,8 +8,6 @@
  static char sccsid[] = "@(#)regex.c   5.2 (Berkeley) 3/9/86";
- #endif
+ #endif LIBC_SCCS and not lint
  
 -#
 -
@@ -739,11 +765,11 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
   * routines to do regular expression matching
   *
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/gen/remque.c libx_c/gen/remque.c
---- libx_c.pre/gen/remque.c    2017-01-20 15:07:14.067375318 +1100
-+++ libx_c/gen/remque.c        2017-01-20 15:07:14.071375330 +1100
+--- libx_c.pre/gen/remque.c    2017-01-22 19:31:08.962329268 +1100
++++ libx_c/gen/remque.c        2017-01-22 18:45:57.000000000 +1100
 @@ -8,16 +8,19 @@
  static char sccsid[] = "@(#)remque.c  5.1 (Berkeley) 1/27/87";
- #endif
+ #endif LIBC_SCCS and not lint
  
 +#include <gen.h>
 +
@@ -764,84 +790,118 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 +/*};*/
  
  remque(e)
-       register struct vaxque *e; {
+       register struct vaxque *e;
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/gen/signal.c libx_c/gen/signal.c
---- libx_c.pre/gen/signal.c    2017-01-20 15:07:14.067375318 +1100
-+++ libx_c/gen/signal.c        2017-01-20 15:07:14.071375330 +1100
+--- libx_c.pre/gen/signal.c    2017-01-22 19:31:08.962329268 +1100
++++ libx_c/gen/signal.c        2017-01-22 18:54:49.000000000 +1100
 @@ -13,9 +13,10 @@
   */
  #include <signal.h>
  
 -int (*
-+void (*
- signal(s, a))()
--      int s, (*a)(); {
+-signal(s, a))()
+-      int s, (*a)();
++void
++(*signal(s, a))()
 +      int s;
-+      void (*a)(); {
++      void (*a)();
+ {
        struct sigvec osv, sv;
        static int mask[NSIG];
-       static int flags[NSIG];
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/gen/sleep.c libx_c/gen/sleep.c
---- libx_c.pre/gen/sleep.c     2017-01-20 15:07:14.067375318 +1100
-+++ libx_c/gen/sleep.c 2017-01-20 15:07:14.071375330 +1100
-@@ -16,9 +16,11 @@
+--- libx_c.pre/gen/sleep.c     2017-01-22 19:31:08.962329268 +1100
++++ libx_c/gen/sleep.c 2017-01-22 18:57:39.000000000 +1100
+@@ -16,10 +16,12 @@
  
  static int ringring;
  
 +void
  sleep(n)
-       unsigned n; {
+       unsigned n;
+ {
 -      int sleepx(), omask;
 +      void sleepx();
 +      int omask;
        struct itimerval itv, oitv;
        register struct itimerval *itp = &itv;
        struct sigvec vec, ovec;
-@@ -57,8 +59,7 @@
+@@ -58,9 +60,8 @@
        (void) setitimer(ITIMER_REAL, &oitv, (struct itimerval *)0);
  }
  
 -static
 +static void
- sleepx() {
+ sleepx()
+ {
 -
        ringring = 1;
  }
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/gen/syslog.c libx_c/gen/syslog.c
---- libx_c.pre/gen/syslog.c    2017-01-20 15:07:14.067375318 +1100
-+++ libx_c/gen/syslog.c        2017-01-20 15:07:14.071375330 +1100
-@@ -54,6 +54,7 @@
+--- libx_c.pre/gen/syslog.c    2017-01-22 19:31:08.962329268 +1100
++++ libx_c/gen/syslog.c        2017-01-22 18:57:26.000000000 +1100
+@@ -32,6 +32,7 @@
+ #include <sys/syslog.h>
+ #include <netdb.h>
+ #include <strings.h>
++#include <varargs.h>
+ 
+ #define       MAXLINE 1024                    /* max message size */
+ #define NULL  0                       /* manifest */
+@@ -54,14 +55,17 @@
  extern        int errno, sys_nerr;
  extern        char *sys_errlist[];
  
+-syslog(pri, fmt, p0, p1, p2, p3, p4)
 +void
- syslog(pri, fmt, p0, p1, p2, p3, p4)
++syslog(pri, fmt, va_alist)
        int pri;
-       char *fmt; {
-@@ -151,6 +152,7 @@
+       char *fmt;
++      va_dcl
+ {
+       char buf[MAXLINE + 1], outline[MAXLINE + 1];
+       register char *b, *f, *o;
+       register int c;
+       long now;
++      va_list argp;
+       int pid, olderrno = errno;
+ 
+       /* see if we should just throw out this message */
+@@ -114,7 +118,9 @@
+       }
+       *b++ = '\n';
+       *b = '\0';
+-      sprintf(o, buf, p0, p1, p2, p3, p4);
++      va_start(argp);
++      vsprintf(o, buf, argp);
++      va_end(argp);
+       c = strlen(outline);
+       if (c > MAXLINE)
+               c = MAXLINE;
+@@ -152,6 +158,7 @@
   * OPENLOG -- open system log
   */
  
 +void
  openlog(ident, logstat, logfac)
        char *ident;
-       int logstat, logfac; {
-@@ -173,8 +175,8 @@
+       int logstat, logfac;
+@@ -175,9 +182,9 @@
   * CLOSELOG -- close the system log
   */
  
 +void
- closelog() {
+ closelog()
+ {
 -
        (void) close(LogFile);
        LogFile = -1;
  }
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/gen/system.c libx_c/gen/system.c
---- libx_c.pre/gen/system.c    2017-01-20 15:07:14.067375318 +1100
-+++ libx_c/gen/system.c        2017-01-20 15:07:14.071375330 +1100
-@@ -7,7 +7,7 @@
- system(s)
- char *s; {
+--- libx_c.pre/gen/system.c    2017-01-22 19:31:08.962329268 +1100
++++ libx_c/gen/system.c        2017-01-22 18:45:57.000000000 +1100
+@@ -8,7 +8,7 @@
+ char *s;
+ {
        int status, pid, w;
 -      register int (*istat)(), (*qstat)();
 +      register void (*istat)(), (*qstat)();
@@ -849,37 +909,40 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
        if ((pid = vfork()) == 0) {
                execl("/bin/sh", "sh", "-c", s, 0);
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/gen/usleep.c libx_c/gen/usleep.c
---- libx_c.pre/gen/usleep.c    2017-01-20 15:07:14.067375318 +1100
-+++ libx_c/gen/usleep.c        2017-01-20 15:07:14.071375330 +1100
-@@ -19,9 +19,11 @@
+--- libx_c.pre/gen/usleep.c    2017-01-22 19:31:08.962329268 +1100
++++ libx_c/gen/usleep.c        2017-01-22 19:06:12.000000000 +1100
+@@ -19,10 +19,12 @@
  
  static int ringring;
  
 +void
  usleep(n)
-       unsigned n; {
+       unsigned n;
+ {
 -      int sleepx(), omask;
 +      void sleepx();
 +      int omask;
        struct itimerval itv, oitv;
        register struct itimerval *itp = &itv;
        struct sigvec vec, ovec;
-@@ -60,8 +62,7 @@
+@@ -61,9 +63,7 @@
        (void) setitimer(ITIMER_REAL, &oitv, (struct itimerval *)0);
  }
  
 -static
-+static void
- sleepx() {
+-sleepx()
+-{
 -
++static void
++sleepx() {
        ringring = 1;
  }
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/gen/valloc.c libx_c/gen/valloc.c
---- libx_c.pre/gen/valloc.c    2017-01-20 15:07:14.067375318 +1100
-+++ libx_c/gen/valloc.c        2017-01-20 15:07:14.071375330 +1100
+--- libx_c.pre/gen/valloc.c    2017-01-22 19:31:08.962329268 +1100
++++ libx_c/gen/valloc.c        2017-01-22 18:45:57.000000000 +1100
 @@ -8,9 +8,9 @@
  static char sccsid[] = "@(#)valloc.c  5.2 (Berkeley) 3/9/86";
- #endif
+ #endif LIBC_SCCS and not lint
  
 -char  *malloc();
 +void  *malloc();
@@ -887,22 +950,11 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 -char *
 +void *
  valloc(i)
-       int i; {
-       int valsiz = getpagesize(), j;
-diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/generated.txt libx_c/generated.txt
---- libx_c.pre/generated.txt   2017-01-20 15:07:14.059375297 +1100
-+++ libx_c/generated.txt       2017-01-20 15:07:56.423489466 +1100
-@@ -117,6 +117,7 @@
- sys/unlink.c
- sys/utimes.c
- sys/vhangup.c
-+sys/vopen.c
- sys/wait.c
- sys/wait3.c
- sys/write.c
+       int i;
+ {
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/gen.h libx_c/gen.h
 --- libx_c.pre/gen.h   1970-01-01 10:00:00.000000000 +1000
-+++ libx_c/gen.h       2017-01-20 15:07:14.071375330 +1100
++++ libx_c/gen.h       2017-01-22 18:45:57.000000000 +1100
 @@ -0,0 +1,5 @@
 +/* formerly duplicated in gen/insque.c and gen/remque.c */
 +struct vaxque {               /* queue format expected by VAX queue instructions */
@@ -910,9 +962,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 +      struct vaxque   *vq_prev;
 +};
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/net/rcmd.c libx_c/net/rcmd.c
---- libx_c.pre/net/rcmd.c      2017-01-20 15:07:14.059375297 +1100
-+++ libx_c/net/rcmd.c  2017-01-20 15:07:14.071375330 +1100
-@@ -58,7 +58,7 @@
+--- libx_c.pre/net/rcmd.c      2017-01-22 19:31:08.958329247 +1100
++++ libx_c/net/rcmd.c  2017-01-22 18:45:57.000000000 +1100
+@@ -59,7 +59,7 @@
                sin.sin_family = hp->h_addrtype;
                bcopy(hp->h_addr_list[0], (caddr_t)&sin.sin_addr, hp->h_length);
                sin.sin_port = rport;
@@ -921,7 +973,7 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
                        break;
                (void) close(s);
                if (errno == EADDRINUSE) {
-@@ -106,7 +106,7 @@
+@@ -107,7 +107,7 @@
                        (void) close(s2);
                        goto bad;
                }
@@ -930,7 +982,7 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
                (void) close(s2);
                if (s3 < 0) {
                        perror("accept");
-@@ -160,7 +160,7 @@
+@@ -162,7 +162,7 @@
                return (-1);
        for (;;) {
                sin.sin_port = htons((u_short)*alport);
@@ -940,9 +992,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
                if (errno != EADDRINUSE) {
                        (void) close(s);
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/net/res_debug.c libx_c/net/res_debug.c
---- libx_c.pre/net/res_debug.c 2017-01-20 15:07:14.059375297 +1100
-+++ libx_c/net/res_debug.c     2017-01-20 15:07:14.071375330 +1100
-@@ -324,7 +324,9 @@
+--- libx_c.pre/net/res_debug.c 2017-01-22 19:31:08.958329247 +1100
++++ libx_c/net/res_debug.c     2017-01-22 18:45:57.000000000 +1100
+@@ -328,7 +328,9 @@
  }
  
  static        char nbuf[20];
@@ -953,7 +1005,7 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
  
  /*
   * Return a string for the type
-@@ -380,7 +382,10 @@
+@@ -385,7 +387,10 @@
        case T_GID:
                return("GID");
        default:
@@ -965,7 +1017,7 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
        }
  }
  
-@@ -397,6 +402,9 @@
+@@ -403,6 +408,9 @@
        case C_ANY:             /* matches any class */
                return("ANY");
        default:
@@ -977,8 +1029,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
        }
  }
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/net/res_mkquery.c libx_c/net/res_mkquery.c
---- libx_c.pre/net/res_mkquery.c       2017-01-20 15:07:14.059375297 +1100
-+++ libx_c/net/res_mkquery.c   2017-01-20 15:07:14.071375330 +1100
+--- libx_c.pre/net/res_mkquery.c       2017-01-22 19:31:08.958329247 +1100
++++ libx_c/net/res_mkquery.c   2017-01-22 18:45:57.000000000 +1100
 @@ -14,7 +14,10 @@
  #include <arpa/nameser.h>
  #include <resolv.h>
@@ -991,7 +1043,7 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
  
  /*
   * Form all types of queries.
-@@ -70,7 +73,9 @@
+@@ -71,7 +74,9 @@
                        if (res_init() == -1)
                                return(-1);
                if (_res.defdname[0] != '\0')
@@ -1003,10 +1055,10 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
        /*
         * perform opcode specific processing
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/net/res_send.c libx_c/net/res_send.c
---- libx_c.pre/net/res_send.c  2017-01-20 15:07:14.059375297 +1100
-+++ libx_c/net/res_send.c      2017-01-20 15:07:14.071375330 +1100
-@@ -82,7 +82,7 @@
- #endif
+--- libx_c.pre/net/res_send.c  2017-01-22 19:31:08.958329247 +1100
++++ libx_c/net/res_send.c      2017-01-22 18:45:57.000000000 +1100
+@@ -83,7 +83,7 @@
+ #endif DEBUG
                                        continue;
                                }
 -                              if (connect(s, &(_res.nsaddr_list[ns]),
@@ -1014,7 +1066,7 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
                                   sizeof(struct sockaddr)) < 0) {
                                        terrno = errno;
  #ifdef DEBUG
-@@ -156,7 +156,7 @@
+@@ -157,7 +157,7 @@
                        if (s < 0)
                                s = socket(AF_INET, SOCK_DGRAM, 0);
  #if   BSD >= 43
@@ -1024,9 +1076,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
                            send(s, buf, buflen, 0) != buflen) {
  #ifdef DEBUG
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/net/rexec.c libx_c/net/rexec.c
---- libx_c.pre/net/rexec.c     2017-01-20 15:07:14.059375297 +1100
-+++ libx_c/net/rexec.c 2017-01-20 15:07:14.071375330 +1100
-@@ -49,7 +49,7 @@
+--- libx_c.pre/net/rexec.c     2017-01-22 19:31:08.958329247 +1100
++++ libx_c/net/rexec.c 2017-01-22 18:45:57.000000000 +1100
+@@ -50,7 +50,7 @@
        sin.sin_family = hp->h_addrtype;
        sin.sin_port = rport;
        bcopy(hp->h_addr, (caddr_t)&sin.sin_addr, hp->h_length);
@@ -1035,7 +1087,7 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
                if (errno == ECONNREFUSED && timo <= 16) {
                        (void) close(s);
                        sleep(timo);
-@@ -83,7 +83,7 @@
+@@ -84,7 +84,7 @@
                (void) sprintf(num, "%d", port);
                (void) write(s, num, strlen(num)+1);
                { int len = sizeof (from);
@@ -1045,26 +1097,26 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
                  if (s3 < 0) {
                        perror("accept");
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/net/ruserpass.c libx_c/net/ruserpass.c
---- libx_c.pre/net/ruserpass.c 2017-01-20 15:07:14.059375297 +1100
-+++ libx_c/net/ruserpass.c     2017-01-20 15:07:14.071375330 +1100
+--- libx_c.pre/net/ruserpass.c 2017-01-22 19:31:08.958329247 +1100
++++ libx_c/net/ruserpass.c     2017-01-22 18:45:57.000000000 +1100
 @@ -19,6 +19,7 @@
  struct        utmp *getutmp();
  static        FILE *cfile;
  
 +void
  ruserpass(host, aname, apass)
-       char *host, **aname, **apass; {
- 
-@@ -45,7 +46,7 @@
+       char *host, **aname, **apass;
+ {
+@@ -46,7 +47,7 @@
        }
  }
  
 -static
 +static void
  renv(host, aname, apass)
-       char *host, **aname, **apass; {
-       register char *cp;
-@@ -72,8 +73,7 @@
+       char *host, **aname, **apass;
+ {
+@@ -74,8 +75,7 @@
        mkpwclear(cp, host[0], *apass);
  }
  
@@ -1072,63 +1124,63 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 -char *
 +static char *
  renvlook(host)
-       char *host; {
-       register char *cp, **env;
-@@ -125,7 +125,7 @@
+       char *host;
+ {
+@@ -128,7 +128,7 @@
        0,              0
  };
  
 -static
 +static void
  rnetrc(host, aname, apass)
-       char *host, **aname, **apass; {
-       char *hdir, buf[BUFSIZ];
-@@ -482,7 +482,7 @@
+       char *host, **aname, **apass;
+ {
+@@ -487,7 +487,7 @@
   * Set up the key schedule from the key.
   */
  
 -static
 +static void
  nbssetkey(key)
- char *key; {
-       register i, j, k;
-@@ -606,7 +606,7 @@
+ char *key;
+ {
+@@ -612,7 +612,7 @@
   * The payoff: encrypt a block.
   */
  
 -static
 +static void
  blkencrypt(block, edflag)
- char *block; {
-       int i, ii;
-@@ -720,7 +720,7 @@
+ char *block;
+ {
+@@ -728,7 +728,7 @@
        return(NULL);
  }
  
 -static
 +static void
  sreverse(sto, sfrom)
-       register char *sto, *sfrom; {
-       register int i;
-@@ -763,6 +763,7 @@
+       register char *sto, *sfrom;
+ {
+@@ -773,6 +773,7 @@
        return (skey);
  }
  
 +void
  mkpwunclear(spasswd,mch,sencpasswd)
-       char mch, *spasswd, *sencpasswd; {
-       register char *skey;
-@@ -779,6 +780,7 @@
+       char mch, *spasswd, *sencpasswd;
+ {
+@@ -790,6 +791,7 @@
        nbsencrypt(spasswd, skey, sencpasswd);
  }
  
 +void
  mkpwclear(sencpasswd,mch,spasswd)
-       char mch, *spasswd, *sencpasswd; {
-       register char *skey;
+       char mch, *spasswd, *sencpasswd;
+ {
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/net.h libx_c/net.h
 --- libx_c.pre/net.h   1970-01-01 10:00:00.000000000 +1000
-+++ libx_c/net.h       2017-01-20 15:07:14.071375330 +1100
++++ libx_c/net.h       2017-01-22 18:45:57.000000000 +1100
 @@ -0,0 +1,16 @@
 +/* formerly duplicated in netinet/in.h and netns/ns.h */
 +/* confuses cproto which thinks #define names are types or type modifiers */
@@ -1147,8 +1199,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 +u_long        ntohl(), htonl();
 +/*#endif*/
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/netinet/in.h libx_c/netinet/in.h
---- libx_c.pre/netinet/in.h    2017-01-20 15:07:14.059375297 +1100
-+++ libx_c/netinet/in.h        2017-01-20 15:07:14.071375330 +1100
+--- libx_c.pre/netinet/in.h    2017-01-22 19:31:08.962329268 +1100
++++ libx_c/netinet/in.h        2017-01-22 18:45:57.000000000 +1100
 @@ -90,20 +90,21 @@
   */
  #define       IP_OPTIONS      1               /* set/get IP per-packet options */
@@ -1182,8 +1234,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
  #ifdef KERNEL
  extern        struct domain inetdomain;
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/netinet/ip.h libx_c/netinet/ip.h
---- libx_c.pre/netinet/ip.h    2017-01-20 15:07:14.059375297 +1100
-+++ libx_c/netinet/ip.h        2017-01-20 15:07:14.071375330 +1100
+--- libx_c.pre/netinet/ip.h    2017-01-22 19:31:08.962329268 +1100
++++ libx_c/netinet/ip.h        2017-01-22 18:45:57.000000000 +1100
 @@ -81,7 +81,7 @@
                        struct in_addr ipt_addr;
                        n_long ipt_time;
@@ -1194,8 +1246,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
  
  /* flag bits for ipt_flg */
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/netinet/tcp.h libx_c/netinet/tcp.h
---- libx_c.pre/netinet/tcp.h   2017-01-20 15:07:14.059375297 +1100
-+++ libx_c/netinet/tcp.h       2017-01-20 15:07:14.075375340 +1100
+--- libx_c.pre/netinet/tcp.h   2017-01-22 19:31:08.962329268 +1100
++++ libx_c/netinet/tcp.h       2017-01-22 18:45:57.000000000 +1100
 @@ -44,7 +44,9 @@
  #ifdef        lint
  #define       TCP_MSS 536
@@ -1208,8 +1260,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
  
  /*
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/netns/ns.h libx_c/netns/ns.h
---- libx_c.pre/netns/ns.h      2017-01-20 15:07:14.063375308 +1100
-+++ libx_c/netns/ns.h  2017-01-20 15:07:14.075375340 +1100
+--- libx_c.pre/netns/ns.h      2017-01-22 19:31:08.962329268 +1100
++++ libx_c/netns/ns.h  2017-01-22 18:45:57.000000000 +1100
 @@ -103,20 +103,21 @@
  #define ns_nullhost(x) (((x).x_host.s_host[0]==0) && \
        ((x).x_host.s_host[1]==0) && ((x).x_host.s_host[2]==0))
@@ -1243,7 +1295,7 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
  #ifdef KERNEL
  extern struct domain nsdomain;
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/nlist.h libx_c/nlist.h
---- libx_c.pre/nlist.h 2017-01-20 15:07:14.059375297 +1100
+--- libx_c.pre/nlist.h 2017-01-22 19:31:08.954329226 +1100
 +++ libx_c/nlist.h     1970-01-01 10:00:00.000000000 +1000
 @@ -1,46 +0,0 @@
 -/*
@@ -1293,9 +1345,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 - */
 -#define       N_FORMAT        "%08x"
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/ns/ns_addr.c libx_c/ns/ns_addr.c
---- libx_c.pre/ns/ns_addr.c    2017-01-20 15:07:14.059375297 +1100
-+++ libx_c/ns/ns_addr.c        2017-01-20 15:07:14.075375340 +1100
-@@ -54,7 +54,7 @@
+--- libx_c.pre/ns/ns_addr.c    2017-01-22 19:31:08.954329226 +1100
++++ libx_c/ns/ns_addr.c        2017-01-22 18:45:57.000000000 +1100
+@@ -55,7 +55,7 @@
        socketname = index(hostname, separator);
        if (socketname) {
                *socketname++ = 0;
@@ -1304,7 +1356,7 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
        }
  
        Field(hostname, addr.x_host.c_host, 6);
-@@ -62,7 +62,7 @@
+@@ -63,7 +63,7 @@
        return (addr);
  }
  
@@ -1314,9 +1366,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
  char *buf;
  u_char *out;
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/stdio/doprnt.c libx_c/stdio/doprnt.c
---- libx_c.pre/stdio/doprnt.c  2017-01-20 15:07:14.059375297 +1100
-+++ libx_c/stdio/doprnt.c      2017-01-20 15:07:14.075375340 +1100
-@@ -271,9 +271,10 @@
+--- libx_c.pre/stdio/doprnt.c  2017-01-22 19:31:08.958329247 +1100
++++ libx_c/stdio/doprnt.c      2017-01-22 18:45:57.000000000 +1100
+@@ -272,9 +272,10 @@
                                 * NUL in the first `prec' characters, and
                                 * strlen() will go further.
                                 */
@@ -1330,10 +1382,10 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
                                        if (size > prec)
                                                size = prec;
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/stdio/doscan.c libx_c/stdio/doscan.c
---- libx_c.pre/stdio/doscan.c  2017-01-20 15:07:14.059375297 +1100
-+++ libx_c/stdio/doscan.c      2017-01-20 15:07:14.075375340 +1100
+--- libx_c.pre/stdio/doscan.c  2017-01-22 19:31:08.958329247 +1100
++++ libx_c/stdio/doscan.c      2017-01-22 18:52:36.000000000 +1100
 @@ -3,7 +3,8 @@
- #endif
+ #endif LIBC_SCCS and not lint
  
  #include <stdio.h>
 -#include      <ctype.h>
@@ -1342,12 +1394,13 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
  
  #define       SPC     01
  #define       STP     02
-@@ -30,10 +31,10 @@
+@@ -30,11 +31,11 @@
  _doscan(iop, fmt, argp)
  FILE *iop;
  register char *fmt;
--register int **argp; {
-+register va_list argp; {
+-register int **argp;
++register va_list argp;
+ {
        register int ch;
        int nmatch, len, ch1;
 -      int **ptr, fileended, size;
@@ -1355,7 +1408,7 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
  
        nmatch = 0;
        fileended = 0;
-@@ -45,7 +46,7 @@
+@@ -46,7 +47,7 @@
                        goto def;
                ptr = 0;
                if (ch != '*')
@@ -1364,16 +1417,16 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
                else
                        ch = *fmt++;
                len = 0;
-@@ -99,7 +100,7 @@
+@@ -100,7 +101,7 @@
  
  static
  _innum(ptr, type, len, size, iop, eofptr)
 -int **ptr, *eofptr;
 +int *ptr, *eofptr;
- FILE *iop; {
+ FILE *iop;
+ {
        extern double atof();
-       register char *np;
-@@ -109,7 +110,7 @@
+@@ -111,7 +112,7 @@
        long lcval;
  
        if (type=='c' || type=='s' || type=='[')
@@ -1382,7 +1435,7 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
        lcval = 0;
        ndigit = 0;
        scale = INT;
-@@ -183,23 +184,23 @@
+@@ -185,23 +186,23 @@
  
        case (FLOAT<<4) | SHORT:
        case (FLOAT<<4) | REGULAR:
@@ -1412,8 +1465,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
        }
        return(1);
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/stdio/findiop.c libx_c/stdio/findiop.c
---- libx_c.pre/stdio/findiop.c 2017-01-20 15:07:14.059375297 +1100
-+++ libx_c/stdio/findiop.c     2017-01-20 15:07:14.075375340 +1100
+--- libx_c.pre/stdio/findiop.c 2017-01-22 19:31:08.958329247 +1100
++++ libx_c/stdio/findiop.c     2017-01-22 18:53:10.000000000 +1100
 @@ -23,7 +23,7 @@
        { 0, NULL, NULL, 0, _IOWRT|_IONBF,      2 },    /* stderr */
  };
@@ -1423,7 +1476,7 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
  
  static        char sbuf[NSTATIC];
  char  *_smallbuf = sbuf;
-@@ -85,10 +85,11 @@
+@@ -87,10 +87,11 @@
        for (fp = _iob, iov = iobglue; fp < &_iob[NSTATIC]; /* void */)
                *iov++ = fp++;
  
@@ -1433,29 +1486,29 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
  }
  
 +void
- f_prealloc() {
+ f_prealloc()
+ {
        register FILE **iov;
-       register FILE *fp;
-@@ -101,6 +102,7 @@
+@@ -104,6 +105,7 @@
                        *iov = (FILE *)calloc(1, sizeof **iov);
  }
  
 +void
  _fwalk(function)
-       register int (*function)(); {
-       register FILE **iov;
-@@ -117,6 +119,7 @@
+       register int (*function)();
+ {
+@@ -121,6 +123,7 @@
        }
  }
  
 +void
- _cleanup() {
+ _cleanup()
+ {
        extern int fclose();
- 
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/stdio/fprintf.c libx_c/stdio/fprintf.c
---- libx_c.pre/stdio/fprintf.c 2017-01-20 15:07:14.059375297 +1100
-+++ libx_c/stdio/fprintf.c     2017-01-20 15:07:14.075375340 +1100
-@@ -1,31 +1,48 @@
+--- libx_c.pre/stdio/fprintf.c 2017-01-22 19:31:08.958329247 +1100
++++ libx_c/stdio/fprintf.c     2017-01-22 18:53:19.000000000 +1100
+@@ -1,32 +1,49 @@
  /*
   * Copyright (c) 1980 Regents of the University of California.
 - * All rights reserved.  The Berkeley software License Agreement
@@ -1478,7 +1531,7 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
  #if defined(LIBC_SCCS) && !defined(lint)
 -static char sccsid[] = "@(#)fprintf.c 5.2 (Berkeley) 3/9/86";
 +static char sccsid[] = "@(#)fprintf.c 5.4 (Berkeley) 6/27/88";
- #endif
+ #endif LIBC_SCCS and not lint
  
 -#include      <stdio.h>
 +#include <stdio.h>
@@ -1486,11 +1539,12 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
  
 -fprintf(iop, fmt, args)
 -register FILE *iop;
--char *fmt; {
+-char *fmt;
 +fprintf(iop, fmt, va_alist)
 +      register FILE *iop;
 +      char *fmt;
-+      va_dcl {
++      va_dcl
+ {
 +      va_list argp;
 +      int len;
        char localbuf[BUFSIZ];
@@ -1515,9 +1569,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 +      return(ferror(iop) ? EOF : len);
  }
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/stdio/fread.c libx_c/stdio/fread.c
---- libx_c.pre/stdio/fread.c   2017-01-20 15:07:14.059375297 +1100
-+++ libx_c/stdio/fread.c       2017-01-20 15:07:14.075375340 +1100
-@@ -10,10 +10,11 @@
+--- libx_c.pre/stdio/fread.c   2017-01-22 19:31:08.958329247 +1100
++++ libx_c/stdio/fread.c       2017-01-22 18:52:42.000000000 +1100
+@@ -10,11 +10,12 @@
  
  #include      <stdio.h>
  
@@ -1526,21 +1580,22 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 +fread(_ptr, size, count, iop)
 +      void *_ptr;
        unsigned size, count;
-       register FILE *iop; {
+       register FILE *iop;
+ {
 +#define ptr (*(char **)&_ptr)
        register int s;
        int c;
  
-@@ -42,4 +43,5 @@
+@@ -43,4 +44,5 @@
                }
        }
        return (size != 0 ? count - ((s + size - 1) / size) : 0);
 +#undef ptr
  }
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/stdio/fwrite.c libx_c/stdio/fwrite.c
---- libx_c.pre/stdio/fwrite.c  2017-01-20 15:07:14.059375297 +1100
-+++ libx_c/stdio/fwrite.c      2017-01-20 15:07:14.075375340 +1100
-@@ -10,10 +10,11 @@
+--- libx_c.pre/stdio/fwrite.c  2017-01-22 19:31:08.958329247 +1100
++++ libx_c/stdio/fwrite.c      2017-01-22 18:51:55.000000000 +1100
+@@ -10,11 +10,12 @@
  
  #include      <stdio.h>
  
@@ -1549,12 +1604,13 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 +fwrite(_ptr, size, count, iop)
 +      void *_ptr;
        unsigned size, count;
-       register FILE *iop; {
+       register FILE *iop;
+ {
 +#define ptr (*(char **)&_ptr)
        register int s;
  
        s = size * count;
-@@ -45,4 +46,5 @@
+@@ -46,4 +47,5 @@
                }
        }
        return (size != 0 ? count - ((s + size - 1) / size) : 0);
@@ -1562,7 +1618,7 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
  }
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/stdio/popen.c libx_c/stdio/popen.c
 --- libx_c.pre/stdio/popen.c   1970-01-01 10:00:00.000000000 +1000
-+++ libx_c/stdio/popen.c       2017-01-20 15:07:14.075375340 +1100
++++ libx_c/stdio/popen.c       2017-01-22 18:45:57.000000000 +1100
 @@ -0,0 +1,77 @@
 +/*
 + * Copyright (c) 1980 Regents of the University of California.
@@ -1642,9 +1698,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 +      return (pid == -1 ? -1 : status);
 +}
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/stdio/printf.c libx_c/stdio/printf.c
---- libx_c.pre/stdio/printf.c  2017-01-20 15:07:14.059375297 +1100
-+++ libx_c/stdio/printf.c      2017-01-20 15:07:14.075375340 +1100
-@@ -1,11 +1,35 @@
+--- libx_c.pre/stdio/printf.c  2017-01-22 19:31:08.958329247 +1100
++++ libx_c/stdio/printf.c      2017-01-22 18:52:03.000000000 +1100
+@@ -1,12 +1,36 @@
 +/*
 + * Copyright (c) 1987 Regents of the University of California.
 + * All rights reserved.
@@ -1665,44 +1721,45 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
  #if defined(LIBC_SCCS) && !defined(lint)
 -static char sccsid[] = "@(#)printf.c  5.2 (Berkeley) 3/9/86";
 +static char sccsid[] = "@(#)printf.c  5.4 (Berkeley) 6/27/88";
- #endif
+ #endif LIBC_SCCS and not lint
  
 -#include      <stdio.h>
 +#include <stdio.h>
 +#include <varargs.h>
-+
-+printf(fmt, va_alist)
-+      char *fmt;
-+      va_dcl {
-+      va_list argp;
-+      int len;
  
 -printf(fmt, args)
--char *fmt; {
+-char *fmt;
++printf(fmt, va_alist)
++      char *fmt;
++      va_dcl
+ {
 -      _doprnt(fmt, &args, stdout);
 -      return(ferror(stdout)? EOF: 0);
++      va_list argp;
++      int len;
++
 +      va_start(argp);
 +      len = _doprnt(fmt, argp, stdout);
 +      va_end(argp);
 +      return(ferror(stdout) ? EOF : len);
  }
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/stdio/scanf.c libx_c/stdio/scanf.c
---- libx_c.pre/stdio/scanf.c   2017-01-20 15:07:14.059375297 +1100
-+++ libx_c/stdio/scanf.c       2017-01-20 15:07:14.075375340 +1100
-@@ -2,29 +2,50 @@
+--- libx_c.pre/stdio/scanf.c   2017-01-22 19:31:08.958329247 +1100
++++ libx_c/stdio/scanf.c       2017-01-22 18:51:44.000000000 +1100
+@@ -2,32 +2,53 @@
  static char sccsid[] = "@(#)scanf.c   5.2 (Berkeley) 3/9/86";
- #endif
+ #endif LIBC_SCCS and not lint
  
 -#include      <stdio.h>
 +#include <stdio.h>
 +#include <varargs.h>
  
 -scanf(fmt, args)
--char *fmt; {
--      return(_doscan(stdin, fmt, &args));
 +scanf(fmt, va_alist)
-+char *fmt;
-+va_dcl {
+ char *fmt;
++va_dcl
+ {
+-      return(_doscan(stdin, fmt, &args));
 +      va_list argp;
 +      int len;
 +
@@ -1715,10 +1772,10 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 -fscanf(iop, fmt, args)
 +fscanf(iop, fmt, va_alist)
  FILE *iop;
--char *fmt; {
+ char *fmt;
++va_dcl
+ {
 -      return(_doscan(iop, fmt, &args));
-+char *fmt;
-+va_dcl {
 +      va_list argp;
 +      int len;
 +
@@ -1731,9 +1788,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 -sscanf(str, fmt, args)
 +sscanf(str, fmt, va_alist)
  register char *str;
--char *fmt; {
-+char *fmt;
-+va_dcl {
+ char *fmt;
++va_dcl
+ {
        FILE _strbuf;
 +      va_list argp;
 +      int len;
@@ -1751,11 +1808,11 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 +      return len;
  }
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/stdio/setbuffer.c libx_c/stdio/setbuffer.c
---- libx_c.pre/stdio/setbuffer.c       2017-01-20 15:07:14.059375297 +1100
-+++ libx_c/stdio/setbuffer.c   2017-01-20 15:07:14.075375340 +1100
-@@ -33,11 +33,11 @@
- setlinebuf(iop)
-       register FILE *iop; {
+--- libx_c.pre/stdio/setbuffer.c       2017-01-22 19:31:08.958329247 +1100
++++ libx_c/stdio/setbuffer.c   2017-01-22 18:45:57.000000000 +1100
+@@ -35,11 +35,11 @@
+       register FILE *iop;
+ {
        char *buf;
 -      extern char *malloc();
 +      extern void *malloc();
@@ -1768,9 +1825,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
                setbuffer(iop, buf, BUFSIZ);
                iop->_flag |= _IOLBF|_IOMYBUF;
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/stdio/sprintf.c libx_c/stdio/sprintf.c
---- libx_c.pre/stdio/sprintf.c 2017-01-20 15:07:14.059375297 +1100
-+++ libx_c/stdio/sprintf.c     2017-01-20 15:07:14.075375340 +1100
-@@ -1,17 +1,40 @@
+--- libx_c.pre/stdio/sprintf.c 2017-01-22 19:31:08.958329247 +1100
++++ libx_c/stdio/sprintf.c     2017-01-22 18:53:27.000000000 +1100
+@@ -1,18 +1,41 @@
 +/*
 + * Copyright (c) 1987 Regents of the University of California.
 + * All rights reserved.
@@ -1791,17 +1848,18 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
  #if defined(LIBC_SCCS) && !defined(lint)
 -static char sccsid[] = "@(#)sprintf.c 5.2 (Berkeley) 3/9/86";
 +static char sccsid[] = "@(#)sprintf.c 5.5 (Berkeley) 6/27/88";
- #endif
+ #endif LIBC_SCCS and not lint
  
 -#include      <stdio.h>
 +#include <stdio.h>
 +#include <varargs.h>
  
 -char *sprintf(str, fmt, args)
--char *str, *fmt; {
+-char *str, *fmt;
 +sprintf(str, fmt, va_alist)
 +      char *str, *fmt;
-+      va_dcl {
++      va_dcl
+ {
 +      va_list argp;
        FILE _strbuf;
 +      int len;
@@ -1820,7 +1878,7 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
  }
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/stdio/vfprintf.c libx_c/stdio/vfprintf.c
 --- libx_c.pre/stdio/vfprintf.c        1970-01-01 10:00:00.000000000 +1000
-+++ libx_c/stdio/vfprintf.c    2017-01-20 15:07:14.075375340 +1100
++++ libx_c/stdio/vfprintf.c    2017-01-22 18:45:57.000000000 +1100
 @@ -0,0 +1,46 @@
 +/*
 + * Copyright (c) 1988 Regents of the University of California.
@@ -1870,7 +1928,7 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 +}
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/stdio/vprintf.c libx_c/stdio/vprintf.c
 --- libx_c.pre/stdio/vprintf.c 1970-01-01 10:00:00.000000000 +1000
-+++ libx_c/stdio/vprintf.c     2017-01-20 15:07:14.075375340 +1100
++++ libx_c/stdio/vprintf.c     2017-01-22 18:45:57.000000000 +1100
 @@ -0,0 +1,33 @@
 +/*
 + * Copyright (c) 1988 Regents of the University of California.
@@ -1907,7 +1965,7 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 +}
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/stdio/vsprintf.c libx_c/stdio/vsprintf.c
 --- libx_c.pre/stdio/vsprintf.c        1970-01-01 10:00:00.000000000 +1000
-+++ libx_c/stdio/vsprintf.c    2017-01-20 15:07:14.075375340 +1100
++++ libx_c/stdio/vsprintf.c    2017-01-22 18:45:57.000000000 +1100
 @@ -0,0 +1,38 @@
 +/*
 + * Copyright (c) 1988 Regents of the University of California.
@@ -1948,8 +2006,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 +      return (len);
 +}
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/stdio.h libx_c/stdio.h
---- libx_c.pre/stdio.h 2017-01-20 15:07:14.059375297 +1100
-+++ libx_c/stdio.h     2017-01-20 15:07:14.075375340 +1100
+--- libx_c.pre/stdio.h 2017-01-22 19:31:08.954329226 +1100
++++ libx_c/stdio.h     2017-01-22 18:45:57.000000000 +1100
 @@ -59,7 +59,7 @@
  long  ftell();
  char  *fgets();
@@ -1960,8 +2018,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
  #endif
  # endif
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/sys/dir.h libx_c/sys/dir.h
---- libx_c.pre/sys/dir.h       2017-01-20 15:07:14.063375308 +1100
-+++ libx_c/sys/dir.h   2017-01-20 15:07:14.075375340 +1100
+--- libx_c.pre/sys/dir.h       2017-01-22 19:31:08.962329268 +1100
++++ libx_c/sys/dir.h   2017-01-22 18:45:57.000000000 +1100
 @@ -32,9 +32,9 @@
   * dp->d_ino set to 0.
   */
@@ -1976,8 +2034,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
  #define       MAXNAMLEN       255
  
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/sys/errno.h libx_c/sys/errno.h
---- libx_c.pre/sys/errno.h     2017-01-20 15:07:14.063375308 +1100
-+++ libx_c/sys/errno.h 2017-01-20 15:07:14.075375340 +1100
+--- libx_c.pre/sys/errno.h     2017-01-22 19:31:08.962329268 +1100
++++ libx_c/sys/errno.h 2017-01-22 18:45:57.000000000 +1100
 @@ -96,3 +96,7 @@
  #define       EPROCLIM        67              /* Too many processes */
  #define       EUSERS          68              /* Too many users */
@@ -1987,8 +2045,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 +extern int errno;
 +#endif
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/sys/execl.c libx_c/sys/execl.c
---- libx_c.pre/sys/execl.c     2017-01-20 15:07:14.063375308 +1100
-+++ libx_c/sys/execl.c 2017-01-20 15:07:14.075375340 +1100
+--- libx_c.pre/sys/execl.c     2017-01-22 19:31:08.958329247 +1100
++++ libx_c/sys/execl.c 2017-01-22 18:45:57.000000000 +1100
 @@ -1,4 +1,5 @@
 -void execl(f, a) char *f, *a; {
 +#include <varargs.h>
@@ -1997,8 +2055,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
        abort();
  }
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/sys/execle.c libx_c/sys/execle.c
---- libx_c.pre/sys/execle.c    2017-01-20 15:07:14.063375308 +1100
-+++ libx_c/sys/execle.c        2017-01-20 15:07:14.075375340 +1100
+--- libx_c.pre/sys/execle.c    2017-01-22 19:31:08.958329247 +1100
++++ libx_c/sys/execle.c        2017-01-22 18:45:57.000000000 +1100
 @@ -1,4 +1,5 @@
 -void execle(f, a) char *f, *a; {
 +#include <varargs.h>
@@ -2008,7 +2066,7 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
  }
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/sys/isatty.c libx_c/sys/isatty.c
 --- libx_c.pre/sys/isatty.c    1970-01-01 10:00:00.000000000 +1000
-+++ libx_c/sys/isatty.c        2017-01-20 15:07:14.075375340 +1100
++++ libx_c/sys/isatty.c        2017-01-22 18:45:57.000000000 +1100
 @@ -0,0 +1,17 @@
 +#if defined(LIBC_SCCS) && !defined(lint)
 +static char sccsid[] = "@(#)isatty.c  5.2 (Berkeley) 3/9/86";
@@ -2028,8 +2086,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 +      return(1);
 +}
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/sys/open.c libx_c/sys/open.c
---- libx_c.pre/sys/open.c      2017-01-20 15:07:14.063375308 +1100
-+++ libx_c/sys/open.c  2017-01-20 15:07:14.075375340 +1100
+--- libx_c.pre/sys/open.c      2017-01-22 19:31:08.958329247 +1100
++++ libx_c/sys/open.c  2017-01-22 18:45:57.000000000 +1100
 @@ -1,4 +1,9 @@
  int open(f, m, va_alist) char *f; va_dcl {
 -      write(2, "open()\n", 7);
@@ -2043,8 +2101,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 +      return res;
  }
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/sys/param.h libx_c/sys/param.h
---- libx_c.pre/sys/param.h     2017-01-20 15:07:14.063375308 +1100
-+++ libx_c/sys/param.h 2017-01-20 15:07:14.075375340 +1100
+--- libx_c.pre/sys/param.h     2017-01-22 19:31:08.962329268 +1100
++++ libx_c/sys/param.h 2017-01-22 18:45:57.000000000 +1100
 @@ -53,15 +53,16 @@
  /*
   * Signals
@@ -2091,8 +2149,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 +/* moved this from sys/types.h */
 +#define       NBBY    8               /* number of bits in a byte */
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/sys/proc.h libx_c/sys/proc.h
---- libx_c.pre/sys/proc.h      2017-01-20 15:07:14.063375308 +1100
-+++ libx_c/sys/proc.h  2017-01-20 15:07:14.075375340 +1100
+--- libx_c.pre/sys/proc.h      2017-01-22 19:31:08.958329247 +1100
++++ libx_c/sys/proc.h  2017-01-22 18:45:57.000000000 +1100
 @@ -117,3 +117,8 @@
  #define       SSEL    0x0400000       /* selecting; wakeup/waiting danger */
  #define       SLOGIN  0x0800000       /* a login process (legit child of init) */
@@ -2104,7 +2162,7 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 +       ((p)->p_sig &~ ((p)->p_sigignore | (p)->p_sigmask))) && issig())
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/sys/select.h libx_c/sys/select.h
 --- libx_c.pre/sys/select.h    1970-01-01 10:00:00.000000000 +1000
-+++ libx_c/sys/select.h        2017-01-20 15:07:14.075375340 +1100
++++ libx_c/sys/select.h        2017-01-22 18:45:57.000000000 +1100
 @@ -0,0 +1,28 @@
 +#include <sys/param.h>
 +
@@ -2135,8 +2193,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 +#define       FD_ISSET(n, p)  ((p)->fds_bits[(n)/NFDBITS] & (1 << ((n) % NFDBITS)))
 +#define FD_ZERO(p)    bzero((char *)(p), sizeof(*(p)))
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/sys/signal.h libx_c/sys/signal.h
---- libx_c.pre/sys/signal.h    2017-01-20 15:07:14.063375308 +1100
-+++ libx_c/sys/signal.h        2017-01-20 15:07:14.075375340 +1100
+--- libx_c.pre/sys/signal.h    2017-01-22 19:31:08.962329268 +1100
++++ libx_c/sys/signal.h        2017-01-22 18:45:57.000000000 +1100
 @@ -57,14 +57,14 @@
  #define SIGUSR2 31    /* user defined signal 2 */
  
@@ -2174,8 +2232,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
  #endif
  
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/sys/tty.h libx_c/sys/tty.h
---- libx_c.pre/sys/tty.h       2017-01-20 15:07:14.063375308 +1100
-+++ libx_c/sys/tty.h   2017-01-20 15:07:14.075375340 +1100
+--- libx_c.pre/sys/tty.h       2017-01-22 19:31:08.958329247 +1100
++++ libx_c/sys/tty.h   2017-01-22 18:45:57.000000000 +1100
 @@ -70,20 +70,22 @@
        struct  ttychars t_chars;       /* tty */
        struct  winsize t_winsize;      /* window size */
@@ -2214,8 +2272,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
  
  #define       TTIPRI  28
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/sys/types.h libx_c/sys/types.h
---- libx_c.pre/sys/types.h     2017-01-20 15:07:14.063375308 +1100
-+++ libx_c/sys/types.h 2017-01-20 15:07:14.075375340 +1100
+--- libx_c.pre/sys/types.h     2017-01-22 19:31:08.962329268 +1100
++++ libx_c/sys/types.h 2017-01-22 18:45:57.000000000 +1100
 @@ -35,7 +35,7 @@
  #endif
  typedef       struct  _quad { long val[2]; } quad;
@@ -2276,14 +2334,14 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
  #endif
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/sys/vfork.c libx_c/sys/vfork.c
 --- libx_c.pre/sys/vfork.c     1970-01-01 10:00:00.000000000 +1000
-+++ libx_c/sys/vfork.c 2017-01-20 15:07:14.075375340 +1100
++++ libx_c/sys/vfork.c 2017-01-22 18:45:57.000000000 +1100
 @@ -0,0 +1,3 @@
 +int vfork() {
 +  abort();
 +}
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/sys/vmmac.h libx_c/sys/vmmac.h
---- libx_c.pre/sys/vmmac.h     2017-01-20 15:07:14.063375308 +1100
-+++ libx_c/sys/vmmac.h 2017-01-20 15:07:14.075375340 +1100
+--- libx_c.pre/sys/vmmac.h     2017-01-22 19:31:08.962329268 +1100
++++ libx_c/sys/vmmac.h 2017-01-22 18:45:57.000000000 +1100
 @@ -157,3 +157,10 @@
        } \
        c->c_lock = 0; \
@@ -2297,15 +2355,16 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 +      (*(int *)(pte) = (pfnum) | (prot), mtpr(TBIS, ptob(v)))
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/sys/vopen.c libx_c/sys/vopen.c
 --- libx_c.pre/sys/vopen.c     1970-01-01 10:00:00.000000000 +1000
-+++ libx_c/sys/vopen.c 2017-01-20 15:07:14.075375340 +1100
-@@ -0,0 +1,4 @@
++++ libx_c/sys/vopen.c 2017-01-22 19:11:32.000000000 +1100
+@@ -0,0 +1,5 @@
++#include <sys/file.h>
++#include <varargs.h>
 +int vopen(f, m, argp) char *f; va_list argp; {
-+      write(2, "vopen()\n", 8);
-+      abort();
++      return open(f, m, m & O_CREAT ? va_arg(argp, int) : 0);
 +}
 diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/vax/vmparam.h libx_c/vax/vmparam.h
---- libx_c.pre/vax/vmparam.h   2017-01-20 15:07:14.063375308 +1100
-+++ libx_c/vax/vmparam.h       2017-01-20 15:07:14.075375340 +1100
+--- libx_c.pre/vax/vmparam.h   2017-01-22 19:31:08.962329268 +1100
++++ libx_c/vax/vmparam.h       2017-01-22 18:45:57.000000000 +1100
 @@ -156,5 +156,6 @@
  /*
   * BEWARE THIS DEFINITION WORKS ONLY WITH COUNT OF 1

diff --git a/lib/libx_c/s.sh b/lib/libx_c/s.sh
index 5bfe5d8..5f740f9 100755 (executable)
--- a/lib/libx_c/s.sh
+++ b/lib/libx_c/s.sh
@@ -38,6 +38,13 @@ do
   for j in `cpp -nostdinc -I. -Dvax -DNCMD=1 -DNRSP=1 -M temp.c`
   do
     case $j in
+    stdarg.h)
+      # system header files are not supposed to define stdarg.h, even if
+      # (like vfprintf etc) they have va_list paramters, it silly and
+      # we ignore this restriction, but clients shouldn't rely on this
+      # (anyway, the above cpp command defines __STDC__ so we do not pick
+      # up any dependency on varargs.h, hence let's keep it symmetrical)
+      ;;
     *.h)
       echo "$i $j" >>a
       pattern="$pattern$prefix$j"

diff --git a/lib/libx_c/stdio/doprnt.c b/lib/libx_c/stdio/doprnt.c
index 8f30c29..77895ae 100644 (file)
--- a/lib/libx_c/stdio/doprnt.c
+++ b/lib/libx_c/stdio/doprnt.c
@@ -5,7 +5,7 @@
 #include <strings.h>
 /*#include <sys/types.h> stdio.h*/
 #ifdef __STDC__
-/*#include <stdarg.h> stdio.h*/
+#include <stdarg.h>
 #define _va_start(argp, arg) va_start(argp, arg)
 #else
 #include <varargs.h>

diff --git a/lib/libx_c/stdio/doscan.c b/lib/libx_c/stdio/doscan.c
index da4cc80..7a8f05d 100644 (file)
--- a/lib/libx_c/stdio/doscan.c
+++ b/lib/libx_c/stdio/doscan.c
@@ -2,7 +2,7 @@
 #include <math.h>
 #include <stdio.h>
 #ifdef __STDC__
-/*#include <stdarg.h> stdio.h*/
+#include <stdarg.h>
 #define _va_start(argp, arg) va_start(argp, arg)
 #else
 #include <varargs.h>

diff --git a/lib/libx_c/stdio/fprintf.c b/lib/libx_c/stdio/fprintf.c
index 48e29cf..76f69fa 100644 (file)
--- a/lib/libx_c/stdio/fprintf.c
+++ b/lib/libx_c/stdio/fprintf.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #ifdef __STDC__
-/*#include <stdarg.h> stdio.h*/
+#include <stdarg.h>
 #define _va_start(argp, arg) va_start(argp, arg)
 #else
 #include <varargs.h>

diff --git a/lib/libx_c/stdio/printf.c b/lib/libx_c/stdio/printf.c
index 34e3ae3..f2fdfd1 100644 (file)
--- a/lib/libx_c/stdio/printf.c
+++ b/lib/libx_c/stdio/printf.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #ifdef __STDC__
-/*#include <stdarg.h> stdio.h*/
+#include <stdarg.h>
 #define _va_start(argp, arg) va_start(argp, arg)
 #else
 #include <varargs.h>

diff --git a/lib/libx_c/stdio/scanf.c b/lib/libx_c/stdio/scanf.c
index 11587bf..d43cdf7 100644 (file)
--- a/lib/libx_c/stdio/scanf.c
+++ b/lib/libx_c/stdio/scanf.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #ifdef __STDC__
-/*#include <stdarg.h> stdio.h*/
+#include <stdarg.h>
 #define _va_start(argp, arg) va_start(argp, arg)
 #else
 #include <varargs.h>

diff --git a/lib/libx_c/stdio/sprintf.c b/lib/libx_c/stdio/sprintf.c
index 678a620..7403f05 100644 (file)
--- a/lib/libx_c/stdio/sprintf.c
+++ b/lib/libx_c/stdio/sprintf.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #ifdef __STDC__
-/*#include <stdarg.h> stdio.h*/
+#include <stdarg.h>
 #define _va_start(argp, arg) va_start(argp, arg)
 #else
 #include <varargs.h>

diff --git a/lib/libx_c/stdio/vfprintf.c b/lib/libx_c/stdio/vfprintf.c
index 219315d..300a166 100644 (file)
--- a/lib/libx_c/stdio/vfprintf.c
+++ b/lib/libx_c/stdio/vfprintf.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #ifdef __STDC__
-/*#include <stdarg.h> stdio.h*/
+#include <stdarg.h>
 #define _va_start(argp, arg) va_start(argp, arg)
 #else
 #include <varargs.h>

diff --git a/lib/libx_c/stdio/vprintf.c b/lib/libx_c/stdio/vprintf.c
index 82244e9..2c72c95 100644 (file)
--- a/lib/libx_c/stdio/vprintf.c
+++ b/lib/libx_c/stdio/vprintf.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #ifdef __STDC__
-/*#include <stdarg.h> stdio.h*/
+#include <stdarg.h>
 #define _va_start(argp, arg) va_start(argp, arg)
 #else
 #include <varargs.h>

diff --git a/lib/libx_c/stdio/vsprintf.c b/lib/libx_c/stdio/vsprintf.c
index 94789ae..1b8f648 100644 (file)
--- a/lib/libx_c/stdio/vsprintf.c
+++ b/lib/libx_c/stdio/vsprintf.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #ifdef __STDC__
-/*#include <stdarg.h> stdio.h*/
+#include <stdarg.h>
 #define _va_start(argp, arg) va_start(argp, arg)
 #else
 #include <varargs.h>

diff --git a/lib/libx_c/sys/execl.c b/lib/libx_c/sys/execl.c
index 5181465..5e6bbb2 100644 (file)
--- a/lib/libx_c/sys/execl.c
+++ b/lib/libx_c/sys/execl.c
@@ -2,7 +2,7 @@
 /*#include <sys/exec.h> gen.h*/
 #include <sys/file.h>
 #ifdef __STDC__
-/*#include <stdarg.h> sys/file.h*/
+#include <stdarg.h>
 #define _va_start(argp, arg) va_start(argp, arg)
 #else
 #include <varargs.h>

diff --git a/lib/libx_c/sys/execle.c b/lib/libx_c/sys/execle.c
index c8f7fcb..b883a6e 100644 (file)
--- a/lib/libx_c/sys/execle.c
+++ b/lib/libx_c/sys/execle.c
@@ -2,7 +2,7 @@
 /*#include <sys/exec.h> gen.h*/
 #include <sys/file.h>
 #ifdef __STDC__
-/*#include <stdarg.h> sys/file.h*/
+#include <stdarg.h>
 #define _va_start(argp, arg) va_start(argp, arg)
 #else
 #include <varargs.h>

diff --git a/lib/libx_c/sys/open.c b/lib/libx_c/sys/open.c
index 9a018a9..eacfece 100644 (file)
--- a/lib/libx_c/sys/open.c
+++ b/lib/libx_c/sys/open.c
@@ -1,6 +1,6 @@
 #include <sys/file.h>
 #ifdef __STDC__
-/*#include <stdarg.h> sys/file.h*/
+#include <stdarg.h>
 #define _va_start(argp, arg) va_start(argp, arg)
 #else
 #include <varargs.h>

diff --git a/lib/libx_c/sys/syslog.h b/lib/libx_c/sys/syslog.h
index 6454a3d..0022051 100644 (file)
--- a/lib/libx_c/sys/syslog.h
+++ b/lib/libx_c/sys/syslog.h
@@ -76,7 +76,7 @@
 #endif
 
 /* gen/syslog.c */
-void syslog __P((int pri, char *fmt, int p0, int p1, int p2, int p3, int p4));
+void syslog __P((int pri, char *fmt, ...));
 void openlog __P((char *ident, int logstat, int logfac));
 void closelog __P((void));
 int setlogmask __P((int pmask));

diff --git a/lib/libx_c/sys/vopen.c b/lib/libx_c/sys/vopen.c
index 5fb3dcc..63b8855 100644 (file)
--- a/lib/libx_c/sys/vopen.c
+++ b/lib/libx_c/sys/vopen.c
@@ -1,15 +1,14 @@
-#include <gen.h>
 #include <sys/file.h>
 #ifdef __STDC__
-/*#include <stdarg.h> sys/file.h*/
+#include <stdarg.h>
 #define _va_start(argp, arg) va_start(argp, arg)
 #else
 #include <varargs.h>
 #define _va_start(argp, arg) va_start(argp)
 #endif
 
+/*#include <sys/file.h>*/
 /*#include <varargs.h>*/
 int vopen(f, m, argp) char *f; int m; va_list argp; {
-       write(2, "vopen()\n", 8);
-       abort();
+       return open(f, m, m & O_CREAT ? va_arg(argp, int) : 0);
 }

diff --git a/lib/libx_c/unxify.sh b/lib/libx_c/unxify.sh
index b0cb34d..f492eb4 100755 (executable)
--- a/lib/libx_c/unxify.sh
+++ b/lib/libx_c/unxify.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+rm -rf .xify
 rm -rf ns/.xify
 rm -rf stdio/.xify
 rm -rf compat-4.1/.xify