From 186824f223044407814ed20ba4cf7ed024737c44 Mon Sep 17 00:00:00 2001 From: Nick Downing Date: Fri, 20 Jan 2017 12:13:41 +1100 Subject: [PATCH] Update post.patch, some more char *->void * adjustments --- lib/libx_c/linux/sys/sbrk.c | 4 +- lib/libx_c/post.patch | 317 ++++++++++++++-------- lib/libx_c/pre.patch | 521 ++++++++++++++++++------------------ lib/libx_c/sys/brk.c | 2 +- lib/libx_c/sys/proc.h | 4 +- lib/libx_c/sys/sbrk.c | 2 +- 6 files changed, 467 insertions(+), 383 deletions(-) diff --git a/lib/libx_c/linux/sys/sbrk.c b/lib/libx_c/linux/sys/sbrk.c index 0441c40..72146e9 100644 --- a/lib/libx_c/linux/sys/sbrk.c +++ b/lib/libx_c/linux/sys/sbrk.c @@ -4,8 +4,8 @@ #include #include -char *sbrk(i) int i; { - char *res; +void *sbrk(i) int i; { + void *res; res = nox_sbrk(i); if ((intptr_t)res == -1) diff --git a/lib/libx_c/post.patch b/lib/libx_c/post.patch index 21cb959..2bc1773 100644 --- a/lib/libx_c/post.patch +++ b/lib/libx_c/post.patch @@ -1,6 +1,6 @@ -diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/compat-4.1/Makefile libx_c/compat-4.1/Makefile ---- libx_c.post/compat-4.1/Makefile 2017-01-19 23:46:52.602849745 +1100 -+++ libx_c/compat-4.1/Makefile 2017-01-19 23:46:52.638849974 +1100 +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/compat-4.1/Makefile libx_c/compat-4.1/Makefile +--- libx_c.post/compat-4.1/Makefile 2017-01-20 12:09:42.936568593 +1100 ++++ libx_c/compat-4.1/Makefile 2017-01-20 12:09:42.972567617 +1100 @@ -1,3 +1,5 @@ +ROOT=../../.. +CC=gcc -g -I${ROOT}/cross/include -Dx_vax -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result @@ -51,9 +51,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' # DO NOT DELETE THIS LINE -- make depend uses it - -diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/compat-sys5/Makefile libx_c/compat-sys5/Makefile ---- libx_c.post/compat-sys5/Makefile 2017-01-19 23:46:52.626849898 +1100 -+++ libx_c/compat-sys5/Makefile 2017-01-19 23:46:52.638849974 +1100 +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/compat-sys5/Makefile libx_c/compat-sys5/Makefile +--- libx_c.post/compat-sys5/Makefile 2017-01-20 12:09:42.960567942 +1100 ++++ libx_c/compat-sys5/Makefile 2017-01-20 12:09:42.972567617 +1100 @@ -1,3 +1,5 @@ +ROOT=../../.. +CC=gcc -g -I${ROOT}/cross/include -Dx_vax -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result @@ -122,9 +122,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' -# DEPENDENCIES MUST END AT END OF FILE -# IF YOU PUT STUFF HERE IT WILL GO AWAY -# see make depend above -diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/gen/bcopy.c libx_c/gen/bcopy.c ---- libx_c.post/gen/bcopy.c 2017-01-19 23:46:52.630849923 +1100 -+++ libx_c/gen/bcopy.c 2017-01-19 23:46:52.638849974 +1100 +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/gen/bcopy.c libx_c/gen/bcopy.c +--- libx_c.post/gen/bcopy.c 2017-01-20 12:09:42.964567834 +1100 ++++ libx_c/gen/bcopy.c 2017-01-20 12:09:42.972567617 +1100 @@ -1,6 +1,12 @@ #include #include @@ -158,9 +158,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' do /* copy by bytes */ *--dst = *--src; while (--length); -diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/gen/getpass.c libx_c/gen/getpass.c ---- libx_c.post/gen/getpass.c 2017-01-19 23:46:52.630849923 +1100 -+++ libx_c/gen/getpass.c 2017-01-19 23:46:52.638849974 +1100 +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/gen/getpass.c libx_c/gen/getpass.c +--- libx_c.post/gen/getpass.c 2017-01-20 12:09:42.964567834 +1100 ++++ libx_c/gen/getpass.c 2017-01-20 12:09:42.972567617 +1100 @@ -20,7 +20,7 @@ FILE *fi; static char pbuf[9]; @@ -170,9 +170,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=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/gen/getpwnamuid.c libx_c/gen/getpwnamuid.c ---- libx_c.post/gen/getpwnamuid.c 2017-01-19 23:46:52.630849923 +1100 -+++ libx_c/gen/getpwnamuid.c 2017-01-19 23:46:52.638849974 +1100 +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/gen/getpwnamuid.c libx_c/gen/getpwnamuid.c +--- libx_c.post/gen/getpwnamuid.c 2017-01-20 12:09:42.964567834 +1100 ++++ libx_c/gen/getpwnamuid.c 2017-01-20 12:09:42.972567617 +1100 @@ -44,19 +44,37 @@ cp = key.dptr; tp = line; @@ -211,9 +211,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' return (&passwd); } -diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/gen/Makefile libx_c/gen/Makefile ---- libx_c.post/gen/Makefile 2017-01-19 23:46:52.630849923 +1100 -+++ libx_c/gen/Makefile 2017-01-19 23:46:52.638849974 +1100 +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/gen/Makefile libx_c/gen/Makefile +--- libx_c.post/gen/Makefile 2017-01-20 12:09:42.964567834 +1100 ++++ libx_c/gen/Makefile 2017-01-20 12:09:42.972567617 +1100 @@ -1,3 +1,5 @@ +ROOT=../../.. +CC=gcc -g -I${ROOT}/cross/include -Dx_vax -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result @@ -445,9 +445,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' -# DEPENDENCIES MUST END AT END OF FILE -# IF YOU PUT STUFF HERE IT WILL GO AWAY -# see make depend above -diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/gen/malloc.c libx_c/gen/malloc.c ---- libx_c.post/gen/malloc.c 2017-01-19 23:46:52.630849923 +1100 -+++ libx_c/gen/malloc.c 2017-01-19 23:46:52.638849974 +1100 +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/gen/malloc.c libx_c/gen/malloc.c +--- libx_c.post/gen/malloc.c 2017-01-20 12:09:42.964567834 +1100 ++++ libx_c/gen/malloc.c 2017-01-20 12:09:42.972567617 +1100 @@ -4,6 +4,12 @@ #include #include @@ -507,9 +507,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' return; /* * Add new memory allocated to that on -diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/gen/ndbm.c libx_c/gen/ndbm.c ---- libx_c.post/gen/ndbm.c 2017-01-19 23:46:52.630849923 +1100 -+++ libx_c/gen/ndbm.c 2017-01-19 23:46:52.638849974 +1100 +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/gen/ndbm.c libx_c/gen/ndbm.c +--- libx_c.post/gen/ndbm.c 2017-01-20 12:09:42.964567834 +1100 ++++ libx_c/gen/ndbm.c 2017-01-20 12:09:42.972567617 +1100 @@ -70,14 +70,14 @@ flags = (flags & ~03) | O_RDWR; strcpy(db->dbm_pagbuf, file); @@ -527,9 +527,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' db->dbm_dirf = vopen(db->dbm_pagbuf, flags, argp); va_end(argp); if (db->dbm_dirf < 0) -diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/gen/qsort.c libx_c/gen/qsort.c ---- libx_c.post/gen/qsort.c 2017-01-19 23:46:52.630849923 +1100 -+++ libx_c/gen/qsort.c 2017-01-19 23:46:52.638849974 +1100 +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/gen/qsort.c libx_c/gen/qsort.c +--- libx_c.post/gen/qsort.c 2017-01-20 12:09:42.964567834 +1100 ++++ libx_c/gen/qsort.c 2017-01-20 12:09:42.972567617 +1100 @@ -36,7 +36,7 @@ static void qst __P((char *base, char *max)); @@ -539,9 +539,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' #define base ((char *)_base) register char c, *i, *j, *lo, *hi; char *min, *max; -diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/gen/scandir.c libx_c/gen/scandir.c ---- libx_c.post/gen/scandir.c 2017-01-19 23:46:52.630849923 +1100 -+++ libx_c/gen/scandir.c 2017-01-19 23:46:52.638849974 +1100 +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/gen/scandir.c libx_c/gen/scandir.c +--- libx_c.post/gen/scandir.c 2017-01-20 12:09:42.964567834 +1100 ++++ libx_c/gen/scandir.c 2017-01-20 12:09:42.972567617 +1100 @@ -24,7 +24,7 @@ /*#include */ /*#include */ @@ -560,9 +560,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' *namelist = names; return(nitems); } -diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/gen/signal.c libx_c/gen/signal.c ---- libx_c.post/gen/signal.c 2017-01-19 23:46:52.630849923 +1100 -+++ libx_c/gen/signal.c 2017-01-19 23:46:52.638849974 +1100 +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/gen/signal.c libx_c/gen/signal.c +--- libx_c.post/gen/signal.c 2017-01-20 12:09:42.964567834 +1100 ++++ libx_c/gen/signal.c 2017-01-20 12:09:42.972567617 +1100 @@ -15,12 +15,12 @@ */ /*#include */ @@ -585,9 +585,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' - return (osv.sv_handler); + return ((void (*) __P((int sig)))osv.sv_handler); } -diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/gen/sleep.c libx_c/gen/sleep.c ---- libx_c.post/gen/sleep.c 2017-01-19 23:46:52.630849923 +1100 -+++ libx_c/gen/sleep.c 2017-01-19 23:46:52.638849974 +1100 +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/gen/sleep.c libx_c/gen/sleep.c +--- libx_c.post/gen/sleep.c 2017-01-20 12:09:42.964567834 +1100 ++++ libx_c/gen/sleep.c 2017-01-20 12:09:42.972567617 +1100 @@ -15,7 +15,7 @@ /*#include */ @@ -597,9 +597,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' static int ringring; -diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/gen/system.c libx_c/gen/system.c ---- libx_c.post/gen/system.c 2017-01-19 23:46:52.630849923 +1100 -+++ libx_c/gen/system.c 2017-01-19 23:46:52.638849974 +1100 +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/gen/system.c libx_c/gen/system.c +--- libx_c.post/gen/system.c 2017-01-20 12:09:42.964567834 +1100 ++++ libx_c/gen/system.c 2017-01-20 12:09:42.972567617 +1100 @@ -11,7 +11,7 @@ int system(s) char *s; { @@ -609,9 +609,9 @@ 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=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/gen/usleep.c libx_c/gen/usleep.c ---- libx_c.post/gen/usleep.c 2017-01-19 23:46:52.630849923 +1100 -+++ libx_c/gen/usleep.c 2017-01-19 23:46:52.638849974 +1100 +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/gen/usleep.c libx_c/gen/usleep.c +--- libx_c.post/gen/usleep.c 2017-01-20 12:09:42.964567834 +1100 ++++ libx_c/gen/usleep.c 2017-01-20 12:09:42.972567617 +1100 @@ -18,7 +18,7 @@ #define TICK 10000 /* system clock resolution in microseconds */ @@ -621,9 +621,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' static int ringring; -diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/gen/valloc.c libx_c/gen/valloc.c ---- libx_c.post/gen/valloc.c 2017-01-19 23:46:52.630849923 +1100 -+++ libx_c/gen/valloc.c 2017-01-19 23:46:52.638849974 +1100 +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/gen/valloc.c libx_c/gen/valloc.c +--- libx_c.post/gen/valloc.c 2017-01-20 12:09:42.964567834 +1100 ++++ libx_c/gen/valloc.c 2017-01-20 12:09:42.972567617 +1100 @@ -1,6 +1,12 @@ #include #include @@ -650,9 +650,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' + j = ((INT)cp + (valsiz-1)) &~ (valsiz-1); return ((char *)j); } -diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/gen.h libx_c/gen.h ---- libx_c.post/gen.h 2017-01-19 23:46:52.606849771 +1100 -+++ libx_c/gen.h 2017-01-19 23:46:52.638849974 +1100 +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/gen.h libx_c/gen.h +--- libx_c.post/gen.h 2017-01-20 12:09:42.940568485 +1100 ++++ libx_c/gen.h 2017-01-20 12:09:42.972567617 +1100 @@ -108,7 +108,7 @@ char *mktemp __P((char *as)); @@ -662,9 +662,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' /* gen/random.c */ int srandom __P((unsigned x)); -diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/inet/Makefile libx_c/inet/Makefile ---- libx_c.post/inet/Makefile 2017-01-19 23:46:52.606849771 +1100 -+++ libx_c/inet/Makefile 2017-01-19 23:46:52.638849974 +1100 +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/inet/Makefile libx_c/inet/Makefile +--- libx_c.post/inet/Makefile 2017-01-20 12:09:42.940568485 +1100 ++++ libx_c/inet/Makefile 2017-01-20 12:09:42.972567617 +1100 @@ -1,3 +1,5 @@ +ROOT=../../.. +CC=gcc -g -I${ROOT}/cross/include -Dx_vax -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result @@ -725,9 +725,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' -# DEPENDENCIES MUST END AT END OF FILE -# IF YOU PUT STUFF HERE IT WILL GO AWAY -# see make depend above -diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/linux/csu/crt0.c libx_c/linux/csu/crt0.c +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/linux/csu/crt0.c libx_c/linux/csu/crt0.c --- libx_c.post/linux/csu/crt0.c 1970-01-01 10:00:00.000000000 +1000 -+++ libx_c/linux/csu/crt0.c 2017-01-19 23:50:16.020036238 +1100 ++++ libx_c/linux/csu/crt0.c 2017-01-20 12:09:42.972567617 +1100 @@ -0,0 +1,17 @@ +extern char **nox_environ; +char **environ; @@ -746,9 +746,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' + environ = nox_environ; + return main(argc, argv); +} -diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/linux/csu/Makefile libx_c/linux/csu/Makefile +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/linux/csu/Makefile libx_c/linux/csu/Makefile --- libx_c.post/linux/csu/Makefile 1970-01-01 10:00:00.000000000 +1000 -+++ libx_c/linux/csu/Makefile 2017-01-19 23:50:16.020036238 +1100 ++++ libx_c/linux/csu/Makefile 2017-01-20 12:09:42.976567508 +1100 @@ -0,0 +1,97 @@ +ROOT=../../../.. +CC=gcc -g -I${ROOT}/cross/include -Dx_vax -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result @@ -847,19 +847,20 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' + +# DO NOT DELETE THIS LINE -- make depend uses it + -diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/linux/gen/abort.c libx_c/linux/gen/abort.c +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/linux/gen/abort.c libx_c/linux/gen/abort.c --- libx_c.post/linux/gen/abort.c 1970-01-01 10:00:00.000000000 +1000 -+++ libx_c/linux/gen/abort.c 2017-01-19 23:50:16.020036238 +1100 -@@ -0,0 +1,6 @@ ++++ libx_c/linux/gen/abort.c 2017-01-20 12:11:05.722624305 +1100 +@@ -0,0 +1,7 @@ +#include ++ +#include + +int abort() { + nox_abort(); +} -diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/linux/gen/Makefile libx_c/linux/gen/Makefile +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/linux/gen/Makefile libx_c/linux/gen/Makefile --- libx_c.post/linux/gen/Makefile 1970-01-01 10:00:00.000000000 +1000 -+++ libx_c/linux/gen/Makefile 2017-01-19 23:50:16.020036238 +1100 ++++ libx_c/linux/gen/Makefile 2017-01-20 12:11:05.722624305 +1100 @@ -0,0 +1,55 @@ +ROOT=../../../.. +CC=gcc -g -I${ROOT}/cross/include -Dx_vax -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result @@ -871,8 +872,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' +# @(#)Makefile 5.4 (Berkeley) 9/5/85 +# + -+SRCS= abort.c -+OBJS= abort.o ++SRCS= abort.c modf.c ++OBJS= abort.o modf.o +TAGSFILE=tags + +.c.o: @@ -916,9 +917,20 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' + +# DO NOT DELETE THIS LINE -- make depend uses it + -diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/linux/Makefile libx_c/linux/Makefile +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/linux/gen/modf.c libx_c/linux/gen/modf.c +--- libx_c.post/linux/gen/modf.c 1970-01-01 10:00:00.000000000 +1000 ++++ libx_c/linux/gen/modf.c 2017-01-20 12:11:05.722624305 +1100 +@@ -0,0 +1,7 @@ ++#include ++ ++#include ++ ++double modf(v, p) double v; double *p; { ++ return nox_modf(v, 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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/linux/Makefile libx_c/linux/Makefile --- libx_c.post/linux/Makefile 1970-01-01 10:00:00.000000000 +1000 -+++ libx_c/linux/Makefile 2017-01-19 23:50:16.020036238 +1100 ++++ libx_c/linux/Makefile 2017-01-20 12:09:42.976567508 +1100 @@ -0,0 +1,43 @@ +# +# Copyright (c) 1980 Regents of the University of California. @@ -963,9 +975,58 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' +depend: + for i in ${ALL}; do \ + (cd $$i; make ${MFLAGS} DEFS=${DEFS} depend); done -diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/linux/sys/Makefile libx_c/linux/sys/Makefile +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/linux/sys/fstat.c libx_c/linux/sys/fstat.c +--- libx_c.post/linux/sys/fstat.c 1970-01-01 10:00:00.000000000 +1000 ++++ libx_c/linux/sys/fstat.c 2017-01-20 12:11:05.722624305 +1100 +@@ -0,0 +1,17 @@ ++#include ++#include ++ ++#include ++#include ++#include ++ ++int fstat(f, b) int f; struct stat *b; { ++ struct nox_stat statbuf; ++ if (nox_fstat(f, &statbuf) == -1) { ++ errno = ENOENT; ++ return -1; ++ } ++ bzero(b, sizeof(struct stat)); ++ b->st_size = (off_t)statbuf.nox_st_size; ++ return 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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/linux/sys/getpagesize.c libx_c/linux/sys/getpagesize.c +--- libx_c.post/linux/sys/getpagesize.c 1970-01-01 10:00:00.000000000 +1000 ++++ libx_c/linux/sys/getpagesize.c 2017-01-20 12:11:05.722624305 +1100 +@@ -0,0 +1,7 @@ ++#include ++ ++#include ++ ++int getpagesize() { ++ return nox_getpagesize(); ++} +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/linux/sys/isatty.c libx_c/linux/sys/isatty.c +--- libx_c.post/linux/sys/isatty.c 1970-01-01 10:00:00.000000000 +1000 ++++ libx_c/linux/sys/isatty.c 2017-01-20 12:11:05.722624305 +1100 +@@ -0,0 +1,13 @@ ++#include ++ ++#include ++#include ++ ++int isatty(f) int f; { ++ int res; ++ ++ res = nox_isatty(f); ++ if (res == -1) ++ errno = EBADF; ++ 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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/linux/sys/Makefile libx_c/linux/sys/Makefile --- libx_c.post/linux/sys/Makefile 1970-01-01 10:00:00.000000000 +1000 -+++ libx_c/linux/sys/Makefile 2017-01-19 23:50:16.020036238 +1100 ++++ libx_c/linux/sys/Makefile 2017-01-20 12:11:05.722624305 +1100 @@ -0,0 +1,55 @@ +ROOT=../../../.. +CC=gcc -g -I${ROOT}/cross/include -Dx_vax -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result @@ -977,8 +1038,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' +# @(#)Makefile 5.4 (Berkeley) 9/5/85 +# + -+SRCS= write.c -+OBJS= write.o ++SRCS= fstat.c getpagesize.c isatty.c sbrk.c write.c ++OBJS= fstat.o getpagesize.o isatty.o sbrk.o write.o +TAGSFILE=tags + +.c.o: @@ -1022,27 +1083,46 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' + +# DO NOT DELETE THIS LINE -- make depend uses it + -diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/linux/sys/write.c libx_c/linux/sys/write.c ---- libx_c.post/linux/sys/write.c 1970-01-01 10:00:00.000000000 +1000 -+++ libx_c/linux/sys/write.c 2017-01-19 23:50:16.020036238 +1100 +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/linux/sys/sbrk.c libx_c/linux/sys/sbrk.c +--- libx_c.post/linux/sys/sbrk.c 1970-01-01 10:00:00.000000000 +1000 ++++ libx_c/linux/sys/sbrk.c 2017-01-20 12:11:18.866364022 +1100 @@ -0,0 +1,14 @@ ++#include +#include ++ ++#include ++#include ++ ++void *sbrk(i) int i; { ++ void *res; ++ ++ res = nox_sbrk(i); ++ if ((intptr_t)res == -1) ++ errno = ENOMEM; ++ 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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/linux/sys/write.c libx_c/linux/sys/write.c +--- libx_c.post/linux/sys/write.c 1970-01-01 10:00:00.000000000 +1000 ++++ libx_c/linux/sys/write.c 2017-01-20 12:11:05.722624305 +1100 +@@ -0,0 +1,15 @@ ++#include ++ +#include +#include + +int write(f, b, l) int f; void *b; int l; { -+ nox_size_t res; -+ -+ res = nox_write(f, b, l); -+ if (res == (nox_size_t)-1) { -+ errno = EIO; -+ return -1; -+ } -+ return (int)res; ++ nox_size_t res; ++ ++ res = nox_write(f, b, l); ++ if (res == (nox_size_t)-1) { ++ errno = EIO; ++ return -1; ++ } ++ return (int)res; +} -diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/Makefile libx_c/Makefile ---- libx_c.post/Makefile 2017-01-19 23:46:52.610849797 +1100 -+++ libx_c/Makefile 2017-01-19 23:50:16.016036217 +1100 +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/Makefile libx_c/Makefile +--- libx_c.post/Makefile 2017-01-20 12:09:42.940568485 +1100 ++++ libx_c/Makefile 2017-01-20 12:09:42.976567508 +1100 @@ -1,3 +1,5 @@ +ROOT=${shell pwd}/../.. +DESTDIR=${ROOT}/cross @@ -1115,9 +1195,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' cd ${MACHINE}/csu; make DESTDIR=${DESTDIR} install tags: -diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/net/hosttable/Makefile libx_c/net/hosttable/Makefile ---- libx_c.post/net/hosttable/Makefile 2017-01-19 23:46:52.602849745 +1100 -+++ libx_c/net/hosttable/Makefile 2017-01-19 23:50:16.020036238 +1100 +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/net/hosttable/Makefile libx_c/net/hosttable/Makefile +--- libx_c.post/net/hosttable/Makefile 2017-01-20 12:09:42.936568593 +1100 ++++ libx_c/net/hosttable/Makefile 2017-01-20 12:09:42.976567508 +1100 @@ -1,3 +1,5 @@ +ROOT=../../../.. +CC=gcc -g -I${ROOT}/cross/include -Dx_vax -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result @@ -1172,9 +1252,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' -# DEPENDENCIES MUST END AT END OF FILE -# IF YOU PUT STUFF HERE IT WILL GO AWAY -# see make depend above -diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/net/Makefile libx_c/net/Makefile ---- libx_c.post/net/Makefile 2017-01-19 23:46:52.602849745 +1100 -+++ libx_c/net/Makefile 2017-01-19 23:50:16.020036238 +1100 +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/net/Makefile libx_c/net/Makefile +--- libx_c.post/net/Makefile 2017-01-20 12:09:42.936568593 +1100 ++++ libx_c/net/Makefile 2017-01-20 12:09:42.976567508 +1100 @@ -1,3 +1,5 @@ +ROOT=../../.. +CC=gcc -g -I${ROOT}/cross/include -Dx_vax -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result @@ -1275,9 +1355,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' -# DEPENDENCIES MUST END AT END OF FILE -# IF YOU PUT STUFF HERE IT WILL GO AWAY -# see make depend above -diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/net/named/gethostnamadr.c libx_c/net/named/gethostnamadr.c ---- libx_c.post/net/named/gethostnamadr.c 2017-01-19 23:46:52.602849745 +1100 -+++ libx_c/net/named/gethostnamadr.c 2017-01-19 23:50:16.020036238 +1100 +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/net/named/gethostnamadr.c libx_c/net/named/gethostnamadr.c +--- libx_c.post/net/named/gethostnamadr.c 2017-01-20 12:09:42.936568593 +1100 ++++ libx_c/net/named/gethostnamadr.c 2017-01-20 12:11:05.726624224 +1100 @@ -12,6 +12,12 @@ #include #include @@ -1291,11 +1371,10 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' /* * Copyright (c) 1985 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement -@@ -210,8 +216,9 @@ +@@ -210,7 +216,9 @@ } } --/* XXX should be: bp = (bp + sizeof(align) - 1) & ~sizeof(align) ??? */ - bp += ((u_long)bp % sizeof(align)); +/* XXX bp = (char *)(((U_LONG)bp + sizeof(align) - 1) & ~sizeof(align)) */ + abort(); @@ -1303,9 +1382,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' if (bp + n >= &hostbuf[sizeof(hostbuf)]) { #ifdef DEBUG -diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/net/named/Makefile libx_c/net/named/Makefile ---- libx_c.post/net/named/Makefile 2017-01-19 23:46:52.602849745 +1100 -+++ libx_c/net/named/Makefile 2017-01-19 23:50:16.020036238 +1100 +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/net/named/Makefile libx_c/net/named/Makefile +--- libx_c.post/net/named/Makefile 2017-01-20 12:09:42.936568593 +1100 ++++ libx_c/net/named/Makefile 2017-01-20 12:09:42.976567508 +1100 @@ -1,3 +1,5 @@ +ROOT=../../../.. +CC=gcc -g -I${ROOT}/cross/include -Dx_vax -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result @@ -1366,9 +1445,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' -# DEPENDENCIES MUST END AT END OF FILE -# IF YOU PUT STUFF HERE IT WILL GO AWAY -# see make depend above -diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/ns/Makefile libx_c/ns/Makefile ---- libx_c.post/ns/Makefile 2017-01-19 23:46:52.598849720 +1100 -+++ libx_c/ns/Makefile 2017-01-19 23:50:16.020036238 +1100 +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/ns/Makefile libx_c/ns/Makefile +--- libx_c.post/ns/Makefile 2017-01-20 12:09:42.932568701 +1100 ++++ libx_c/ns/Makefile 2017-01-20 12:09:42.976567508 +1100 @@ -1,3 +1,5 @@ +ROOT=../../.. +CC=gcc -g -I${ROOT}/cross/include -Dx_vax -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result @@ -1423,9 +1502,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' -# DEPENDENCIES MUST END AT END OF FILE -# IF YOU PUT STUFF HERE IT WILL GO AWAY -# see make depend above -diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/stdio/doprnt.c libx_c/stdio/doprnt.c ---- libx_c.post/stdio/doprnt.c 2017-01-19 23:46:52.598849720 +1100 -+++ libx_c/stdio/doprnt.c 2017-01-19 23:50:16.020036238 +1100 +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/stdio/doprnt.c libx_c/stdio/doprnt.c +--- libx_c.post/stdio/doprnt.c 2017-01-20 12:09:42.932568701 +1100 ++++ libx_c/stdio/doprnt.c 2017-01-20 12:09:42.976567508 +1100 @@ -13,6 +13,14 @@ #define _va_start(argp, arg) va_start(argp) #endif @@ -1469,9 +1548,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' base = 16; goto nosign; case 's': -diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/stdio/findiop.c libx_c/stdio/findiop.c ---- libx_c.post/stdio/findiop.c 2017-01-19 23:46:52.598849720 +1100 -+++ libx_c/stdio/findiop.c 2017-01-19 23:50:16.020036238 +1100 +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/stdio/findiop.c libx_c/stdio/findiop.c +--- libx_c.post/stdio/findiop.c 2017-01-20 12:09:42.932568701 +1100 ++++ libx_c/stdio/findiop.c 2017-01-20 12:09:42.976567508 +1100 @@ -105,7 +105,7 @@ *iov = (FILE *)calloc(1, sizeof **iov); } @@ -1481,9 +1560,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' register FILE **iov; register FILE *fp; -diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/stdio/Makefile libx_c/stdio/Makefile ---- libx_c.post/stdio/Makefile 2017-01-19 23:46:52.598849720 +1100 -+++ libx_c/stdio/Makefile 2017-01-19 23:50:16.020036238 +1100 +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/stdio/Makefile libx_c/stdio/Makefile +--- libx_c.post/stdio/Makefile 2017-01-20 12:09:42.932568701 +1100 ++++ libx_c/stdio/Makefile 2017-01-20 12:09:42.976567508 +1100 @@ -1,3 +1,5 @@ +ROOT=../../.. +CC=gcc -g -I${ROOT}/cross/include -Dx_vax -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result @@ -1615,9 +1694,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' -# DEPENDENCIES MUST END AT END OF FILE -# IF YOU PUT STUFF HERE IT WILL GO AWAY -# see make depend above -diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/stdio.h libx_c/stdio.h ---- libx_c.post/stdio.h 2017-01-19 23:46:52.610849797 +1100 -+++ libx_c/stdio.h 2017-01-19 23:50:16.020036238 +1100 +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/stdio.h libx_c/stdio.h +--- libx_c.post/stdio.h 2017-01-20 12:09:42.944568376 +1100 ++++ libx_c/stdio.h 2017-01-20 12:09:42.976567508 +1100 @@ -109,7 +109,7 @@ FILE *_findiop __P((void)); int _f_morefiles __P((void)); @@ -1627,9 +1706,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' void _cleanup __P((void)); /* stdio/flsbuf.c */ -diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/sys/dir.h libx_c/sys/dir.h ---- libx_c.post/sys/dir.h 2017-01-19 23:46:52.614849821 +1100 -+++ libx_c/sys/dir.h 2017-01-19 23:50:16.020036238 +1100 +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/sys/dir.h libx_c/sys/dir.h +--- libx_c.post/sys/dir.h 2017-01-20 12:09:42.948568268 +1100 ++++ libx_c/sys/dir.h 2017-01-20 12:09:42.976567508 +1100 @@ -122,7 +122,7 @@ struct direct *readdir __P((register DIR *dirp)); @@ -1639,9 +1718,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' int alphasort __P((struct direct **d1, struct direct **d2)); /* gen/seekdir.c */ -diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/sys/Makefile libx_c/sys/Makefile +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/sys/Makefile libx_c/sys/Makefile --- libx_c.post/sys/Makefile 1970-01-01 10:00:00.000000000 +1000 -+++ libx_c/sys/Makefile 2017-01-19 23:50:16.020036238 +1100 ++++ libx_c/sys/Makefile 2017-01-20 12:09:42.976567508 +1100 @@ -0,0 +1,93 @@ +ROOT=../../.. +CC=gcc -g -I${ROOT}/cross/include -Dx_vax -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result @@ -1736,9 +1815,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' + +# DO NOT DELETE THIS LINE -- make depend uses it + -diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/sys/signal.h libx_c/sys/signal.h ---- libx_c.post/sys/signal.h 2017-01-19 23:46:52.614849821 +1100 -+++ libx_c/sys/signal.h 2017-01-19 23:50:16.020036238 +1100 +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/sys/signal.h libx_c/sys/signal.h +--- libx_c.post/sys/signal.h 2017-01-20 12:09:42.948568268 +1100 ++++ libx_c/sys/signal.h 2017-01-20 12:09:42.976567508 +1100 @@ -9,7 +9,7 @@ * @(#)signal.h 7.1 (Berkeley) 6/4/86 */ diff --git a/lib/libx_c/pre.patch b/lib/libx_c/pre.patch index 0b9c0ee..6798000 100644 --- a/lib/libx_c/pre.patch +++ b/lib/libx_c/pre.patch @@ -1,6 +1,6 @@ -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' 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-19 22:04:39.139848831 +1100 -+++ libx_c/compat-4.1/ftime.c 2017-01-19 22:04:39.147848847 +1100 +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.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 12:04:56.149620637 +1100 ++++ libx_c/compat-4.1/ftime.c 2017-01-20 12:04:56.161620257 +1100 @@ -10,18 +10,20 @@ #include @@ -28,9 +28,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/c ftime(tp) register struct timeb *tp; { -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' 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-19 22:04:39.139848831 +1100 -+++ libx_c/compat-4.1/gtty.c 2017-01-19 22:04:39.147848847 +1100 +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.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 12:04:56.149620637 +1100 ++++ libx_c/compat-4.1/gtty.c 2017-01-20 12:04:56.161620257 +1100 @@ -15,7 +15,7 @@ #include @@ -40,9 +40,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/c return(ioctl(fd, TIOCGETP, ap)); } -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' 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-19 22:04:39.139848831 +1100 -+++ libx_c/compat-4.1/stty.c 2017-01-19 22:04:39.147848847 +1100 +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.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 12:04:56.149620637 +1100 ++++ libx_c/compat-4.1/stty.c 2017-01-20 12:04:56.161620257 +1100 @@ -15,7 +15,7 @@ #include @@ -52,9 +52,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/c return(ioctl(fd, TIOCSETP, ap)); } -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' 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-19 22:04:39.139848831 +1100 -+++ libx_c/compat-4.1/times.c 2017-01-19 22:04:39.147848847 +1100 +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.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 12:04:56.149620637 +1100 ++++ libx_c/compat-4.1/times.c 2017-01-20 12:04:56.161620257 +1100 @@ -10,16 +10,18 @@ #include @@ -80,9 +80,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/c times(tmsp) register struct tms *tmsp; { -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' 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-19 22:04:39.139848831 +1100 -+++ libx_c/compat-4.1/vtimes.c 2017-01-19 22:04:39.151848855 +1100 +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.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 12:04:56.149620637 +1100 ++++ libx_c/compat-4.1/vtimes.c 2017-01-20 12:04:56.161620257 +1100 @@ -10,23 +10,25 @@ #include @@ -121,9 +121,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/c vtimes(par, chi) register struct vtimes *par, *chi; { -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/compat-sys5/memccpy.c libx_c/compat-sys5/memccpy.c ---- libx_c.pre/compat-sys5/memccpy.c 2017-01-19 22:04:39.147848847 +1100 -+++ libx_c/compat-sys5/memccpy.c 2017-01-19 22:04:39.151848855 +1100 +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.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 12:04:56.157620384 +1100 ++++ libx_c/compat-sys5/memccpy.c 2017-01-20 12:04:56.161620257 +1100 @@ -13,11 +13,15 @@ #endif @@ -142,9 +142,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/c +#undef t +#undef f } -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/compat-sys5/memchr.c libx_c/compat-sys5/memchr.c ---- libx_c.pre/compat-sys5/memchr.c 2017-01-19 22:04:39.147848847 +1100 -+++ libx_c/compat-sys5/memchr.c 2017-01-19 22:04:39.151848855 +1100 +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.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 12:04:56.157620384 +1100 ++++ libx_c/compat-sys5/memchr.c 2017-01-20 12:04:56.161620257 +1100 @@ -12,12 +12,14 @@ static char sccsid[] = "@(#)memchr.c 5.2 (Berkeley) 86/03/09"; #endif @@ -163,9 +163,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/c return (0); +#undef s } -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/compat-sys5/memcmp.c libx_c/compat-sys5/memcmp.c ---- libx_c.pre/compat-sys5/memcmp.c 2017-01-19 22:04:39.147848847 +1100 -+++ libx_c/compat-sys5/memcmp.c 2017-01-19 22:04:39.151848855 +1100 +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.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 12:04:56.157620384 +1100 ++++ libx_c/compat-sys5/memcmp.c 2017-01-20 12:04:56.161620257 +1100 @@ -12,11 +12,15 @@ static char sccsid[] = "@(#)memcmp.c 5.2 (Berkeley) 86/03/09"; #endif @@ -184,9 +184,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/c +#undef s1 +#undef s2 } -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/compat-sys5/memcpy.c libx_c/compat-sys5/memcpy.c ---- libx_c.pre/compat-sys5/memcpy.c 2017-01-19 22:04:39.147848847 +1100 -+++ libx_c/compat-sys5/memcpy.c 2017-01-19 22:04:39.151848855 +1100 +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.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 12:04:56.157620384 +1100 ++++ libx_c/compat-sys5/memcpy.c 2017-01-20 12:04:56.161620257 +1100 @@ -12,14 +12,18 @@ static char sccsid[] = "@(#)memcpy.c 5.2 (Berkeley) 86/03/09"; #endif @@ -209,9 +209,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/c +#undef t +#undef f } -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/compat-sys5/memset.c libx_c/compat-sys5/memset.c ---- libx_c.pre/compat-sys5/memset.c 2017-01-19 22:04:39.147848847 +1100 -+++ libx_c/compat-sys5/memset.c 2017-01-19 22:04:39.151848855 +1100 +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.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 12:04:56.157620384 +1100 ++++ libx_c/compat-sys5/memset.c 2017-01-20 12:04:56.161620257 +1100 @@ -12,14 +12,16 @@ static char sccsid[] = "@(#)memset.c 5.2 (Berkeley) 86/03/09"; #endif @@ -232,8 +232,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/c return (p); +#undef s } -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/fcntl.h libx_c/fcntl.h ---- libx_c.pre/fcntl.h 2017-01-19 22:04:39.139848831 +1100 +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/fcntl.h libx_c/fcntl.h +--- libx_c.pre/fcntl.h 2017-01-20 12:04:56.153620511 +1100 +++ libx_c/fcntl.h 1970-01-01 10:00:00.000000000 +1000 @@ -1,40 +0,0 @@ -/* @@ -276,9 +276,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/f -#define FTRUNC 02000 /* truncate to zero length */ -#define FEXCL 04000 /* error if already created */ -#endif -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/gen/bcmp.c libx_c/gen/bcmp.c ---- libx_c.pre/gen/bcmp.c 2017-01-19 22:04:39.147848847 +1100 -+++ libx_c/gen/bcmp.c 2017-01-19 22:04:39.151848855 +1100 +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.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 12:04:56.157620384 +1100 ++++ libx_c/gen/bcmp.c 2017-01-20 12:04:56.161620257 +1100 @@ -11,10 +11,11 @@ /* * bcmp -- vax cmpc3 instruction @@ -301,9 +301,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/g +#undef b1 +#undef b2 } -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/gen/bcopy.c libx_c/gen/bcopy.c ---- libx_c.pre/gen/bcopy.c 2017-01-19 22:04:39.147848847 +1100 -+++ libx_c/gen/bcopy.c 2017-01-19 22:04:39.151848855 +1100 +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.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 12:04:56.157620384 +1100 ++++ libx_c/gen/bcopy.c 2017-01-20 12:04:56.161620257 +1100 @@ -11,9 +11,11 @@ /* * bcopy -- vax movc3 instruction @@ -340,9 +340,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/g +#undef src +#undef dst } -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/gen/bzero.c libx_c/gen/bzero.c ---- libx_c.pre/gen/bzero.c 2017-01-19 22:04:39.147848847 +1100 -+++ libx_c/gen/bzero.c 2017-01-19 22:04:39.151848855 +1100 +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.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 12:04:56.157620384 +1100 ++++ libx_c/gen/bzero.c 2017-01-20 12:04:56.161620257 +1100 @@ -11,13 +11,14 @@ /* * bzero -- vax movc5 instruction @@ -361,9 +361,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/g return(length); +#undef b } -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/gen/calloc.c libx_c/gen/calloc.c ---- libx_c.pre/gen/calloc.c 2017-01-19 22:04:39.147848847 +1100 -+++ libx_c/gen/calloc.c 2017-01-19 22:04:39.151848855 +1100 +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.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 12:04:56.157620384 +1100 ++++ libx_c/gen/calloc.c 2017-01-20 12:04:56.161620257 +1100 @@ -5,11 +5,11 @@ /* * Calloc - allocate and clear memory block @@ -388,9 +388,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/g unsigned num; unsigned size; { free(p); -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/gen/fakcu.c libx_c/gen/fakcu.c ---- libx_c.pre/gen/fakcu.c 2017-01-19 22:04:39.147848847 +1100 -+++ libx_c/gen/fakcu.c 2017-01-19 22:04:39.151848855 +1100 +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.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 12:04:56.157620384 +1100 ++++ libx_c/gen/fakcu.c 2017-01-20 12:04:56.161620257 +1100 @@ -6,5 +6,6 @@ * Null cleanup routine to resolve reference in exit() * if not using stdio. @@ -398,9 +398,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/g +void _cleanup() { } -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/gen/getpass.c libx_c/gen/getpass.c ---- libx_c.pre/gen/getpass.c 2017-01-19 22:04:39.147848847 +1100 -+++ libx_c/gen/getpass.c 2017-01-19 22:04:39.151848855 +1100 +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.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 12:04:56.157620384 +1100 ++++ libx_c/gen/getpass.c 2017-01-20 12:04:56.161620257 +1100 @@ -15,8 +15,8 @@ register c; FILE *fi; @@ -412,9 +412,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/g if ((fi = fdopen(open("/dev/tty", 2), "r")) == NULL) fi = stdin; -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/gen/getusershell.c libx_c/gen/getusershell.c ---- libx_c.pre/gen/getusershell.c 2017-01-19 22:04:39.147848847 +1100 -+++ libx_c/gen/getusershell.c 2017-01-19 22:04:39.151848855 +1100 +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.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 12:04:56.157620384 +1100 ++++ libx_c/gen/getusershell.c 2017-01-20 12:04:56.161620257 +1100 @@ -62,7 +62,7 @@ register char **sp, *cp; register FILE *fp; @@ -433,9 +433,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/g (void)fclose(fp); return(okshells); } -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/gen/insque.c libx_c/gen/insque.c ---- libx_c.pre/gen/insque.c 2017-01-19 22:04:39.147848847 +1100 -+++ libx_c/gen/insque.c 2017-01-19 22:04:39.151848855 +1100 +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.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 12:04:56.157620384 +1100 ++++ libx_c/gen/insque.c 2017-01-20 12:04:56.161620257 +1100 @@ -8,16 +8,19 @@ static char sccsid[] = "@(#)insque.c 5.1 (Berkeley) 1/27/87"; #endif @@ -460,8 +460,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/g insque(e, prev) register struct vaxque *e, *prev; { -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/gen/isatty.c libx_c/gen/isatty.c ---- libx_c.pre/gen/isatty.c 2017-01-19 22:04:39.147848847 +1100 +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.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 12:04:56.157620384 +1100 +++ libx_c/gen/isatty.c 1970-01-01 10:00:00.000000000 +1000 @@ -1,17 +0,0 @@ -#if defined(LIBC_SCCS) && !defined(lint) @@ -481,9 +481,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/g - return(0); - return(1); -} -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/gen/malloc.c libx_c/gen/malloc.c ---- libx_c.pre/gen/malloc.c 2017-01-19 22:04:39.147848847 +1100 -+++ libx_c/gen/malloc.c 2017-01-19 22:04:39.151848855 +1100 +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.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 12:04:56.157620384 +1100 ++++ libx_c/gen/malloc.c 2017-01-20 12:04:56.161620257 +1100 @@ -82,7 +82,7 @@ #if defined(DEBUG) || defined(RCHECK) #define ASSERT(p) if (!(p)) botch("p") @@ -541,9 +541,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/g mstats(s) char *s; { register int i, j; -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/gen/ndbm.c libx_c/gen/ndbm.c ---- libx_c.pre/gen/ndbm.c 2017-01-19 22:04:39.147848847 +1100 -+++ libx_c/gen/ndbm.c 2017-01-19 22:04:39.151848855 +1100 +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.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 12:04:56.157620384 +1100 ++++ libx_c/gen/ndbm.c 2017-01-20 12:04:56.161620257 +1100 @@ -14,6 +14,7 @@ #include #include @@ -585,9 +585,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/g if (db->dbm_dirf < 0) goto bad1; fstat(db->dbm_dirf, &statb); -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/gen/perror.c libx_c/gen/perror.c ---- libx_c.pre/gen/perror.c 2017-01-19 22:04:39.147848847 +1100 -+++ libx_c/gen/perror.c 2017-01-19 22:04:39.151848855 +1100 +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.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 12:04:56.157620384 +1100 ++++ libx_c/gen/perror.c 2017-01-20 12:04:56.161620257 +1100 @@ -17,7 +17,7 @@ int errno; @@ -597,8 +597,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/g perror(s) char *s; { struct iovec iov[4]; -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/gen/popen.c libx_c/gen/popen.c ---- libx_c.pre/gen/popen.c 2017-01-19 22:04:39.147848847 +1100 +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.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 12:04:56.157620384 +1100 +++ libx_c/gen/popen.c 1970-01-01 10:00:00.000000000 +1000 @@ -1,77 +0,0 @@ -/* @@ -678,9 +678,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/g - (void) sigsetmask(omask); - return (pid == -1 ? -1 : status); -} -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/gen/qsort.c libx_c/gen/qsort.c ---- libx_c.pre/gen/qsort.c 2017-01-19 22:04:39.147848847 +1100 -+++ libx_c/gen/qsort.c 2017-01-19 22:04:39.151848855 +1100 +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.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 12:04:56.157620384 +1100 ++++ libx_c/gen/qsort.c 2017-01-20 12:04:56.161620257 +1100 @@ -32,11 +32,13 @@ * It's not... */ @@ -714,9 +714,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/g qst(base, max) char *base, *max; { register char c, *i, *j, *jj; -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/gen/random.c libx_c/gen/random.c ---- libx_c.pre/gen/random.c 2017-01-19 22:04:39.147848847 +1100 -+++ libx_c/gen/random.c 2017-01-19 22:04:39.151848855 +1100 +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.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 12:04:56.157620384 +1100 ++++ libx_c/gen/random.c 2017-01-20 12:04:56.161620257 +1100 @@ -222,7 +222,7 @@ if( n < BREAK_1 ) { if( n < BREAK_0 ) { @@ -726,9 +726,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/g } rand_type = TYPE_0; rand_deg = DEG_0; -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/gen/regex.c libx_c/gen/regex.c ---- libx_c.pre/gen/regex.c 2017-01-19 22:04:39.147848847 +1100 -+++ libx_c/gen/regex.c 2017-01-19 22:04:39.151848855 +1100 +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.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 12:04:56.157620384 +1100 ++++ libx_c/gen/regex.c 2017-01-20 12:04:56.161620257 +1100 @@ -8,8 +8,6 @@ static char sccsid[] = "@(#)regex.c 5.2 (Berkeley) 3/9/86"; #endif @@ -738,9 +738,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/g /* * routines to do regular expression matching * -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/gen/remque.c libx_c/gen/remque.c ---- libx_c.pre/gen/remque.c 2017-01-19 22:04:39.147848847 +1100 -+++ libx_c/gen/remque.c 2017-01-19 22:04:39.151848855 +1100 +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.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 12:04:56.157620384 +1100 ++++ libx_c/gen/remque.c 2017-01-20 12:04:56.161620257 +1100 @@ -8,16 +8,19 @@ static char sccsid[] = "@(#)remque.c 5.1 (Berkeley) 1/27/87"; #endif @@ -765,9 +765,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/g remque(e) register struct vaxque *e; { -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/gen/signal.c libx_c/gen/signal.c ---- libx_c.pre/gen/signal.c 2017-01-19 22:04:39.147848847 +1100 -+++ libx_c/gen/signal.c 2017-01-19 22:04:39.151848855 +1100 +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.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 12:04:56.157620384 +1100 ++++ libx_c/gen/signal.c 2017-01-20 12:04:56.161620257 +1100 @@ -13,9 +13,10 @@ */ #include @@ -781,9 +781,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/g struct sigvec osv, sv; static int mask[NSIG]; static int flags[NSIG]; -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/gen/sleep.c libx_c/gen/sleep.c ---- libx_c.pre/gen/sleep.c 2017-01-19 22:04:39.147848847 +1100 -+++ libx_c/gen/sleep.c 2017-01-19 22:04:39.151848855 +1100 +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.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 12:04:56.157620384 +1100 ++++ libx_c/gen/sleep.c 2017-01-20 12:04:56.161620257 +1100 @@ -16,9 +16,11 @@ static int ringring; @@ -807,9 +807,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/g - ringring = 1; } -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/gen/syslog.c libx_c/gen/syslog.c ---- libx_c.pre/gen/syslog.c 2017-01-19 22:04:39.147848847 +1100 -+++ libx_c/gen/syslog.c 2017-01-19 22:04:39.151848855 +1100 +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.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 12:04:56.157620384 +1100 ++++ libx_c/gen/syslog.c 2017-01-20 12:04:56.161620257 +1100 @@ -54,6 +54,7 @@ extern int errno, sys_nerr; extern char *sys_errlist[]; @@ -836,9 +836,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/g (void) close(LogFile); LogFile = -1; } -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/gen/system.c libx_c/gen/system.c ---- libx_c.pre/gen/system.c 2017-01-19 22:04:39.147848847 +1100 -+++ libx_c/gen/system.c 2017-01-19 22:04:39.151848855 +1100 +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.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 12:04:56.157620384 +1100 ++++ libx_c/gen/system.c 2017-01-20 12:04:56.161620257 +1100 @@ -7,7 +7,7 @@ system(s) char *s; { @@ -848,9 +848,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/g if ((pid = vfork()) == 0) { execl("/bin/sh", "sh", "-c", s, 0); -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/gen/usleep.c libx_c/gen/usleep.c ---- libx_c.pre/gen/usleep.c 2017-01-19 22:04:39.147848847 +1100 -+++ libx_c/gen/usleep.c 2017-01-19 22:04:39.151848855 +1100 +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.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 12:04:56.157620384 +1100 ++++ libx_c/gen/usleep.c 2017-01-20 12:04:56.161620257 +1100 @@ -19,9 +19,11 @@ static int ringring; @@ -874,9 +874,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/g - ringring = 1; } -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/gen/valloc.c libx_c/gen/valloc.c ---- libx_c.pre/gen/valloc.c 2017-01-19 22:04:39.147848847 +1100 -+++ libx_c/gen/valloc.c 2017-01-19 22:04:39.151848855 +1100 +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.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 12:04:56.157620384 +1100 ++++ libx_c/gen/valloc.c 2017-01-20 12:04:56.161620257 +1100 @@ -8,9 +8,9 @@ static char sccsid[] = "@(#)valloc.c 5.2 (Berkeley) 3/9/86"; #endif @@ -889,29 +889,18 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/g valloc(i) int i; { int valsiz = getpagesize(), j; -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/gen.h libx_c/gen.h +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.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-19 22:04:39.151848855 +1100 ++++ libx_c/gen.h 2017-01-20 12:04:56.165620130 +1100 @@ -0,0 +1,5 @@ +/* formerly duplicated in gen/insque.c and gen/remque.c */ +struct vaxque { /* queue format expected by VAX queue instructions */ + struct vaxque *vq_next; + struct vaxque *vq_prev; +}; -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/net/named/gethostnamadr.c libx_c/net/named/gethostnamadr.c ---- libx_c.pre/net/named/gethostnamadr.c 2017-01-19 22:04:39.139848831 +1100 -+++ libx_c/net/named/gethostnamadr.c 2017-01-19 22:04:39.151848855 +1100 -@@ -197,6 +197,7 @@ - } - } - -+/* XXX should be: bp = (bp + sizeof(align) - 1) & ~sizeof(align) ??? */ - bp += ((u_long)bp % sizeof(align)); - - if (bp + n >= &hostbuf[sizeof(hostbuf)]) { -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/net/rcmd.c libx_c/net/rcmd.c ---- libx_c.pre/net/rcmd.c 2017-01-19 22:04:39.139848831 +1100 -+++ libx_c/net/rcmd.c 2017-01-19 22:04:39.151848855 +1100 +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.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 12:04:56.149620637 +1100 ++++ libx_c/net/rcmd.c 2017-01-20 12:04:56.165620130 +1100 @@ -58,7 +58,7 @@ sin.sin_family = hp->h_addrtype; bcopy(hp->h_addr_list[0], (caddr_t)&sin.sin_addr, hp->h_length); @@ -939,9 +928,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/n return (s); if (errno != EADDRINUSE) { (void) close(s); -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/net/res_debug.c libx_c/net/res_debug.c ---- libx_c.pre/net/res_debug.c 2017-01-19 22:04:39.139848831 +1100 -+++ libx_c/net/res_debug.c 2017-01-19 22:04:39.151848855 +1100 +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.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 12:04:56.149620637 +1100 ++++ libx_c/net/res_debug.c 2017-01-20 12:04:56.165620130 +1100 @@ -324,7 +324,9 @@ } @@ -976,9 +965,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/n + return nbuf; } } -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/net/res_mkquery.c libx_c/net/res_mkquery.c ---- libx_c.pre/net/res_mkquery.c 2017-01-19 22:04:39.139848831 +1100 -+++ libx_c/net/res_mkquery.c 2017-01-19 22:04:39.151848855 +1100 +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.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 12:04:56.149620637 +1100 ++++ libx_c/net/res_mkquery.c 2017-01-20 12:04:56.165620130 +1100 @@ -14,7 +14,10 @@ #include #include @@ -1002,9 +991,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/n } /* * perform opcode specific processing -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/net/res_send.c libx_c/net/res_send.c ---- libx_c.pre/net/res_send.c 2017-01-19 22:04:39.139848831 +1100 -+++ libx_c/net/res_send.c 2017-01-19 22:04:39.151848855 +1100 +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.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 12:04:56.153620511 +1100 ++++ libx_c/net/res_send.c 2017-01-20 12:04:56.165620130 +1100 @@ -82,7 +82,7 @@ #endif continue; @@ -1023,9 +1012,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/n sizeof(struct sockaddr)) < 0 || send(s, buf, buflen, 0) != buflen) { #ifdef DEBUG -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/net/rexec.c libx_c/net/rexec.c ---- libx_c.pre/net/rexec.c 2017-01-19 22:04:39.139848831 +1100 -+++ libx_c/net/rexec.c 2017-01-19 22:04:39.151848855 +1100 +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.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 12:04:56.153620511 +1100 ++++ libx_c/net/rexec.c 2017-01-20 12:04:56.165620130 +1100 @@ -49,7 +49,7 @@ sin.sin_family = hp->h_addrtype; sin.sin_port = rport; @@ -1044,9 +1033,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/n close(s2); if (s3 < 0) { perror("accept"); -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/net/ruserpass.c libx_c/net/ruserpass.c ---- libx_c.pre/net/ruserpass.c 2017-01-19 22:04:39.139848831 +1100 -+++ libx_c/net/ruserpass.c 2017-01-19 22:04:39.151848855 +1100 +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.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 12:04:56.149620637 +1100 ++++ libx_c/net/ruserpass.c 2017-01-20 12:04:56.165620130 +1100 @@ -19,6 +19,7 @@ struct utmp *getutmp(); static FILE *cfile; @@ -1126,9 +1115,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/n mkpwclear(sencpasswd,mch,spasswd) char mch, *spasswd, *sencpasswd; { register char *skey; -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/net.h libx_c/net.h +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.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-19 22:04:39.151848855 +1100 ++++ libx_c/net.h 2017-01-20 12:04:56.165620130 +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 */ @@ -1146,9 +1135,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/n +u_short ntohs(), htons(); +u_long ntohl(), htonl(); +/*#endif*/ -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/netinet/in.h libx_c/netinet/in.h ---- libx_c.pre/netinet/in.h 2017-01-19 22:04:39.143848838 +1100 -+++ libx_c/netinet/in.h 2017-01-19 22:04:39.155848862 +1100 +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.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 12:04:56.153620511 +1100 ++++ libx_c/netinet/in.h 2017-01-20 12:04:56.165620130 +1100 @@ -90,20 +90,21 @@ */ #define IP_OPTIONS 1 /* set/get IP per-packet options */ @@ -1181,9 +1170,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/n #ifdef KERNEL extern struct domain inetdomain; -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/netinet/ip.h libx_c/netinet/ip.h ---- libx_c.pre/netinet/ip.h 2017-01-19 22:04:39.143848838 +1100 -+++ libx_c/netinet/ip.h 2017-01-19 22:04:39.155848862 +1100 +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.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 12:04:56.153620511 +1100 ++++ libx_c/netinet/ip.h 2017-01-20 12:04:56.165620130 +1100 @@ -81,7 +81,7 @@ struct in_addr ipt_addr; n_long ipt_time; @@ -1193,9 +1182,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/n }; /* flag bits for ipt_flg */ -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/netinet/tcp.h libx_c/netinet/tcp.h ---- libx_c.pre/netinet/tcp.h 2017-01-19 22:04:39.143848838 +1100 -+++ libx_c/netinet/tcp.h 2017-01-19 22:04:39.155848862 +1100 +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.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 12:04:56.153620511 +1100 ++++ libx_c/netinet/tcp.h 2017-01-20 12:04:56.165620130 +1100 @@ -44,7 +44,9 @@ #ifdef lint #define TCP_MSS 536 @@ -1207,9 +1196,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/n #endif /* -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/netns/ns.h libx_c/netns/ns.h ---- libx_c.pre/netns/ns.h 2017-01-19 22:04:39.143848838 +1100 -+++ libx_c/netns/ns.h 2017-01-19 22:04:39.155848862 +1100 +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.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 12:04:56.153620511 +1100 ++++ libx_c/netns/ns.h 2017-01-20 12:04:56.165620130 +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)) @@ -1242,8 +1231,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/n #ifdef KERNEL extern struct domain nsdomain; -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/nlist.h libx_c/nlist.h ---- libx_c.pre/nlist.h 2017-01-19 22:04:39.139848831 +1100 +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/nlist.h libx_c/nlist.h +--- libx_c.pre/nlist.h 2017-01-20 12:04:56.153620511 +1100 +++ libx_c/nlist.h 1970-01-01 10:00:00.000000000 +1000 @@ -1,46 +0,0 @@ -/* @@ -1292,9 +1281,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/n - * Format for namelist values. - */ -#define N_FORMAT "%08x" -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/ns/ns_addr.c libx_c/ns/ns_addr.c ---- libx_c.pre/ns/ns_addr.c 2017-01-19 22:04:39.139848831 +1100 -+++ libx_c/ns/ns_addr.c 2017-01-19 22:04:39.155848862 +1100 +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.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 12:04:56.149620637 +1100 ++++ libx_c/ns/ns_addr.c 2017-01-20 12:04:56.165620130 +1100 @@ -54,7 +54,7 @@ socketname = index(hostname, separator); if (socketname) { @@ -1313,9 +1302,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/n Field(buf, out, len) char *buf; u_char *out; -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/stdio/doprnt.c libx_c/stdio/doprnt.c ---- libx_c.pre/stdio/doprnt.c 2017-01-19 22:04:39.139848831 +1100 -+++ libx_c/stdio/doprnt.c 2017-01-19 22:04:39.155848862 +1100 +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.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 12:04:56.149620637 +1100 ++++ libx_c/stdio/doprnt.c 2017-01-20 12:04:56.165620130 +1100 @@ -271,9 +271,10 @@ * NUL in the first `prec' characters, and * strlen() will go further. @@ -1329,9 +1318,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/s size = p - t; if (size > prec) size = prec; -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/stdio/doscan.c libx_c/stdio/doscan.c ---- libx_c.pre/stdio/doscan.c 2017-01-19 22:04:39.139848831 +1100 -+++ libx_c/stdio/doscan.c 2017-01-19 22:04:39.155848862 +1100 +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.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 12:04:56.149620637 +1100 ++++ libx_c/stdio/doscan.c 2017-01-20 12:04:56.165620130 +1100 @@ -3,7 +3,8 @@ #endif @@ -1411,9 +1400,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/s break; } return(1); -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/stdio/findiop.c libx_c/stdio/findiop.c ---- libx_c.pre/stdio/findiop.c 2017-01-19 22:04:39.139848831 +1100 -+++ libx_c/stdio/findiop.c 2017-01-19 22:04:39.155848862 +1100 +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.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 12:04:56.149620637 +1100 ++++ libx_c/stdio/findiop.c 2017-01-20 12:04:56.165620130 +1100 @@ -23,7 +23,7 @@ { 0, NULL, NULL, 0, _IOWRT|_IONBF, 2 }, /* stderr */ }; @@ -1452,9 +1441,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/s _cleanup() { extern int fclose(); -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/stdio/fprintf.c libx_c/stdio/fprintf.c ---- libx_c.pre/stdio/fprintf.c 2017-01-19 22:04:39.139848831 +1100 -+++ libx_c/stdio/fprintf.c 2017-01-19 22:04:39.155848862 +1100 +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.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 12:04:56.149620637 +1100 ++++ libx_c/stdio/fprintf.c 2017-01-20 12:04:56.165620130 +1100 @@ -1,31 +1,48 @@ /* * Copyright (c) 1980 Regents of the University of California. @@ -1514,9 +1503,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/s + va_end(argp); + return(ferror(iop) ? EOF : len); } -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/stdio/fread.c libx_c/stdio/fread.c ---- libx_c.pre/stdio/fread.c 2017-01-19 22:04:39.139848831 +1100 -+++ libx_c/stdio/fread.c 2017-01-19 22:04:39.155848862 +1100 +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.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 12:04:56.149620637 +1100 ++++ libx_c/stdio/fread.c 2017-01-20 12:04:56.165620130 +1100 @@ -10,10 +10,11 @@ #include @@ -1537,9 +1526,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/s return (size != 0 ? count - ((s + size - 1) / size) : 0); +#undef ptr } -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/stdio/fwrite.c libx_c/stdio/fwrite.c ---- libx_c.pre/stdio/fwrite.c 2017-01-19 22:04:39.139848831 +1100 -+++ libx_c/stdio/fwrite.c 2017-01-19 22:04:39.155848862 +1100 +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.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 12:04:56.149620637 +1100 ++++ libx_c/stdio/fwrite.c 2017-01-20 12:04:56.165620130 +1100 @@ -10,10 +10,11 @@ #include @@ -1560,9 +1549,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/s return (size != 0 ? count - ((s + size - 1) / size) : 0); +#undef ptr } -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/stdio/popen.c libx_c/stdio/popen.c +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.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-19 22:04:39.155848862 +1100 ++++ libx_c/stdio/popen.c 2017-01-20 12:04:56.165620130 +1100 @@ -0,0 +1,77 @@ +/* + * Copyright (c) 1980 Regents of the University of California. @@ -1641,9 +1630,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/s + (void) sigsetmask(omask); + return (pid == -1 ? -1 : status); +} -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/stdio/printf.c libx_c/stdio/printf.c ---- libx_c.pre/stdio/printf.c 2017-01-19 22:04:39.139848831 +1100 -+++ libx_c/stdio/printf.c 2017-01-19 22:04:39.155848862 +1100 +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.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 12:04:56.149620637 +1100 ++++ libx_c/stdio/printf.c 2017-01-20 12:04:56.165620130 +1100 @@ -1,11 +1,35 @@ +/* + * Copyright (c) 1987 Regents of the University of California. @@ -1686,9 +1675,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/s + va_end(argp); + return(ferror(stdout) ? EOF : len); } -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/stdio/scanf.c libx_c/stdio/scanf.c ---- libx_c.pre/stdio/scanf.c 2017-01-19 22:04:39.139848831 +1100 -+++ libx_c/stdio/scanf.c 2017-01-19 22:04:39.155848862 +1100 +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.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 12:04:56.149620637 +1100 ++++ libx_c/stdio/scanf.c 2017-01-20 12:04:56.165620130 +1100 @@ -2,29 +2,50 @@ static char sccsid[] = "@(#)scanf.c 5.2 (Berkeley) 3/9/86"; #endif @@ -1750,9 +1739,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/s + va_end(argp); + return len; } -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/stdio/setbuffer.c libx_c/stdio/setbuffer.c ---- libx_c.pre/stdio/setbuffer.c 2017-01-19 22:04:39.139848831 +1100 -+++ libx_c/stdio/setbuffer.c 2017-01-19 22:04:39.155848862 +1100 +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.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 12:04:56.149620637 +1100 ++++ libx_c/stdio/setbuffer.c 2017-01-20 12:04:56.165620130 +1100 @@ -33,11 +33,11 @@ setlinebuf(iop) register FILE *iop; { @@ -1767,9 +1756,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/s if (buf != NULL) { setbuffer(iop, buf, BUFSIZ); iop->_flag |= _IOLBF|_IOMYBUF; -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/stdio/sprintf.c libx_c/stdio/sprintf.c ---- libx_c.pre/stdio/sprintf.c 2017-01-19 22:04:39.139848831 +1100 -+++ libx_c/stdio/sprintf.c 2017-01-19 22:04:39.155848862 +1100 +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.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 12:04:56.149620637 +1100 ++++ libx_c/stdio/sprintf.c 2017-01-20 12:04:56.165620130 +1100 @@ -1,17 +1,40 @@ +/* + * Copyright (c) 1987 Regents of the University of California. @@ -1818,9 +1807,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/s + va_end(argp); + return(len); } -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/stdio/vfprintf.c libx_c/stdio/vfprintf.c +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.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-19 22:04:39.155848862 +1100 ++++ libx_c/stdio/vfprintf.c 2017-01-20 12:04:56.165620130 +1100 @@ -0,0 +1,46 @@ +/* + * Copyright (c) 1988 Regents of the University of California. @@ -1868,9 +1857,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/s + + return (ferror(iop) ? EOF : len); +} -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/stdio/vprintf.c libx_c/stdio/vprintf.c +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.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-19 22:04:39.155848862 +1100 ++++ libx_c/stdio/vprintf.c 2017-01-20 12:04:56.165620130 +1100 @@ -0,0 +1,33 @@ +/* + * Copyright (c) 1988 Regents of the University of California. @@ -1905,9 +1894,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/s + len = _doprnt(fmt, argp, stdout); + return (ferror(stdout) ? EOF : len); +} -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/stdio/vsprintf.c libx_c/stdio/vsprintf.c +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.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-19 22:04:39.155848862 +1100 ++++ libx_c/stdio/vsprintf.c 2017-01-20 12:04:56.165620130 +1100 @@ -0,0 +1,38 @@ +/* + * Copyright (c) 1988 Regents of the University of California. @@ -1947,9 +1936,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/s + *f._ptr = 0; + return (len); +} -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/stdio.h libx_c/stdio.h ---- libx_c.pre/stdio.h 2017-01-19 22:04:39.143848838 +1100 -+++ libx_c/stdio.h 2017-01-19 22:04:39.155848862 +1100 +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/stdio.h libx_c/stdio.h +--- libx_c.pre/stdio.h 2017-01-20 12:04:56.153620511 +1100 ++++ libx_c/stdio.h 2017-01-20 12:04:56.165620130 +1100 @@ -59,7 +59,7 @@ long ftell(); char *fgets(); @@ -1959,9 +1948,17 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/s char *sprintf(); /* too painful to do right */ #endif # endif -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/sys/dir.h libx_c/sys/dir.h ---- libx_c.pre/sys/dir.h 2017-01-19 22:04:39.147848847 +1100 -+++ libx_c/sys/dir.h 2017-01-19 22:04:39.155848862 +1100 +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/sys/brk.c libx_c/sys/brk.c +--- libx_c.pre/sys/brk.c 2017-01-20 12:04:56.153620511 +1100 ++++ libx_c/sys/brk.c 2017-01-20 12:06:02.720360567 +1100 +@@ -1,3 +1,3 @@ +-char *brk(a) char *a; { ++void *brk(a) void *a; { + 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.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 12:04:56.157620384 +1100 ++++ libx_c/sys/dir.h 2017-01-20 12:04:56.165620130 +1100 @@ -32,9 +32,9 @@ * dp->d_ino set to 0. */ @@ -1975,9 +1972,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/s #define DIRBLKSIZ DEV_BSIZE #define MAXNAMLEN 255 -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/sys/errno.h libx_c/sys/errno.h ---- libx_c.pre/sys/errno.h 2017-01-19 22:04:39.143848838 +1100 -+++ libx_c/sys/errno.h 2017-01-19 22:05:26.543944747 +1100 +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.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 12:04:56.153620511 +1100 ++++ libx_c/sys/errno.h 2017-01-20 12:04:56.165620130 +1100 @@ -96,3 +96,7 @@ #define EPROCLIM 67 /* Too many processes */ #define EUSERS 68 /* Too many users */ @@ -1986,35 +1983,35 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/s +#ifndef KERNEL +extern int errno; +#endif -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/sys/execl.c libx_c/sys/execl.c ---- libx_c.pre/sys/execl.c 2017-01-19 22:04:39.147848847 +1100 -+++ libx_c/sys/execl.c 2017-01-19 22:04:39.155848862 +1100 +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.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 12:04:56.157620384 +1100 ++++ libx_c/sys/execl.c 2017-01-20 12:04:56.165620130 +1100 @@ -1,3 +1,4 @@ -void execl(f, a) char *f, *a; { +#include +void execl(f, va_alist) char *f; va_dcl { abort(); } -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/sys/execle.c libx_c/sys/execle.c ---- libx_c.pre/sys/execle.c 2017-01-19 22:04:39.143848838 +1100 -+++ libx_c/sys/execle.c 2017-01-19 22:04:39.155848862 +1100 +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.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 12:04:56.153620511 +1100 ++++ libx_c/sys/execle.c 2017-01-20 12:04:56.165620130 +1100 @@ -1,3 +1,4 @@ -void execle(f, a) char *f, *a; { +#include +void execle(f, va_alist) char *f; va_dcl { abort(); } -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/sys/ioctl.c libx_c/sys/ioctl.c ---- libx_c.pre/sys/ioctl.c 2017-01-19 22:04:39.143848838 +1100 -+++ libx_c/sys/ioctl.c 2017-01-19 22:04:39.155848862 +1100 +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/sys/ioctl.c libx_c/sys/ioctl.c +--- libx_c.pre/sys/ioctl.c 2017-01-20 12:04:56.153620511 +1100 ++++ libx_c/sys/ioctl.c 2017-01-20 12:04:56.165620130 +1100 @@ -1,3 +1,3 @@ -int ioctl(d, r, p) u_long r; char *p; { +int ioctl(d, r, p) u_long r; void *p; { abort(); } -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/sys/isatty.c libx_c/sys/isatty.c +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.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-19 22:04:39.155848862 +1100 ++++ libx_c/sys/isatty.c 2017-01-20 12:04:56.165620130 +1100 @@ -0,0 +1,17 @@ +#if defined(LIBC_SCCS) && !defined(lint) +static char sccsid[] = "@(#)isatty.c 5.2 (Berkeley) 3/9/86"; @@ -2033,18 +2030,18 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/s + return(0); + return(1); +} -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/sys/open.c libx_c/sys/open.c ---- libx_c.pre/sys/open.c 2017-01-19 22:04:39.143848838 +1100 -+++ libx_c/sys/open.c 2017-01-19 22:04:39.155848862 +1100 +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.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 12:04:56.153620511 +1100 ++++ libx_c/sys/open.c 2017-01-20 12:04:56.165620130 +1100 @@ -1,3 +1,4 @@ -int open(f, m, stuff) char *f; { +#include +int open(f, m, va_alist) char *f; va_dcl { abort(); } -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/sys/param.h libx_c/sys/param.h ---- libx_c.pre/sys/param.h 2017-01-19 22:04:39.143848838 +1100 -+++ libx_c/sys/param.h 2017-01-19 22:04:39.155848862 +1100 +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.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 12:04:56.153620511 +1100 ++++ libx_c/sys/param.h 2017-01-20 12:04:56.169620003 +1100 @@ -53,15 +53,16 @@ /* * Signals @@ -2090,9 +2087,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/s + +/* moved this from sys/types.h */ +#define NBBY 8 /* number of bits in a byte */ -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/sys/proc.h libx_c/sys/proc.h ---- libx_c.pre/sys/proc.h 2017-01-19 22:04:39.143848838 +1100 -+++ libx_c/sys/proc.h 2017-01-19 22:04:39.155848862 +1100 +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.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 12:04:56.153620511 +1100 ++++ libx_c/sys/proc.h 2017-01-20 12:04:56.169620003 +1100 @@ -117,3 +117,8 @@ #define SSEL 0x0400000 /* selecting; wakeup/waiting danger */ #define SLOGIN 0x0800000 /* a login process (legit child of init) */ @@ -2102,33 +2099,41 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/s +#define ISSIG(p) \ + ((p)->p_sig && ((p)->p_flag&STRC || \ + ((p)->p_sig &~ ((p)->p_sigignore | (p)->p_sigmask))) && issig()) -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/sys/read.c libx_c/sys/read.c ---- libx_c.pre/sys/read.c 2017-01-19 22:04:39.143848838 +1100 -+++ libx_c/sys/read.c 2017-01-19 22:04:39.155848862 +1100 +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/sys/read.c libx_c/sys/read.c +--- libx_c.pre/sys/read.c 2017-01-20 12:04:56.153620511 +1100 ++++ libx_c/sys/read.c 2017-01-20 12:04:56.169620003 +1100 @@ -1,3 +1,3 @@ -int read(f, b, l) char *b; { +int read(f, b, l) void *b; { abort(); } -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/sys/recv.c libx_c/sys/recv.c ---- libx_c.pre/sys/recv.c 2017-01-19 22:04:39.143848838 +1100 -+++ libx_c/sys/recv.c 2017-01-19 22:04:39.155848862 +1100 +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/sys/recv.c libx_c/sys/recv.c +--- libx_c.pre/sys/recv.c 2017-01-20 12:04:56.153620511 +1100 ++++ libx_c/sys/recv.c 2017-01-20 12:04:56.169620003 +1100 @@ -1,3 +1,3 @@ -int recv(s, b, l, f) char *b; { +int recv(s, b, l, f) void *b; { abort(); } -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/sys/recvfrom.c libx_c/sys/recvfrom.c ---- libx_c.pre/sys/recvfrom.c 2017-01-19 22:04:39.143848838 +1100 -+++ libx_c/sys/recvfrom.c 2017-01-19 22:04:39.155848862 +1100 +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/sys/recvfrom.c libx_c/sys/recvfrom.c +--- libx_c.pre/sys/recvfrom.c 2017-01-20 12:04:56.153620511 +1100 ++++ libx_c/sys/recvfrom.c 2017-01-20 12:04:56.169620003 +1100 @@ -1,3 +1,3 @@ -int recvfrom(s, b, l, f, fr, fl) char *b; struct sockaddr *fr; int *fl; { +int recvfrom(s, b, l, f, fr, fl) void *b; struct sockaddr *fr; int *fl; { abort(); } -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/sys/select.h libx_c/sys/select.h +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/sys/sbrk.c libx_c/sys/sbrk.c +--- libx_c.pre/sys/sbrk.c 2017-01-20 12:04:56.157620384 +1100 ++++ libx_c/sys/sbrk.c 2017-01-20 12:05:49.029437799 +1100 +@@ -1,3 +1,3 @@ +-char *sbrk(i) { ++void *sbrk(i) { + 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.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-19 22:04:39.155848862 +1100 ++++ libx_c/sys/select.h 2017-01-20 12:04:56.169620003 +1100 @@ -0,0 +1,28 @@ +#include + @@ -2158,25 +2163,25 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/s +#define FD_CLR(n, p) ((p)->fds_bits[(n)/NFDBITS] &= ~(1 << ((n) % NFDBITS))) +#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=*.o' '--exclude=x' libx_c.pre/sys/send.c libx_c/sys/send.c ---- libx_c.pre/sys/send.c 2017-01-19 22:04:39.143848838 +1100 -+++ libx_c/sys/send.c 2017-01-19 22:04:39.155848862 +1100 +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/sys/send.c libx_c/sys/send.c +--- libx_c.pre/sys/send.c 2017-01-20 12:04:56.153620511 +1100 ++++ libx_c/sys/send.c 2017-01-20 12:04:56.169620003 +1100 @@ -1,3 +1,3 @@ -int send(s, m, l, f) char *m; { +int send(s, m, l, f) void *m; { abort(); } -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/sys/sendto.c libx_c/sys/sendto.c ---- libx_c.pre/sys/sendto.c 2017-01-19 22:04:39.143848838 +1100 -+++ libx_c/sys/sendto.c 2017-01-19 22:04:39.155848862 +1100 +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/sys/sendto.c libx_c/sys/sendto.c +--- libx_c.pre/sys/sendto.c 2017-01-20 12:04:56.153620511 +1100 ++++ libx_c/sys/sendto.c 2017-01-20 12:04:56.169620003 +1100 @@ -1,3 +1,3 @@ -int sendto(s, m, l, f, t, tl) char *m; struct sockaddr *t; { +int sendto(s, m, l, f, t, tl) void *m; struct sockaddr *t; { abort(); } -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/sys/signal.h libx_c/sys/signal.h ---- libx_c.pre/sys/signal.h 2017-01-19 22:04:39.143848838 +1100 -+++ libx_c/sys/signal.h 2017-01-19 22:04:39.155848862 +1100 +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.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 12:04:56.153620511 +1100 ++++ libx_c/sys/signal.h 2017-01-20 12:04:56.169620003 +1100 @@ -57,14 +57,14 @@ #define SIGUSR2 31 /* user defined signal 2 */ @@ -2213,9 +2218,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/s #endif #endif -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/sys/tty.h libx_c/sys/tty.h ---- libx_c.pre/sys/tty.h 2017-01-19 22:04:39.143848838 +1100 -+++ libx_c/sys/tty.h 2017-01-19 22:04:39.155848862 +1100 +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.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 12:04:56.153620511 +1100 ++++ libx_c/sys/tty.h 2017-01-20 12:04:56.169620003 +1100 @@ -70,20 +70,22 @@ struct ttychars t_chars; /* tty */ struct winsize t_winsize; /* window size */ @@ -2253,9 +2258,9 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/s }; #define TTIPRI 28 -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/sys/types.h libx_c/sys/types.h ---- libx_c.pre/sys/types.h 2017-01-19 22:04:39.143848838 +1100 -+++ libx_c/sys/types.h 2017-01-19 22:04:39.155848862 +1100 +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.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 12:04:56.153620511 +1100 ++++ libx_c/sys/types.h 2017-01-20 12:04:56.169620003 +1100 @@ -45,30 +45,32 @@ typedef u_short uid_t; typedef u_short gid_t; @@ -2305,16 +2310,16 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/s +/*#define FD_ZERO(p) bzero((char *)(p), sizeof(*(p)))*/ #endif -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/sys/vfork.c libx_c/sys/vfork.c +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.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-19 22:04:39.155848862 +1100 ++++ libx_c/sys/vfork.c 2017-01-20 12:04:56.169620003 +1100 @@ -0,0 +1,3 @@ +int vfork() { + abort(); +} -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/sys/vmmac.h libx_c/sys/vmmac.h ---- libx_c.pre/sys/vmmac.h 2017-01-19 22:04:39.143848838 +1100 -+++ libx_c/sys/vmmac.h 2017-01-19 22:04:39.155848862 +1100 +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.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 12:04:56.153620511 +1100 ++++ libx_c/sys/vmmac.h 2017-01-20 12:04:56.169620003 +1100 @@ -157,3 +157,10 @@ } \ c->c_lock = 0; \ @@ -2326,33 +2331,33 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/s +/* moved this from sys/vmmac.h to avoid a circular dependency */ +#define mapin(pte, v, pfnum, count, prot) \ + (*(int *)(pte) = (pfnum) | (prot), mtpr(TBIS, ptob(v))) -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/sys/vopen.c libx_c/sys/vopen.c +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.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-19 22:04:39.155848862 +1100 ++++ libx_c/sys/vopen.c 2017-01-20 12:04:56.169620003 +1100 @@ -0,0 +1,4 @@ +#include +int vopen(f, m, argp) char *f; va_list argp; { + abort(); +} -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/sys/wait.c libx_c/sys/wait.c ---- libx_c.pre/sys/wait.c 2017-01-19 22:04:39.143848838 +1100 -+++ libx_c/sys/wait.c 2017-01-19 22:04:39.155848862 +1100 +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/sys/wait.c libx_c/sys/wait.c +--- libx_c.pre/sys/wait.c 2017-01-20 12:04:56.153620511 +1100 ++++ libx_c/sys/wait.c 2017-01-20 12:04:56.169620003 +1100 @@ -1,3 +1,3 @@ -int wait(s) union wait *s; { +int wait(s) int *s; { abort(); } -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/sys/write.c libx_c/sys/write.c ---- libx_c.pre/sys/write.c 2017-01-19 22:04:39.143848838 +1100 -+++ libx_c/sys/write.c 2017-01-19 22:04:39.155848862 +1100 +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.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.pre/sys/write.c libx_c/sys/write.c +--- libx_c.pre/sys/write.c 2017-01-20 12:04:56.153620511 +1100 ++++ libx_c/sys/write.c 2017-01-20 12:04:56.169620003 +1100 @@ -1,3 +1,3 @@ -int write(f, b, l) char *b; { +int write(f, b, l) void *b; { abort(); } -diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libx_c.pre/vax/vmparam.h libx_c/vax/vmparam.h ---- libx_c.pre/vax/vmparam.h 2017-01-19 22:04:39.143848838 +1100 -+++ libx_c/vax/vmparam.h 2017-01-19 22:04:39.155848862 +1100 +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.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 12:04:56.153620511 +1100 ++++ libx_c/vax/vmparam.h 2017-01-20 12:04:56.169620003 +1100 @@ -156,5 +156,6 @@ /* * BEWARE THIS DEFINITION WORKS ONLY WITH COUNT OF 1 diff --git a/lib/libx_c/sys/brk.c b/lib/libx_c/sys/brk.c index e40e738..4f2cd09 100644 --- a/lib/libx_c/sys/brk.c +++ b/lib/libx_c/sys/brk.c @@ -1,6 +1,6 @@ #include #include -char *brk(a) char *a; { +void *brk(a) void *a; { abort(); } diff --git a/lib/libx_c/sys/proc.h b/lib/libx_c/sys/proc.h index 87b2d7c..c989bae 100644 --- a/lib/libx_c/sys/proc.h +++ b/lib/libx_c/sys/proc.h @@ -157,7 +157,7 @@ int setruid __P((int ruid)); int setuid __P((int uid)); /* sys/brk.c */ -char *brk __P((char *a)); +void *brk __P((void *a)); /* sys/chdir.c */ int chdir __P((char *s)); @@ -196,7 +196,7 @@ int getppid __P((void)); uid_t getuid __P((void)); /* sys/sbrk.c */ -char *sbrk __P((int i)); +void *sbrk __P((int i)); /* sys/setgroups.c */ int setgroups __P((int n, int *g)); diff --git a/lib/libx_c/sys/sbrk.c b/lib/libx_c/sys/sbrk.c index cd6e664..b5afd77 100644 --- a/lib/libx_c/sys/sbrk.c +++ b/lib/libx_c/sys/sbrk.c @@ -1,6 +1,6 @@ #include #include -char *sbrk(i) int i; { +void *sbrk(i) int i; { abort(); } -- 2.34.1