Subject: Object file symbols limited to 8 characters [+FIX] (#170 - #13 of 19) Index: cc,as,ld,ar,ranlib,nm,nlist,adb,... (2.11BSD) Description: For some time now (seem like eons;-)) the object file format used by Unix for the PDP-11 has restricted symbols to 8 significant characters (actually 7 due to the C compiler prefixing symbols with a leading tilde (~) or underscore (_)). Aside from the "creative constraints" this imposes on the programmer there was the continuing problem of 'name collisions', especially when porting applications from machines whose object file format permitted longer symbol names. Numerous workarounds have been employed in the past. The most common one relied on a combination of a name collision detection program ('shortc') and the flexname capability of the C preprocessor ('cpp'). This served to mask the problem while making debugging difficult due to mangled/synthetic symbol names. Repeat-By: Attempt to compile the following program: int this_is_a_long_name; int this_is_a_long_name_too; main() { exit(0)}; Fix: This section is repeated in each of the 19 parts which make up the update kit. You should read it perhaps once or twice, but then skip over it (how to do that is mentioned below). Taking a "hint" from the a.out(5) man page: "The compiler will note name collisions when they occur within a single file... There is really little that can be done about this. Some thought is being given to modifying the loader to flag detectable collisions, but the real solution would be to change over to the 4BSD a.out format. This would involve modifying the compiler, assembler and adb and then simply porting the 4.3BSD ld, nm, ranlib, strip and nlist. Or perhaps simply porting the entire 4.3BSD suite might be best ... Anyone interested in a project?" This I have done. No more volunteers for the project need apply ;-) The new limit on symbol length is 32 characters! There is still a limit (but it is _much_ more reasonable now) simply because of address space constraints - it needs to be possible to hold at least one of the 'symbol' or 'string' tables in memory in many cases (nice to hold both, but - i know, get a 486;-)). It must be noted though that it is almost trivial now to raise the limit if that is desired - the programs which need to know the maximum length of a symbol string all have an easily changed #define statement now (usually MAXSYMLEN but there are a couple exceptions). The 'string table' format itself doesn't care how long the strings are. The actual a.out format won't have to change again to accomodate a higher limit on symbol name length! The "string table" object file format has been ported and all the necessary changes made throughout the entire system. The changes were *massive* and widespread. Programs affected of course included the assembler and compiler. Other programs affected were anything which accessed a symbol table entry either via nlist(3) [ps, pstat, fstat, vmstat, etc] or by reading object files [ld, ranlib, nm, adb, strip, etc]. The actual changes to the compiler and assembler were minor because those programs had already been modified earlier (updates #142, 143, 152, 153). The compiler only needed to have the maximum size of a symbol name raised. The assembler already knew how to generate 'string table' object files - all that needed to be done in 'as' was to flip a bit telling it to generate the new object format instead of the old style. +++++++++++++++ And now for a bit of a narrative about what was done. The detailed instructions for applying this part (#13 of 19) of the update kit follow the 'story' below. This started out as a semi-organized accounting of what was done but then devolved into a semi-rambling tale due to the sheer bulk of the changes. You can skip to the details for applying #170 by searching for the string "=======" below - this header is replicated in all parts of this kit. +++++++++++++++ Alas, the remaining changes were not so simple. Complete replacements for ranlib(1), ar(1), nlist(3) were ported from the Net-2 release. Other programs such as symorder(1) and two new programs 'symcompact' and 'strcompact' (used to compress/compact symbol and string tables) were written from scratch. Perhaps the two hardest parts of the whole effort were rewriting the linker 'ld' and making *large* modifications to the debugger 'adb'. This was a very difficult job. 'ld needed to scan new style ranlib archives, as well as using the "virtual memory" facility (the 'libvmf' routines posted earlier) for symbol table management and so on. 'adb' was a MESS (having been written in a pseudo block structured macro language). Since the new symbol table entry could be so much larger than the old it was no longer possible for adb to hold as much of the symbol table in memory - an alternate method took a while to develope and implement, more on that in the patch which deals with adb (actually the changes to adb are so large there are two substantial parts of this update kit just for adb!). After the basic programs (ar, ld, ranlib, etc) were running the system had to be completely recompiled from sources, beginning with the object libraries. After those were done the process of recompiling the rest of the system could proceed. Guess what happens when you recreate libc.a with a buggy linker? Yep - the system is rendered useless until backup copies of everything can be reloaded. Don't let this happen to you - be sure (and i'll repeat the point later) to back up the system (or at least key executables and .a files) before installing this upgrade. In all there were about 330 files modified during the change of object file format. Some of these were not directly related to the new object file format. There were a number of (obsolete) references to "BSD2_10" lingering in the system. Those have been replaced with "pdp11" and the 'BSD2_10' define has been removed from the C preprocessor (cpp). DO NOT use 'BSD2_10' to #ifdef pdp-11 sensitive code, use "pdp11" instead. During the recompile of the libraries a fairly large number of "shortened" names were lengthened - these included syscall routines such as "gethostname" which no longer had to be munged into "gethname". Also a surprising number of typographical errors were uncovered (mainly in the Fortran libraries) where an extra character (beyond the 7th character) was left off or accidentally added. These were all fixed and eventually, after a couple evenings, the libraries were built and installed. After the libraries were done it was the application programs' turn to be recompiled. This took the better part of a couple weeks to finally make it thru due to (as it turned out) the iterative nature of the task. A symbol would come up undefined and have to be tracked down exactly where the wrong definition/use was coming from. Finally, however, the task was done and it was time to move on to the kernel. The kernel proved to be suprisingly easy - no real complications arose except when it came time to reboot, a bug had been introduced into 'autoconfig' (who uses 'nlist' to scan the kernel symbol table). Ouch! That was another couple late nights. Since the compiler supports unsigned longs now a number of small changes which ifdef'd 'u_long' to 'long' were removed. REMEMBER - you need to recompile 'autoconfig' and install it before rebooting the new kernel ;-) The performance of 'ps' though (and anything else which used nlist(3), 'fstat', 'w' are good examples) was unacceptably slow. So, amidst other delays (real work, the earthquake - which almost tossed the disc drive to the floor, etc) the "symorder" program was written (with ideas borrowed from the Net-2 version). The symorder(1) program rather insists on holding both the symbol and string tables in memory - this was a problem (or could be if the kernel symbol table grows much more) so two new and original programs were written: 'symcompact' and 'strcompact'. The first program compacts the symbol table by removing 'register' local variables (they're of no use to anyone - the debugger doesn't/can't do anything with them) and redundant global text symbols (symbols in an overlaid program which are in the root segment do not need both the '~' and '_' symbols present). The second program 'strcompact' is one that any 'string table' based object file system can use. It implements "shared strings" for symbols - if a program has many references to 'error' as a local symbol, why store the string 'error' more than once? Simply store one instance and then update the symbol table entries to all point to the same string! Using both 'strcompact' and 'symcompact' on the /unix image resulted in a file that was 15kb smaller. Running 'symorder' then puts the most frequently used symbols at the front of the symbol table, the performance of 'w', 'pstat', and other programs which nlist(3) the kernel was now acceptable. Some of the parts of this kit are large. The large patch files have been split into pieces which the 'patch' will handle, other parts (the replacement 'ar' sources) were left as a single 'shar' file rather than split them up. Each part of this kit consists of: a 'patchfile' - this is used with the "patch" program to update files. an optional 'script' - this is run ("sh script") to perform initialization, remove files, create directories and so on. an optional 'new.sources' - this is a "shar" file containing complete sources for a program. ALL pathnames are _absolute_ - this way you do not have to "cd" around the system, you should be able to apply all the patches while you are in /tmp (or /usr/tmp - wherever you have the most free space). Be sure that you have at least 40mb free on /usr before rebuilding the system - if you do not then building in stages will be necessary. Part 19 contains the detailed instructions for rebuilding the system _after_ the previous 18 patches have been applied. The patches (#158 thru #175) should be applied in order following the directions in each part. DO NOT recompile anything once the patching has begun until requested to do so in part 19. Many of the system include files are modified and the object file format is being changed - recompilation will not be possible until the transformation of the system and object libraries is complete. AT A MINIMUM you will want to back up the following files (unless you have a known good backup already made) in case you need to recompile something before part 19 is done: /bin/ar /bin/ld /bin/nm /bin/as /usr/bin/ranlib /lib/c0 /lib/crt0.o /lib/mcrt0.o /lib/libc.a /bin/nm /usr/include/*.h /usr/include/sys/*.h In part 19 there is a *complete* list of all files affected (all 336 of them) - you may wish to back those up also. And now the common header ('boilerplate') is over (at last ;-)), let the installation guide begin. As always, the complete 2.11BSD updates are available via anonymous FTP to 'ftp.iipo.gtegsc.com' in the directory /pub/2.11BSD ========== #170 (Part #13 of 19) This part updates the following files. BACK THESE UP if you have any worries about the proceedure or do not have a bootable backup already at hand. /usr/src/new/nntp/inews/uname.c /usr/src/new/nntp/server/common.h /usr/src/new/ansi/ansitape.c /usr/src/new/jove/tune.h /usr/src/new/jove/util.c /usr/src/new/pathalias/local.c /usr/src/new/checkobj/checkobj.c /usr/src/new/rn/intrp.c /usr/src/new/bm/bm.c /usr/src/new/crash/crash.c /usr/src/new/crash/route.c /usr/src/new/rcs/src/rcssyn.c /usr/src/new/rcs/src/sccstorcs.c /usr/src/new/ntp/Makefile /usr/src/new/news/src/uname.c /usr/src/new/tcsh/sh.c /usr/src/new/kermit5.188/makefile 0) Be in a temp directory ("cd /tmp" or "cd /usr/tmp") 1) Save the following shar archive to a file (/tmp/170 for example) 2) Unpack the archive: sh 170 3) Patch the files: patch -p0 < patchfile 4) rm 170 patchfile Part 13 of 19 is done. DO NOT rebuild or compile _anything_ at this point! ===== cut here #! /bin/sh # This is a shell archive, meaning: # 1. Remove everything above the #! /bin/sh line. # 2. Save the resulting text in a file. # 3. Execute the file with /bin/sh (not csh) to create: # patchfile # This archive created: Fri Feb 4 23:14:17 1994 export PATH; PATH=/bin:/usr/bin:$PATH if test -f 'patchfile' then echo shar: "will not over-write existing file 'patchfile'" else sed 's/^X//' << \SHAR_EOF > 'patchfile' X*** /usr/src/new/nntp/inews/uname.c.old Fri Apr 21 19:45:15 1989 X--- /usr/src/new/nntp/inews/uname.c Fri Dec 31 22:43:35 1993 X*************** X*** 21,27 **** X */ X X #ifdef SCCSID X! static char *SccsId = "@(#)uname.c 2.9 1/20/86"; X #endif /* SCCSID */ X X #include X--- 21,27 ---- X */ X X #ifdef SCCSID X! static char *SccsId = "@(#)uname.c 2.9.1 12/31/93"; X #endif /* SCCSID */ X X #include X*************** X*** 32,40 **** X #endif /* UNAME */ X X #ifdef GHNAME X- #ifdef pdp11 X- #include X- #endif X uname(uptr) X char *uptr; X { X--- 32,37 ---- X*** /usr/src/new/nntp/server/common.h.old Wed Feb 10 08:37:41 1988 X--- /usr/src/new/nntp/server/common.h Fri Dec 31 22:44:11 1993 X*************** X*** 1,7 **** X /* X * Common declarations, includes, and other goodies. X * X! * @(#)common.h 1.26 (Berkeley) 2/10/88 X */ X X X--- 1,7 ---- X /* X * Common declarations, includes, and other goodies. X * X! * @(#)common.h 1.26.1 (2.11BSD) 12/31/93 X */ X X X*************** X*** 13,21 **** X #include X #include X #include X- #ifdef BSD2_10 X- #include X- #endif BSD2_10 X X #include "../common/nntp.h" X #include "../common/conf.h" X--- 13,18 ---- X*** /usr/src/new/ansi/ansitape.c.old Fri Apr 15 16:59:45 1988 X--- /usr/src/new/ansi/ansitape.c Fri Dec 31 22:44:42 1993 X*************** X*** 8,34 **** X #include X #include X X- #ifdef BSD2_10 X- #include X- #define totalreadfiles trfiles X- #define totalreadblocks trblocks X- #define totalreadlines trlines X- #define totalreadchars trchars X- #define totalwritefiles trwfiles X- #define totalwriteblocks trwblocks X- #define totalwritelines trwlines X- #define totalwritechars trwchars X- #define writehdr1 whdr1 X- #define writehdr2 whdr2 X- #define writehdr3 whdr3 X- #define writeeof1 weof1 X- #define writeeof2 weof2 X- #define writeeof3 weof3 X- #define writeeof1 weof1 X- #define writeeof2 weof2 X- #define writeeof3 weof3 X- #endif X- X char *malloc(); X int wflag; X int xflag; X--- 8,13 ---- X*** /usr/src/new/jove/tune.h.old Fri Aug 12 05:48:18 1988 X--- /usr/src/new/jove/tune.h Sat Jan 1 01:32:30 1994 X*************** X*** 72,78 **** X # define BUFSIZ 512 /* or 1024 */ X # define NBUF 3 X # endif X! # ifdef BSD2_10 X /* X * On most systems, defining LOAD_AV will haul in stdio since X * nlist(3) uses stdio. But under 2.10BSD, there's a system call X--- 72,78 ---- X # define BUFSIZ 512 /* or 1024 */ X # define NBUF 3 X # endif X! # ifdef pdp11 X /* X * On most systems, defining LOAD_AV will haul in stdio since X * nlist(3) uses stdio. But under 2.10BSD, there's a system call X*** /usr/src/new/jove/util.c.old Thu Aug 11 03:35:53 1988 X--- /usr/src/new/jove/util.c Sat Jan 1 01:33:02 1994 X*************** X*** 689,695 **** X } X X #ifdef LOAD_AV X! # if defined(BSD4_2) && !defined(BSD2_10) X # if defined(PURDUE_EE) && (defined(vax) || defined(gould)) X X void X--- 689,695 ---- X } X X #ifdef LOAD_AV X! # if defined(BSD4_2) && !defined(pdp11) X # if defined(PURDUE_EE) && (defined(vax) || defined(gould)) X X void X*************** X*** 744,750 **** X } X X # endif X! # else /* !BSD4_2 || BSD2_10 */ X X void X get_la(dp) X--- 744,750 ---- X } X X # endif X! # else /* !BSD4_2 || pdp11 */ X X void X get_la(dp) X*************** X*** 887,893 **** X unsigned int delay; X { X #ifndef MSDOS X! #if defined(BSD4_2) && !defined(BSD2_10) X #include X X struct timeval timer; X--- 887,893 ---- X unsigned int delay; X { X #ifndef MSDOS X! #if defined(BSD4_2) && !defined(pdp11) X #include X X struct timeval timer; X*** /usr/src/new/pathalias/local.c.old Fri Dec 4 08:47:41 1987 X--- /usr/src/new/pathalias/local.c Fri Dec 31 22:45:07 1993 X*************** X*** 1,11 **** X /* pathalias -- by steve bellovin, as told to peter honeyman */ X #ifndef lint X! static char *sccsid = "@(#)local.c 9.1 87/10/04"; X #endif /* lint */ X- X- #ifdef BSD2_10 X- #include X- #endif X X #include X #include "config.h" X--- 1,7 ---- X /* pathalias -- by steve bellovin, as told to peter honeyman */ X #ifndef lint X! static char *sccsid = "@(#)local.c 9.1.1 93/12/31"; X #endif /* lint */ X X #include X #include "config.h" X*** /usr/src/new/checkobj/checkobj.c.old Mon Aug 24 21:01:01 1987 X--- /usr/src/new/checkobj/checkobj.c Thu Jan 6 21:42:26 1994 X*************** X*** 22,40 **** X struct exec obj; X struct ovlhdr ovlhdr; X X! struct nlist nl[] = X! { X! "maxmem", 0, 0, X! 0 X! }; X X- struct nlist fpsim[] = X- { X- "fptrap", 0, 0, X- "fltused", 0, 0, X- "\0\0\0\0\0\0\0\0", 0, 0 X- }; X- X int sflag; X int fflag; X X--- 22,30 ---- X struct exec obj; X struct ovlhdr ovlhdr; X X! struct nlist nl[2]; X! struct nlist fpsim[3]; X X int sflag; X int fflag; X X*************** X*** 43,48 **** X--- 33,41 ---- X int x,fail=0; X char *myname; X X+ nl[0].n_un.n_name = "maxmem"; X+ fpsim[0].n_un.n_name = "fptrap"; X+ fpsim[1].n_un.n_name = "fltused"; X myname = argv[0]; X argc--,argv++; X while (argc > 1 && argv[0][0]=='-') { X*** /usr/src/new/rn/intrp.c.old Fri Apr 21 19:44:01 1989 X--- /usr/src/new/rn/intrp.c Fri Dec 31 22:48:18 1993 X*************** X*** 127,135 **** X /* name of this site (%H) */ X X #ifdef GETHOSTNAME X- #ifdef pdp11 X- #include X- #endif X gethostname(buf,sizeof buf); X hostname = savestr(buf); X #else X--- 127,132 ---- X*** /usr/src/new/bm/bm.c.old Fri May 23 03:54:43 1986 X--- /usr/src/new/bm/bm.c Sat Jan 1 01:33:28 1994 X*************** X*** 1,5 **** X #include X! #include /* XXXX ADDED FOR BSD2.9 */ X #include X #include X #include "bm.h" X--- 1,5 ---- X #include X! #include X #include X #include X #include "bm.h" X*** /usr/src/new/crash/crash.c.old Thu Dec 24 15:05:58 1992 X--- /usr/src/new/crash/crash.c Fri Dec 31 22:48:50 1993 X*************** X*** 73,79 **** X */ X X #include X- #include X #include X #include X #include X--- 73,78 ---- X*** /usr/src/new/crash/route.c.old Wed Dec 23 20:09:44 1992 X--- /usr/src/new/crash/route.c Sat Jan 1 01:34:48 1994 X*************** X*** 8,16 **** X static char sccsid[] = "@(#)route.c 5.6 (Berkeley) 86/04/23"; X #endif X X- #ifdef BSD2_10 X- #define hashsizeaddr hsizeaddr X- #endif BSD2_10 X #include X #include X #include X--- 8,13 ---- X*************** X*** 55,67 **** X register struct arenas *asp; X #endif CRASH X char name[16], *flags; X- #ifdef BSD2_10 X struct rtentry rte; X struct rtentry **routehash; X- #else X struct mbuf mb; X struct mbuf **routehash; X- #endif X struct ifnet ifnet; X int hashsize; X int i, doinghost = 1; X--- 52,61 ---- X*************** X*** 80,86 **** X } X klseek(kmem, (off_t)hashsizeaddr, 0); X read(kmem, &hashsize, sizeof (hashsize)); X! #ifdef BSD2_10 X routehash = (struct rtentry **)malloc( hashsize*sizeof (struct rtentry *) ); X klseek(kmem, (off_t)hostaddr, 0); X read(kmem, routehash, hashsize*sizeof (struct rtentry *)); X--- 74,80 ---- X } X klseek(kmem, (off_t)hashsizeaddr, 0); X read(kmem, &hashsize, sizeof (hashsize)); X! #ifdef pdp11 X routehash = (struct rtentry **)malloc( hashsize*sizeof (struct rtentry *) ); X klseek(kmem, (off_t)hostaddr, 0); X read(kmem, routehash, hashsize*sizeof (struct rtentry *)); X*************** X*** 97,103 **** X for (i = 0; i < hashsize; i++) { X if (routehash[i] == 0) X continue; X! #ifdef BSD2_10 X rt = routehash[i]; X while (rt) { X struct sockaddr_in *sin; X--- 91,97 ---- X for (i = 0; i < hashsize; i++) { X if (routehash[i] == 0) X continue; X! #ifdef pdp11 X rt = routehash[i]; X while (rt) { X struct sockaddr_in *sin; X*************** X*** 171,177 **** X rt->rt_refcnt, rt->rt_use); X if (rt->rt_ifp == 0) { X putchar('\n'); X! #ifdef BSD2_10 X rt = rt->rt_next; X #else X m = mb.m_next; X--- 165,171 ---- X rt->rt_refcnt, rt->rt_use); X if (rt->rt_ifp == 0) { X putchar('\n'); X! #ifdef pdp11 X rt = rt->rt_next; X #else X m = mb.m_next; X*************** X*** 183,189 **** X klseek(kmem, (off_t)ifnet.if_name, 0); X read(kmem, name, 16); X printf("%s%d\n", name, ifnet.if_unit); X! #ifdef BSD2_10 X rt = rt->rt_next; X #else X m = mb.m_next; X--- 177,183 ---- X klseek(kmem, (off_t)ifnet.if_name, 0); X read(kmem, name, 16); X printf("%s%d\n", name, ifnet.if_unit); X! #ifdef pdp11 X rt = rt->rt_next; X #else X m = mb.m_next; X*************** X*** 192,198 **** X } X if (doinghost) { X klseek(kmem, (off_t)netaddr, 0); X! #ifdef BSD2_10 X read(kmem, routehash, hashsize*sizeof (struct rtentry *)); X #else X read(kmem, routehash, hashsize*sizeof (struct mbuf *)); X--- 186,192 ---- X } X if (doinghost) { X klseek(kmem, (off_t)netaddr, 0); X! #ifdef pdp11 X read(kmem, routehash, hashsize*sizeof (struct rtentry *)); X #else X read(kmem, routehash, hashsize*sizeof (struct mbuf *)); X*** /usr/src/new/rcs/src/rcssyn.c.old Sat Aug 13 14:20:46 1988 X--- /usr/src/new/rcs/src/rcssyn.c Sat Jan 1 01:35:24 1994 X*************** X*** 2,8 **** X * RCS file input X */ X #ifndef lint X! static char rcsid[]= "$Id: rcssyn.c,v 4.4 87/12/18 11:46:16 narten Exp $ Purdue CS"; X #endif X /********************************************************************************* X * Syntax Analysis. X--- 2,8 ---- X * RCS file input X */ X #ifndef lint X! static char rcsid[]= "$Id: rcssyn.c,v 4.4.1 94/1/1 11:46:16 narten Exp $ Purdue CS"; X #endif X /********************************************************************************* X * Syntax Analysis. X*************** X*** 84,94 **** X /* version SYNTEST inputs a RCS file and then prints out its internal X * data structures. X */ X- X- #ifdef BSD2_10 X- #define Kbranch Kbrch X- #define Kbrances Kbrchs X- #endif X X #include "rcsbase.h" X extern FILE * finptr; /*RCS input file*/ X--- 84,89 ---- X*** /usr/src/new/rcs/src/sccstorcs.c.old Fri Aug 12 02:12:00 1988 X--- /usr/src/new/rcs/src/sccstorcs.c Sat Jan 1 01:35:50 1994 X*************** X*** 1,5 **** X static char *RCSid = X! "$Header: /usr/src/new/rcs/src/RCS/sccstorcs.c,v 1.4 84/10/17 21:12:11 root Exp $"; X X /* X * SCCSTORCS - build RCS file from SCCS file preserving deltas. X--- 1,5 ---- X static char *RCSid = X! "$Header: /usr/src/new/rcs/src/RCS/sccstorcs.c,v 1.4.1 94/1/1 21:12:11 root Exp $"; X X /* X * SCCSTORCS - build RCS file from SCCS file preserving deltas. X*************** X*** 38,50 **** X */ X X #include X- X- #ifdef BSD2_10 X- #define install_userlist uinstall X- #define install_deltas dinstall X- #define collect_userlist ucollect X- #define collect_header hcollect X- #endif X X #define TRUE 1 X #define FALSE 0 X--- 38,43 ---- X*** /usr/src/new/ntp/Makefile.old Sun Jul 23 11:28:08 1989 X--- /usr/src/new/ntp/Makefile Thu Jan 6 21:45:08 1994 X*************** X*** 209,299 **** X X ntp.o: ntp.c /usr/include/stdio.h /usr/include/sys/types.h X ntp.o: /usr/include/sys/param.h /usr/include/sys/localopts.h X! ntp.o: /usr/include/machine/machparam.h /usr/include/signal.h X! ntp.o: /usr/include/sys/types.h /usr/include/sys/time.h /usr/include/time.h X! ntp.o: /usr/include/sys/uio.h /usr/include/sys/socket.h X! ntp.o: /usr/include/short_names.h /usr/include/sys/ioctl.h X! ntp.o: /usr/include/sys/ttychars.h /usr/include/sys/ttydev.h X! ntp.o: /usr/include/netinet/in.h /usr/include/short_names.h X ntp.o: /usr/include/netinet/in_systm.h /usr/include/netinet/ip.h X! ntp.o: /usr/include/netinet/udp.h /usr/include/arpa/inet.h X! ntp.o: /usr/include/short_names.h /usr/include/netdb.h X! ntp.o: /usr/include/short_names.h /usr/include/strings.h /usr/include/errno.h X! ntp.o: ntp.h X ntpdc.o: ntpdc.c /usr/include/sys/types.h /usr/include/sys/param.h X ntpdc.o: /usr/include/sys/localopts.h /usr/include/machine/machparam.h X! ntpdc.o: /usr/include/signal.h /usr/include/sys/types.h /usr/include/signal.h X! ntpdc.o: /usr/include/sys/uio.h /usr/include/sys/socket.h X! ntpdc.o: /usr/include/short_names.h /usr/include/sys/time.h /usr/include/time.h X! ntpdc.o: /usr/include/netinet/in.h /usr/include/short_names.h X! ntpdc.o: /usr/include/netinet/udp.h /usr/include/errno.h /usr/include/stdio.h X! ntpdc.o: /usr/include/netdb.h /usr/include/short_names.h /usr/include/strings.h X! ntpdc.o: /usr/include/arpa/inet.h /usr/include/short_names.h ntp.h X ntpd.o: ntpd.c /usr/include/stdio.h /usr/include/sys/types.h X ntpd.o: /usr/include/sys/param.h /usr/include/sys/localopts.h X! ntpd.o: /usr/include/machine/machparam.h /usr/include/signal.h X! ntpd.o: /usr/include/sys/types.h /usr/include/sys/uio.h X! ntpd.o: /usr/include/sys/socket.h /usr/include/short_names.h X! ntpd.o: /usr/include/sys/time.h /usr/include/time.h /usr/include/sys/ioctl.h X! ntpd.o: /usr/include/sys/ttychars.h /usr/include/sys/ttydev.h X! ntpd.o: /usr/include/sys/resource.h /usr/include/sys/file.h X! ntpd.o: /usr/include/net/if.h /usr/include/net/if_arp.h X! ntpd.o: /usr/include/netinet/in.h /usr/include/short_names.h X! ntpd.o: /usr/include/netinet/in_systm.h /usr/include/netinet/ip.h X! ntpd.o: /usr/include/netinet/udp.h /usr/include/arpa/inet.h X! ntpd.o: /usr/include/short_names.h /usr/include/netdb.h X! ntpd.o: /usr/include/short_names.h /usr/include/strings.h /usr/include/errno.h X! ntpd.o: /usr/include/syslog.h /usr/include/nlist.h ntp.h patchlevel.h X ntpsubs.o: ntpsubs.c /usr/include/stdio.h /usr/include/sys/types.h X ntpsubs.o: /usr/include/sys/param.h /usr/include/sys/localopts.h X! ntpsubs.o: /usr/include/machine/machparam.h /usr/include/signal.h X! ntpsubs.o: /usr/include/sys/types.h /usr/include/sys/time.h /usr/include/time.h X! ntpsubs.o: /usr/include/sys/uio.h /usr/include/sys/socket.h X! ntpsubs.o: /usr/include/short_names.h /usr/include/netinet/in.h X! ntpsubs.o: /usr/include/short_names.h /usr/include/arpa/inet.h X! ntpsubs.o: /usr/include/short_names.h /usr/include/errno.h X! ntpsubs.o: /usr/include/syslog.h ntp.h X ntp_proto.o: ntp_proto.c /usr/include/stdio.h /usr/include/sys/types.h X ntp_proto.o: /usr/include/sys/param.h /usr/include/sys/localopts.h X! ntp_proto.o: /usr/include/machine/machparam.h /usr/include/signal.h X! ntp_proto.o: /usr/include/sys/types.h /usr/include/sys/uio.h X! ntp_proto.o: /usr/include/sys/socket.h /usr/include/short_names.h X ntp_proto.o: /usr/include/sys/time.h /usr/include/time.h X ntp_proto.o: /usr/include/sys/ioctl.h /usr/include/sys/ttychars.h X ntp_proto.o: /usr/include/sys/ttydev.h /usr/include/sys/resource.h X ntp_proto.o: /usr/include/net/if.h /usr/include/net/if_arp.h X! ntp_proto.o: /usr/include/netinet/in.h /usr/include/short_names.h X! ntp_proto.o: /usr/include/netinet/in_systm.h /usr/include/netinet/ip.h X! ntp_proto.o: /usr/include/netinet/udp.h /usr/include/arpa/inet.h X! ntp_proto.o: /usr/include/short_names.h /usr/include/netdb.h X! ntp_proto.o: /usr/include/short_names.h /usr/include/strings.h X! ntp_proto.o: /usr/include/errno.h /usr/include/syslog.h ntp.h X ntp_sock.o: ntp_sock.c /usr/include/sys/types.h /usr/include/sys/param.h X ntp_sock.o: /usr/include/sys/localopts.h /usr/include/machine/machparam.h X! ntp_sock.o: /usr/include/signal.h /usr/include/sys/types.h X! ntp_sock.o: /usr/include/sys/ioctl.h /usr/include/sys/ttychars.h X! ntp_sock.o: /usr/include/sys/ttydev.h /usr/include/sys/file.h X! ntp_sock.o: /usr/include/sys/socket.h /usr/include/short_names.h X! ntp_sock.o: /usr/include/netinet/in.h /usr/include/short_names.h X! ntp_sock.o: /usr/include/net/if.h /usr/include/net/if_arp.h X! ntp_sock.o: /usr/include/errno.h /usr/include/syslog.h /usr/include/stdio.h X! ntp_sock.o: ntp.h X ntp_adjust.o: ntp_adjust.c /usr/include/stdio.h /usr/include/sys/types.h X ntp_adjust.o: /usr/include/sys/param.h /usr/include/sys/localopts.h X! ntp_adjust.o: /usr/include/machine/machparam.h /usr/include/signal.h X! ntp_adjust.o: /usr/include/sys/types.h /usr/include/sys/socket.h X! ntp_adjust.o: /usr/include/short_names.h /usr/include/sys/time.h X ntp_adjust.o: /usr/include/time.h /usr/include/sys/ioctl.h X ntp_adjust.o: /usr/include/sys/ttychars.h /usr/include/sys/ttydev.h X ntp_adjust.o: /usr/include/sys/resource.h /usr/include/netinet/in.h X! ntp_adjust.o: /usr/include/short_names.h /usr/include/netinet/in_systm.h X! ntp_adjust.o: /usr/include/netinet/ip.h /usr/include/netinet/udp.h X! ntp_adjust.o: /usr/include/arpa/inet.h /usr/include/short_names.h X! ntp_adjust.o: /usr/include/netdb.h /usr/include/short_names.h X! ntp_adjust.o: /usr/include/strings.h /usr/include/errno.h /usr/include/syslog.h X! ntp_adjust.o: ntp.h X! read_local.o: read_local.c /usr/include/sys/types.h /usr/include/sys/time.h X! read_local.o: /usr/include/time.h X read_psti.o: read_psti.c X X # IF YOU PUT ANYTHING HERE IT WILL GO AWAY X--- 209,287 ---- X X ntp.o: ntp.c /usr/include/stdio.h /usr/include/sys/types.h X ntp.o: /usr/include/sys/param.h /usr/include/sys/localopts.h X! ntp.o: /usr/include/machine/machparam.h /usr/include/sys/types.h X! ntp.o: /usr/include/signal.h /usr/include/sys/types.h /usr/include/sys/time.h X! ntp.o: /usr/include/time.h /usr/include/sys/uio.h /usr/include/sys/socket.h X! ntp.o: /usr/include/sys/ioctl.h /usr/include/sys/ttychars.h X! ntp.o: /usr/include/sys/ttydev.h /usr/include/netinet/in.h X ntp.o: /usr/include/netinet/in_systm.h /usr/include/netinet/ip.h X! ntp.o: /usr/include/netinet/udp.h /usr/include/arpa/inet.h /usr/include/netdb.h X! ntp.o: /usr/include/strings.h /usr/include/errno.h ntp.h X ntpdc.o: ntpdc.c /usr/include/sys/types.h /usr/include/sys/param.h X ntpdc.o: /usr/include/sys/localopts.h /usr/include/machine/machparam.h X! ntpdc.o: /usr/include/sys/types.h /usr/include/signal.h X! ntpdc.o: /usr/include/sys/types.h /usr/include/signal.h /usr/include/sys/uio.h X! ntpdc.o: /usr/include/sys/socket.h /usr/include/sys/time.h /usr/include/time.h X! ntpdc.o: /usr/include/netinet/in.h /usr/include/netinet/udp.h X! ntpdc.o: /usr/include/errno.h /usr/include/stdio.h /usr/include/netdb.h X! ntpdc.o: /usr/include/strings.h /usr/include/arpa/inet.h ntp.h X ntpd.o: ntpd.c /usr/include/stdio.h /usr/include/sys/types.h X ntpd.o: /usr/include/sys/param.h /usr/include/sys/localopts.h X! ntpd.o: /usr/include/machine/machparam.h /usr/include/sys/types.h X! ntpd.o: /usr/include/signal.h /usr/include/sys/types.h /usr/include/sys/uio.h X! ntpd.o: /usr/include/sys/socket.h /usr/include/sys/time.h /usr/include/time.h X! ntpd.o: /usr/include/sys/ioctl.h /usr/include/sys/ttychars.h X! ntpd.o: /usr/include/sys/ttydev.h /usr/include/sys/resource.h X! ntpd.o: /usr/include/sys/file.h /usr/include/net/if.h /usr/include/net/if_arp.h X! ntpd.o: /usr/include/netinet/in.h /usr/include/netinet/in_systm.h X! ntpd.o: /usr/include/netinet/ip.h /usr/include/netinet/udp.h X! ntpd.o: /usr/include/arpa/inet.h /usr/include/netdb.h /usr/include/strings.h X! ntpd.o: /usr/include/errno.h /usr/include/syslog.h /usr/include/nlist.h X! ntpd.o: /usr/include/sys/types.h ntp.h patchlevel.h X ntpsubs.o: ntpsubs.c /usr/include/stdio.h /usr/include/sys/types.h X ntpsubs.o: /usr/include/sys/param.h /usr/include/sys/localopts.h X! ntpsubs.o: /usr/include/machine/machparam.h /usr/include/sys/types.h X! ntpsubs.o: /usr/include/signal.h /usr/include/sys/types.h X! ntpsubs.o: /usr/include/sys/time.h /usr/include/time.h /usr/include/sys/uio.h X! ntpsubs.o: /usr/include/sys/socket.h /usr/include/netinet/in.h X! ntpsubs.o: /usr/include/arpa/inet.h /usr/include/errno.h /usr/include/syslog.h X! ntpsubs.o: ntp.h X ntp_proto.o: ntp_proto.c /usr/include/stdio.h /usr/include/sys/types.h X ntp_proto.o: /usr/include/sys/param.h /usr/include/sys/localopts.h X! ntp_proto.o: /usr/include/machine/machparam.h /usr/include/sys/types.h X! ntp_proto.o: /usr/include/signal.h /usr/include/sys/types.h X! ntp_proto.o: /usr/include/sys/uio.h /usr/include/sys/socket.h X ntp_proto.o: /usr/include/sys/time.h /usr/include/time.h X ntp_proto.o: /usr/include/sys/ioctl.h /usr/include/sys/ttychars.h X ntp_proto.o: /usr/include/sys/ttydev.h /usr/include/sys/resource.h X ntp_proto.o: /usr/include/net/if.h /usr/include/net/if_arp.h X! ntp_proto.o: /usr/include/netinet/in.h /usr/include/netinet/in_systm.h X! ntp_proto.o: /usr/include/netinet/ip.h /usr/include/netinet/udp.h X! ntp_proto.o: /usr/include/arpa/inet.h /usr/include/netdb.h X! ntp_proto.o: /usr/include/strings.h /usr/include/errno.h /usr/include/syslog.h X! ntp_proto.o: ntp.h X ntp_sock.o: ntp_sock.c /usr/include/sys/types.h /usr/include/sys/param.h X ntp_sock.o: /usr/include/sys/localopts.h /usr/include/machine/machparam.h X! ntp_sock.o: /usr/include/sys/types.h /usr/include/signal.h X! ntp_sock.o: /usr/include/sys/types.h /usr/include/sys/ioctl.h X! ntp_sock.o: /usr/include/sys/ttychars.h /usr/include/sys/ttydev.h X! ntp_sock.o: /usr/include/sys/file.h /usr/include/sys/socket.h X! ntp_sock.o: /usr/include/netinet/in.h /usr/include/net/if.h X! ntp_sock.o: /usr/include/net/if_arp.h /usr/include/errno.h X! ntp_sock.o: /usr/include/syslog.h /usr/include/stdio.h ntp.h X ntp_adjust.o: ntp_adjust.c /usr/include/stdio.h /usr/include/sys/types.h X ntp_adjust.o: /usr/include/sys/param.h /usr/include/sys/localopts.h X! ntp_adjust.o: /usr/include/machine/machparam.h /usr/include/sys/types.h X! ntp_adjust.o: /usr/include/signal.h /usr/include/sys/types.h X! ntp_adjust.o: /usr/include/sys/socket.h /usr/include/sys/time.h X ntp_adjust.o: /usr/include/time.h /usr/include/sys/ioctl.h X ntp_adjust.o: /usr/include/sys/ttychars.h /usr/include/sys/ttydev.h X ntp_adjust.o: /usr/include/sys/resource.h /usr/include/netinet/in.h X! ntp_adjust.o: /usr/include/netinet/in_systm.h /usr/include/netinet/ip.h X! ntp_adjust.o: /usr/include/netinet/udp.h /usr/include/arpa/inet.h X! ntp_adjust.o: /usr/include/netdb.h /usr/include/strings.h /usr/include/errno.h X! ntp_adjust.o: /usr/include/syslog.h ntp.h X! read_local.o: read_local.c X read_psti.o: read_psti.c X X # IF YOU PUT ANYTHING HERE IT WILL GO AWAY X*** /usr/src/new/news/src/uname.c.old Sat Mar 5 09:47:10 1988 X--- /usr/src/new/news/src/uname.c Fri Dec 31 22:49:38 1993 X*************** X*** 21,32 **** X */ X X #ifdef SCCSID X! static char *SccsId = "@(#)uname.c 2.17 11/19/87"; X #endif /* SCCSID */ X- X- #ifdef BSD2_10 X- #include X- #endif /* BSD2_10 */ X X #include "params.h" X X--- 21,28 ---- X */ X X #ifdef SCCSID X! static char *SccsId = "@(#)uname.c 2.17.1 12/31/93"; X #endif /* SCCSID */ X X #include "params.h" X X*** /usr/src/new/tcsh/sh.c.old Wed Aug 21 13:23:39 1991 X--- /usr/src/new/tcsh/sh.c Sun Jan 2 22:47:24 1994 X*************** X*** 352,360 **** X { X char cbuff[MAXHOSTNAMELEN]; X X- #ifdef pdp11 X- #define gethostname gethnam X- #endif X if (gethostname(cbuff, sizeof(cbuff)) >= 0) { X cbuff[sizeof(cbuff) - 1] = '\0'; /* just in case */ X Setenv(STRHST, str2short(cbuff)); X--- 352,357 ---- X*** /usr/src/new/kermit5.188/makefile.old Tue Nov 24 21:05:57 1992 X--- /usr/src/new/kermit5.188/makefile Sun Jan 16 19:26:21 1994 X*************** X*** 71,81 **** X EXT=o X DFLAGS="-O -DBSD43 -DLCKDIR -DNODEBUG -DNOTLOG -DMINIDIAL \ X -DNOCSETS -DNOHELP -DNOSCRIPT -DNOSPL -DNOXMIT -DNOSETBUF $(KFLAGS) \ X! -DSTR_FILE=\\\"/usr/local/lib/kermit5.sr\\\" -Dgethostname=gethnam \ X -DSTR_CTIMED=\\\"/usr/lib/ctimed\\\"" X EFLAGS=-O -DBSD43 -DLCKDIR -DNODEBUG -DNOTLOG -DMINIDIAL \ X -DNOCSETS -DNOHELP -DNOSCRIPT -DNOSPL -DNOXMIT -DNOSETBUF $(KFLAGS) \ X! -DSTR_FILE=\\\"/usr/local/lib/kermit5.sr\\\" -Dgethostname=gethnam \ X -DSTR_CTIMED=\\\"/usr/lib/ctimed\\\" X LNKFLAGS= -i X CC=./ckustr.sed X--- 71,81 ---- X EXT=o X DFLAGS="-O -DBSD43 -DLCKDIR -DNODEBUG -DNOTLOG -DMINIDIAL \ X -DNOCSETS -DNOHELP -DNOSCRIPT -DNOSPL -DNOXMIT -DNOSETBUF $(KFLAGS) \ X! -DSTR_FILE=\\\"/usr/local/lib/kermit5.sr\\\" \ X -DSTR_CTIMED=\\\"/usr/lib/ctimed\\\"" X EFLAGS=-O -DBSD43 -DLCKDIR -DNODEBUG -DNOTLOG -DMINIDIAL \ X -DNOCSETS -DNOHELP -DNOSCRIPT -DNOSPL -DNOXMIT -DNOSETBUF $(KFLAGS) \ X! -DSTR_FILE=\\\"/usr/local/lib/kermit5.sr\\\" \ X -DSTR_CTIMED=\\\"/usr/lib/ctimed\\\" X LNKFLAGS= -i X CC=./ckustr.sed SHAR_EOF fi exit 0 # End of shell archive