Subject: Object file symbols limited to 8 characters [+FIX] (#174 - #17 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 (#17 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 #174 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

==========  #174 (Part #17 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/usr.lib/libcurses/Makefile
/usr/src/usr.lib/libI77/dofio.c
/usr/src/usr.lib/libI77/nmlio.h
/usr/src/usr.lib/libI77/rsnmle.c
/usr/src/usr.lib/libln/reject.c
/usr/src/usr.lib/libplot/gigi/gigi.h
/usr/src/usr.lib/libplot/gigi/Makefile
/usr/src/usr.lib/libplot/plot/Makefile
/usr/src/usr.lib/libplot/aed/Makefile
/usr/src/usr.lib/libplot/t4013/Makefile
/usr/src/usr.lib/libplot/tf77/Makefile
/usr/src/usr.lib/libplot/t300/Makefile
/usr/src/usr.lib/libplot/t300s/Makefile
/usr/src/usr.lib/libplot/t4014/Makefile
/usr/src/usr.lib/libplot/t450/Makefile
/usr/src/usr.lib/libplot/hp2648/hp2648.h
/usr/src/usr.lib/libplot/hp2648/Makefile
/usr/src/usr.lib/libplot/vt0/Makefile
/usr/src/usr.lib/libplot/hp7221/hp7221.h
/usr/src/usr.lib/libplot/hp7221/Makefile
/usr/src/usr.lib/libplot/dumb/dumb.h
/usr/src/usr.lib/libplot/dumb/Makefile
/usr/src/usr.lib/libplot/bitgraph/arc.c
/usr/src/usr.lib/libplot/bitgraph/bg.h
/usr/src/usr.lib/libplot/bitgraph/Makefile
/usr/src/usr.lib/libplot/imagen/Makefile
/usr/src/usr.lib/sendmail/src/daemon.c
/usr/src/usr.lib/sendmail/src/conf.h
/usr/src/usr.lib/sendmail/src/conf.c
/usr/src/usr.lib/lpr/filters/vplotf.c
/usr/src/usr.lib/lpr/lpr.c
/usr/src/usr.lib/lpr/cmds.c
/usr/src/usr.lib/lpr/cmdtab.c
/usr/src/usr.lib/lpr/lpd.c
/usr/src/usr.lib/lpr/lpc.c
/usr/src/usr.lib/lpr/recvjob.c
/usr/src/usr.lib/lpr/startdaemon.c
/usr/src/usr.lib/libutil/Makefile
/usr/src/usr.lib/sendmail.MX/src/conf.c
/usr/src/usr.lib/sendmail.MX/src/conf.h
/usr/src/usr.lib/sendmail.MX/src/err.c

	0) Be in a temp directory ("cd /tmp" or "cd /usr/tmp")

	1) Save the following shar archive to a file (/tmp/174 for example)

	2) Unpack the archive:  sh 174

	3) Patch the files:  patch -p0 < patchfile

	4) rm 174 patchfile

	Part 17 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:32:47 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/usr.lib/libcurses/Makefile.old	Sat Jul 25 16:04:22 1987
X--- /usr/src/usr.lib/libcurses/Makefile	Sun Jan  2 00:30:50 1994
X***************
X*** 1,9 ****
X- #
X  # Copyright (c) 1980 Regents of the University of California.
X  # All rights reserved.  The Berkeley software License Agreement
X  # specifies the terms and conditions for redistribution.
X  #
X! #	@(#)Makefile	5.1 (Berkeley) 6/7/85
X  #
X  # curses package
X  #
X--- 1,8 ----
X  # Copyright (c) 1980 Regents of the University of California.
X  # All rights reserved.  The Berkeley software License Agreement
X  # specifies the terms and conditions for redistribution.
X  #
X! #	@(#)Makefile	5.2 (2.11BSD GTE) 1/2/94
X  #
X  # curses package
X  #
X***************
X*** 35,44 ****
X  
X  libcurses libcurses_p: ${OBJS}
X  	@echo building profiled libcurses
X! 	@cd profiled; ar cu ../libcurses_p ${OBJS}
X  	ranlib libcurses_p
X  	@echo building normal libcurses
X! 	@ar cu libcurses ${OBJS}
X  	ranlib libcurses
X  
X  install: libcurses libcurses_p
X--- 34,43 ----
X  
X  libcurses libcurses_p: ${OBJS}
X  	@echo building profiled libcurses
X! 	@cd profiled; ar ru ../libcurses_p ${OBJS}
X  	ranlib libcurses_p
X  	@echo building normal libcurses
X! 	@ar ru libcurses ${OBJS}
X  	ranlib libcurses
X  
X  install: libcurses libcurses_p
X*** /usr/src/usr.lib/libI77/dofio.c.old	Sat Feb 21 22:24:28 1987
X--- /usr/src/usr.lib/libI77/dofio.c	Mon Jan 10 23:02:36 1994
X***************
X*** 3,9 ****
X   * All rights reserved.  The Berkeley software License Agreement
X   * specifies the terms and conditions for redistribution.
X   *
X!  *	@(#)dofio.c	5.1	6/7/85
X   */
X  
X  /*
X--- 3,9 ----
X   * All rights reserved.  The Berkeley software License Agreement
X   * specifies the terms and conditions for redistribution.
X   *
X!  *	@(#)dofio.c	5.1.1	1/1/94
X   */
X  
X  /*
X***************
X*** 31,41 ****
X  		  ED  for I,IM,F,E,EE,D,DE,G,GE,L,A,AW
X  		  and returns op for other values 
X   */
X! #ifdef BSD2_10
X! 	LOCAL int optypes[] = OP_TYPE_TAB;
X! #else
X! 	LOCAL int optypes[] = { OP_TYPE_TAB };
X! #endif
X  LOCAL int rep_count, in_mid;
X  
X  do_fio(number,ptr,len) ftnint *number; ftnlen len; char *ptr;
X--- 31,38 ----
X  		  ED  for I,IM,F,E,EE,D,DE,G,GE,L,A,AW
X  		  and returns op for other values 
X   */
X! 
X! LOCAL int optypes[] = OP_TYPE_TAB;
X  LOCAL int rep_count, in_mid;
X  
X  do_fio(number,ptr,len) ftnint *number; ftnlen len; char *ptr;
X*** /usr/src/usr.lib/libI77/nmlio.h.old	Sat Feb 21 22:50:39 1987
X--- /usr/src/usr.lib/libI77/nmlio.h	Mon Jan 10 23:03:14 1994
X***************
X*** 3,9 ****
X   * All rights reserved.  The Berkeley software License Agreement
X   * specifies the terms and conditions for redistribution.
X   *
X!  *	@(#)nmlio.h	5.1	7/30/85
X   */
X  
X  /*	header for namelist I/O */
X--- 3,9 ----
X   * All rights reserved.  The Berkeley software License Agreement
X   * specifies the terms and conditions for redistribution.
X   *
X!  *	@(#)nmlio.h	5.1.1	1/1/94
X   */
X  
X  /*	header for namelist I/O */
X***************
X*** 10,22 ****
X  
X  #define ERRNM(x)	if(n=(x)) return(n);
X  #define VL		16	/* variable name length from f77pass1/defs.h */
X- 
X- #ifdef BSD2_10
X- #define	namelistkey_		nmlkey_
X- #define	namelistname		nmlname
X- #define	namelistentry		nmletry
X- #define	namelist_arglist	nmlargl
X- #endif
X  
X  extern char namelistkey_;
X  
X--- 10,15 ----
X*** /usr/src/usr.lib/libI77/rsnmle.c.old	Sat Feb 21 23:12:37 1987
X--- /usr/src/usr.lib/libI77/rsnmle.c	Mon Jan 10 23:02:56 1994
X***************
X*** 3,9 ****
X   * All rights reserved.  The Berkeley software License Agreement
X   * specifies the terms and conditions for redistribution.
X   *
X!  *	@(#)rsnmle.c	5.3	8/28/85
X   */
X  
X  /*
X--- 3,9 ----
X   * All rights reserved.  The Berkeley software License Agreement
X   * specifies the terms and conditions for redistribution.
X   *
X!  *	@(#)rsnmle.c	5.3.1	1/1/94
X   */
X  
X  /*
X***************
X*** 238,244 ****
X  		cnt++;
X  	}
X  	UNGETC();
X! #ifndef BSD2_10
X  	if(ch == 'EOF') return EOF;
X  #endif
X  	if(cnt == 0 ) return F_ERNMLIST;
X--- 238,244 ----
X  		cnt++;
X  	}
X  	UNGETC();
X! #ifndef pdp11
X  	if(ch == 'EOF') return EOF;
X  #endif
X  	if(cnt == 0 ) return F_ERNMLIST;
X*** /usr/src/usr.lib/libln/reject.c.old	Sun Feb 22 00:56:32 1987
X--- /usr/src/usr.lib/libln/reject.c	Sat Jan  1 02:38:19 1994
X***************
X*** 2,8 ****
X  
X  # include <stdio.h>
X  
X! #ifdef BSD2_10
X  extern FILE *yyout, *yyin;
X  extern int yyprevious , *yyfnd;
X  extern char yyextra[];
X--- 2,8 ----
X  
X  # include <stdio.h>
X  
X! #ifdef pdp11
X  extern FILE *yyout, *yyin;
X  extern int yyprevious , *yyfnd;
X  extern char yyextra[];
X*** /usr/src/usr.lib/libplot/gigi/gigi.h.old	Sun Feb 22 02:58:18 1987
X--- /usr/src/usr.lib/libplot/gigi/gigi.h	Mon Jan 10 22:56:16 1994
X***************
X*** 3,9 ****
X   * All rights reserved.  The Berkeley software License Agreement
X   * specifies the terms and conditions for redistribution.
X   *
X!  *	@(#)gigi.h	5.1 (Berkeley) 5/7/85
X   */
X  
X  /*
X--- 3,9 ----
X   * All rights reserved.  The Berkeley software License Agreement
X   * specifies the terms and conditions for redistribution.
X   *
X!  *	@(#)gigi.h	5.1.1 (2.11BSD GTE) 1/1/94
X   */
X  
X  /*
X***************
X*** 24,34 ****
X  #define YMAX	479
X  #define xsc(xi)	((int) ((xi -lowx)*scalex +0.5))
X  #define ysc(yi)	((int) (YMAX - (yi - lowy)*scaley +0.5))
X- 
X- #ifdef BSD2_10
X- #define	currentx	crnt_x
X- #define	currenty	crnt_y
X- #endif
X  
X  extern int currentx;
X  extern int currenty;
X--- 24,29 ----
X*** /usr/src/usr.lib/libplot/gigi/Makefile.old	Mon Jan 18 09:37:51 1993
X--- /usr/src/usr.lib/libplot/gigi/Makefile	Sun Jan  2 00:15:08 1994
X***************
X*** 1,9 ****
X- #
X  # Copyright (c) 1980 Regents of the University of California.
X  # All rights reserved.  The Berkeley software License Agreement
X  # specifies the terms and conditions for redistribution.
X  #
X! #	@(#)Makefile	5.1 (Berkeley) 5/7/85
X  #
X  #
X  CFLAGS=	-O
X--- 1,8 ----
X  # Copyright (c) 1980 Regents of the University of California.
X  # All rights reserved.  The Berkeley software License Agreement
X  # specifies the terms and conditions for redistribution.
X  #
X! #	@(#)Makefile	5.2 (2.11BSD GTE) 1/2/94
X  #
X  #
X  CFLAGS=	-O
X***************
X*** 11,17 ****
X  	line.o linemod.o move.o open.o point.o space.o
X  
X  ../libplotgigi:	${OBJS}
X! 	ar cu ../libplotgigi ${OBJS}
X  
X  ${OBJS}:	gigi.h
X  
X--- 10,16 ----
X  	line.o linemod.o move.o open.o point.o space.o
X  
X  ../libplotgigi:	${OBJS}
X! 	ar ru ../libplotgigi ${OBJS}
X  
X  ${OBJS}:	gigi.h
X  
X*** /usr/src/usr.lib/libplot/plot/Makefile.old	Mon Jan 18 09:37:54 1993
X--- /usr/src/usr.lib/libplot/plot/Makefile	Sun Jan  2 00:16:44 1994
X***************
X*** 1,4 ****
X! #	Makefile	4.2	83/07/09
X  #
X  CFLAGS=	-O
X  OBJS=	arc.o box.o circle.o close.o cont.o dot.o erase.o label.o \
X--- 1,4 ----
X! #	Makefile	4.3	1/2/94
X  #
X  CFLAGS=	-O
X  OBJS=	arc.o box.o circle.o close.o cont.o dot.o erase.o label.o \
X***************
X*** 5,11 ****
X  	line.o linmod.o move.o open.o point.o putsi.o space.o
X  
X  ../libplot:	${OBJS}
X! 	ar cu ../libplot ${OBJS}
X  
X  clean:
X  	rm -f ${OBJS} errs a.out core
X--- 5,11 ----
X  	line.o linmod.o move.o open.o point.o putsi.o space.o
X  
X  ../libplot:	${OBJS}
X! 	ar ru ../libplot ${OBJS}
X  
X  clean:
X  	rm -f ${OBJS} errs a.out core
X*** /usr/src/usr.lib/libplot/aed/Makefile.old	Mon Jan 18 09:37:48 1993
X--- /usr/src/usr.lib/libplot/aed/Makefile	Sun Jan  2 00:14:12 1994
X***************
X*** 1,9 ****
X- #
X  # Copyright (c) 1980 Regents of the University of California.
X  # All rights reserved.  The Berkeley software License Agreement
X  # specifies the terms and conditions for redistribution.
X  #
X! #	@(#)Makefile	5.1 (Berkeley) 6/5/85
X  #
X  CFLAGS=	-O
X  OBJS=	arc.o box.o circle.o close.o cont.o dot.o erase.o label.o \
X--- 1,8 ----
X  # Copyright (c) 1980 Regents of the University of California.
X  # All rights reserved.  The Berkeley software License Agreement
X  # specifies the terms and conditions for redistribution.
X  #
X! #	@(#)Makefile	5.2 (2.11BSD GTE) 1/2/94
X  #
X  CFLAGS=	-O
X  OBJS=	arc.o box.o circle.o close.o cont.o dot.o erase.o label.o \
X***************
X*** 10,16 ****
X  	line.o linemod.o move.o open.o point.o space.o subr.o
X  
X  ../libplotaed:	${OBJS}
X! 	ar cu ../libplotaed ${OBJS}
X  
X  ${OBJS}:	aed.h
X  
X--- 9,15 ----
X  	line.o linemod.o move.o open.o point.o space.o subr.o
X  
X  ../libplotaed:	${OBJS}
X! 	ar ru ../libplotaed ${OBJS}
X  
X  ${OBJS}:	aed.h
X  
X*** /usr/src/usr.lib/libplot/t4013/Makefile.old	Mon Jan 18 09:37:57 1993
X--- /usr/src/usr.lib/libplot/t4013/Makefile	Sun Jan  2 00:18:56 1994
X***************
X*** 1,9 ****
X- #
X  # Copyright (c) 1980 Regents of the University of California.
X  # All rights reserved.  The Berkeley software License Agreement
X  # specifies the terms and conditions for redistribution.
X  #
X! #	@(#)Makefile	5.1 (Berkeley) 6/7/85
X  #
X  CFLAGS=	-O
X  OBJS=	arc.o box.o circle.o close.o dot.o erase.o label.o \
X--- 1,8 ----
X  # Copyright (c) 1980 Regents of the University of California.
X  # All rights reserved.  The Berkeley software License Agreement
X  # specifies the terms and conditions for redistribution.
X  #
X! #	@(#)Makefile	5.2 (2.11BSD GTE) 1/2/94
X  #
X  CFLAGS=	-O
X  OBJS=	arc.o box.o circle.o close.o dot.o erase.o label.o \
X***************
X*** 10,16 ****
X  	line.o linemod.o move.o open.o point.o space.o subr.o
X  
X  ../lib4013:	${OBJS}
X! 	ar cu ../lib4013 `lorder ${OBJS} | tsort`
X  
X  clean:
X  	rm -f ${OBJS} errs a.out core
X--- 9,15 ----
X  	line.o linemod.o move.o open.o point.o space.o subr.o
X  
X  ../lib4013:	${OBJS}
X! 	ar ru ../lib4013 `lorder ${OBJS} | tsort`
X  
X  clean:
X  	rm -f ${OBJS} errs a.out core
X*** /usr/src/usr.lib/libplot/tf77/Makefile.old	Mon Jan 18 09:37:59 1993
X--- /usr/src/usr.lib/libplot/tf77/Makefile	Sun Jan  2 00:19:59 1994
X***************
X*** 1,9 ****
X- #
X  # Copyright (c) 1980 Regents of the University of California.
X  # All rights reserved.  The Berkeley software License Agreement
X  # specifies the terms and conditions for redistribution.
X  #
X! #	@(#)Makefile	5.1 (Berkeley) 6/7/85
X  #
X  CFLAGS=	-O
X  
X--- 1,8 ----
X  # Copyright (c) 1980 Regents of the University of California.
X  # All rights reserved.  The Berkeley software License Agreement
X  # specifies the terms and conditions for redistribution.
X  #
X! #	@(#)Makefile	5.2 (2.11BSD GTE) 1/2/94
X  #
X  CFLAGS=	-O
X  
X***************
X*** 11,17 ****
X  	line.o linemd.o move.o open.o point.o space.o
X  
X  ../libf77plot:	${OBJS}
X! 	ar cu ../libf77plot `lorder ${OBJS} | tsort`
X  
X  clean:
X  	rm -f ${OBJS} errs a.out core
X--- 10,16 ----
X  	line.o linemd.o move.o open.o point.o space.o
X  
X  ../libf77plot:	${OBJS}
X! 	ar ru ../libf77plot `lorder ${OBJS} | tsort`
X  
X  clean:
X  	rm -f ${OBJS} errs a.out core
X*** /usr/src/usr.lib/libplot/t300/Makefile.old	Mon Jan 18 09:37:55 1993
X--- /usr/src/usr.lib/libplot/t300/Makefile	Sun Jan  2 00:18:15 1994
X***************
X*** 1,4 ****
X! #	Makefile	4.3	83/09/21
X  #
X  CFLAGS=	-O
X  OBJS=	arc.o box.o circle.o close.o dot.o erase.o label.o \
X--- 1,4 ----
X! #	Makefile	4.4	1/2/94
X  #
X  CFLAGS=	-O
X  OBJS=	arc.o box.o circle.o close.o dot.o erase.o label.o \
X***************
X*** 5,11 ****
X  	line.o linmod.o move.o open.o point.o space.o subr.o
X  
X  ../lib300:	${OBJS}
X! 	ar cu ../lib300 ${OBJS}
X  
X  clean:
X  	rm -f ${OBJS} errs a.out core
X--- 5,11 ----
X  	line.o linmod.o move.o open.o point.o space.o subr.o
X  
X  ../lib300:	${OBJS}
X! 	ar ru ../lib300 ${OBJS}
X  
X  clean:
X  	rm -f ${OBJS} errs a.out core
X*** /usr/src/usr.lib/libplot/t300s/Makefile.old	Mon Jan 18 09:37:56 1993
X--- /usr/src/usr.lib/libplot/t300s/Makefile	Sun Jan  2 00:18:30 1994
X***************
X*** 1,4 ****
X! #	Makefile	4.3	83/09/21
X  #
X  CFLAGS=	-O
X  OBJS=	arc.o box.o circle.o close.o dot.o erase.o label.o \
X--- 1,4 ----
X! #	Makefile	4.4	1/2/94
X  #
X  CFLAGS=	-O
X  OBJS=	arc.o box.o circle.o close.o dot.o erase.o label.o \
X***************
X*** 5,11 ****
X  	line.o linmod.o move.o open.o point.o space.o subr.o
X  
X  ../lib300s:	${OBJS}
X! 	ar cu ../lib300s ${OBJS}
X  
X  clean:
X  	rm -f ${OBJS} errs a.out core
X--- 5,11 ----
X  	line.o linmod.o move.o open.o point.o space.o subr.o
X  
X  ../lib300s:	${OBJS}
X! 	ar ru ../lib300s ${OBJS}
X  
X  clean:
X  	rm -f ${OBJS} errs a.out core
X*** /usr/src/usr.lib/libplot/t4014/Makefile.old	Mon Jan 18 09:37:57 1993
X--- /usr/src/usr.lib/libplot/t4014/Makefile	Sun Jan  2 00:19:11 1994
X***************
X*** 1,4 ****
X! #	Makefile	4.5	85/01/02
X  #
X  CFLAGS=	-O
X  OBJS=	arc.o box.o circle.o close.o dot.o erase.o label.o \
X--- 1,4 ----
X! #	Makefile	4.6	1/2/94
X  #
X  CFLAGS=	-O
X  OBJS=	arc.o box.o circle.o close.o dot.o erase.o label.o \
X***************
X*** 5,11 ****
X  	line.o linemod.o move.o open.o point.o space.o subr.o
X  
X  ../lib4014:	${OBJS}
X! 	ar cu ../lib4014 `lorder ${OBJS} | tsort`
X  
X  clean:
X  	rm -f ${OBJS} errs a.out core
X--- 5,11 ----
X  	line.o linemod.o move.o open.o point.o space.o subr.o
X  
X  ../lib4014:	${OBJS}
X! 	ar ru ../lib4014 `lorder ${OBJS} | tsort`
X  
X  clean:
X  	rm -f ${OBJS} errs a.out core
X*** /usr/src/usr.lib/libplot/t450/Makefile.old	Mon Jan 18 09:37:58 1993
X--- /usr/src/usr.lib/libplot/t450/Makefile	Sun Jan  2 00:19:28 1994
X***************
X*** 1,4 ****
X! #	Makefile	4.3	83/09/21
X  #
X  CFLAGS=	-O
X  OBJS=	arc.o box.o circle.o close.o dot.o erase.o label.o \
X--- 1,4 ----
X! #	Makefile	4.4	1/2/94
X  #
X  CFLAGS=	-O
X  OBJS=	arc.o box.o circle.o close.o dot.o erase.o label.o \
X***************
X*** 5,11 ****
X  	line.o linmod.o move.o open.o point.o space.o subr.o
X  
X  ../lib450:	${OBJS}
X! 	ar cu ../lib450 ${OBJS}
X  
X  clean:
X  	rm -f ${OBJS} errs a.out core
X--- 5,11 ----
X  	line.o linmod.o move.o open.o point.o space.o subr.o
X  
X  ../lib450:	${OBJS}
X! 	ar ru ../lib450 ${OBJS}
X  
X  clean:
X  	rm -f ${OBJS} errs a.out core
X*** /usr/src/usr.lib/libplot/hp2648/hp2648.h.old	Sun Feb 22 03:10:47 1987
X--- /usr/src/usr.lib/libplot/hp2648/hp2648.h	Mon Jan 10 22:56:47 1994
X***************
X*** 3,9 ****
X   * All rights reserved.  The Berkeley software License Agreement
X   * specifies the terms and conditions for redistribution.
X   *
X!  *	@(#)hp2648.h	5.1 (Berkeley) 5/7/85
X   *
X   *
X   * Displays plot files on an hp2648a graphics terminals.  I have heard
X--- 3,9 ----
X   * All rights reserved.  The Berkeley software License Agreement
X   * specifies the terms and conditions for redistribution.
X   *
X!  *	@(#)hp2648.h	5.1.1 (2.11BSD GTE) 1/1/94
X   *
X   *
X   * Displays plot files on an hp2648a graphics terminals.  I have heard
X***************
X*** 13,19 ****
X  
X  #include <stdio.h>
X  
X! #ifdef BSD2_10
X  #include <sys/ioctl.h>
X  #endif
X  
X--- 13,19 ----
X  
X  #include <stdio.h>
X  
X! #ifdef pdp11
X  #include <sys/ioctl.h>
X  #endif
X  
X***************
X*** 38,48 ****
X  #define ysc(yi) ((int) (yi - lowy) * scaley + 0.5)
X  
X  extern int shakehands;
X- 
X- #ifdef BSD2_10
X- #define	currentx	crnt_x
X- #define	currenty	crnt_y
X- #endif
X  
X  extern int currentx;
X  extern int currenty;
X--- 38,43 ----
X*** /usr/src/usr.lib/libplot/hp2648/Makefile.old	Mon Jan 18 09:37:52 1993
X--- /usr/src/usr.lib/libplot/hp2648/Makefile	Sun Jan  2 00:15:27 1994
X***************
X*** 1,9 ****
X- #
X  # Copyright (c) 1980 Regents of the University of California.
X  # All rights reserved.  The Berkeley software License Agreement
X  # specifies the terms and conditions for redistribution.
X  #
X! #	@(#)Makefile	5.1 (Berkeley) 5/7/85
X  #
X  #
X  CFLAGS=	-O
X--- 1,8 ----
X  # Copyright (c) 1980 Regents of the University of California.
X  # All rights reserved.  The Berkeley software License Agreement
X  # specifies the terms and conditions for redistribution.
X  #
X! #	@(#)Makefile	5.2 (2.11BSD GTE) 1/2/94
X  #
X  #
X  CFLAGS=	-O
X***************
X*** 11,17 ****
X  	line.o linemod.o move.o open.o point.o space.o subr.o
X  
X  ../libplot2648:	${OBJS}
X! 	ar cu ../libplot2648 ${OBJS}
X  
X  ${OBJS}:	hp2648.h
X  
X--- 10,16 ----
X  	line.o linemod.o move.o open.o point.o space.o subr.o
X  
X  ../libplot2648:	${OBJS}
X! 	ar ru ../libplot2648 ${OBJS}
X  
X  ${OBJS}:	hp2648.h
X  
X*** /usr/src/usr.lib/libplot/vt0/Makefile.old	Mon Jan 18 09:38:00 1993
X--- /usr/src/usr.lib/libplot/vt0/Makefile	Sun Jan  2 00:20:15 1994
X***************
X*** 1,4 ****
X! #	Makefile	4.3	83/07/09
X  #
X  CFLAGS=	-O
X  OBJS=	arc.o box.o circle.o close.o dot.o erase.o label.o \
X--- 1,4 ----
X! #	Makefile	4.4	1/2/94
X  #
X  CFLAGS=	-O
X  OBJS=	arc.o box.o circle.o close.o dot.o erase.o label.o \
X***************
X*** 5,11 ****
X  	line.o linmod.o move.o open.o point.o space.o subr.o
X  
X  ../libvt0:	${OBJS}
X! 	ar cu ../libvt0 ${OBJS}
X  
X  clean:
X  	rm -f ${OBJS} errs a.out core
X--- 5,11 ----
X  	line.o linmod.o move.o open.o point.o space.o subr.o
X  
X  ../libvt0:	${OBJS}
X! 	ar ru ../libvt0 ${OBJS}
X  
X  clean:
X  	rm -f ${OBJS} errs a.out core
X*** /usr/src/usr.lib/libplot/hp7221/hp7221.h.old	Sun Feb 22 03:12:25 1987
X--- /usr/src/usr.lib/libplot/hp7221/hp7221.h	Mon Jan 10 23:01:08 1994
X***************
X*** 3,9 ****
X   * All rights reserved.  The Berkeley software License Agreement
X   * specifies the terms and conditions for redistribution.
X   *
X!  *	@(#)hp7221.h	5.1 (Berkeley) 5/7/85
X   *
X   *
X   * Displays plot files on an HP7221 plotter.
X--- 3,9 ----
X   * All rights reserved.  The Berkeley software License Agreement
X   * specifies the terms and conditions for redistribution.
X   *
X!  *	@(#)hp7221.h	5.1.1 (2.11BSD) 1/1/94
X   *
X   *
X   * Displays plot files on an HP7221 plotter.
X***************
X*** 26,36 ****
X  
X  #define scaleX(xi)	((int) ((xi - lowx)*scale +0.5))
X  #define scaleY(yi)	((int) ((yi - lowy)*scale +0.5))
X- 
X- #ifdef BSD2_10
X- #define	currentx	crnt_x
X- #define	currenty	crnt_y
X- #endif
X  
X  extern int currentx;
X  extern int currenty;
X--- 26,31 ----
X*** /usr/src/usr.lib/libplot/hp7221/Makefile.old	Mon Jan 18 09:37:52 1993
X--- /usr/src/usr.lib/libplot/hp7221/Makefile	Sun Jan  2 00:15:52 1994
X***************
X*** 1,9 ****
X- #
X  # Copyright (c) 1980 Regents of the University of California.
X  # All rights reserved.  The Berkeley software License Agreement
X  # specifies the terms and conditions for redistribution.
X  #
X! #	@(#)Makefile	5.1 (Berkeley) 5/7/85
X  #
X  #
X  CFLAGS=	-O
X--- 1,8 ----
X  # Copyright (c) 1980 Regents of the University of California.
X  # All rights reserved.  The Berkeley software License Agreement
X  # specifies the terms and conditions for redistribution.
X  #
X! #	@(#)Makefile	5.2 (2.11BSD) 1/2/94
X  #
X  #
X  CFLAGS=	-O
X***************
X*** 11,17 ****
X  	line.o linemod.o move.o open.o point.o space.o subr.o
X  
X  ../libplot7221:	${OBJS}
X! 	ar cu ../libplot7221 ${OBJS}
X  
X  ${OBJS}:	hp7221.h
X  
X--- 10,16 ----
X  	line.o linemod.o move.o open.o point.o space.o subr.o
X  
X  ../libplot7221:	${OBJS}
X! 	ar ru ../libplot7221 ${OBJS}
X  
X  ${OBJS}:	hp7221.h
X  
X*** /usr/src/usr.lib/libplot/dumb/dumb.h.old	Sun Feb 22 02:48:04 1987
X--- /usr/src/usr.lib/libplot/dumb/dumb.h	Mon Jan 10 23:01:28 1994
X***************
X*** 3,9 ****
X   * All rights reserved.  The Berkeley software License Agreement
X   * specifies the terms and conditions for redistribution.
X   *
X!  *	@(#)dumb.h	5.1 (Berkeley) 5/7/85
X   *
X   *
X   * This accepts plot file formats and produces the appropriate plots
X--- 3,9 ----
X   * All rights reserved.  The Berkeley software License Agreement
X   * specifies the terms and conditions for redistribution.
X   *
X!  *	@(#)dumb.h	5.1.1 (2.11BSD GTE) 1/1/94
X   *
X   *
X   * This accepts plot file formats and produces the appropriate plots
X***************
X*** 19,29 ****
X  
X  extern int minX, rangeX;	/* min and range of x */
X  extern int minY, rangeY;	/* min and range of y */
X- 
X- #ifdef BSD2_10
X- #define	currentx	crnt_x
X- #define	currenty	crnt_y
X- #endif
X  
X  extern int currentx, currenty;
X  extern int COLS, LINES;
X--- 19,24 ----
X*** /usr/src/usr.lib/libplot/dumb/Makefile.old	Mon Jan 18 09:37:50 1993
X--- /usr/src/usr.lib/libplot/dumb/Makefile	Sun Jan  2 00:14:50 1994
X***************
X*** 1,9 ****
X- #
X  # Copyright (c) 1980 Regents of the University of California.
X  # All rights reserved.  The Berkeley software License Agreement
X  # specifies the terms and conditions for redistribution.
X  #
X! #	@(#)Makefile	5.1 (Berkeley) 5/7/85
X  #
X  #
X  CFLAGS=	-O
X--- 1,8 ----
X  # Copyright (c) 1980 Regents of the University of California.
X  # All rights reserved.  The Berkeley software License Agreement
X  # specifies the terms and conditions for redistribution.
X  #
X! #	@(#)Makefile	5.2 (2.11BSD GTE) 1/2/94
X  #
X  #
X  CFLAGS=	-O
X***************
X*** 11,17 ****
X  	line.o linemod.o move.o open.o point.o space.o subr.o
X  
X  ../libplotdumb:	${OBJS}
X! 	ar cu ../libplotdumb ${OBJS}
X  
X  ${OBJS}:	dumb.h
X  
X--- 10,16 ----
X  	line.o linemod.o move.o open.o point.o space.o subr.o
X  
X  ../libplotdumb:	${OBJS}
X! 	ar ru ../libplotdumb ${OBJS}
X  
X  ${OBJS}:	dumb.h
X  
X*** /usr/src/usr.lib/libplot/bitgraph/arc.c.old	Sun Feb 22 02:40:47 1987
X--- /usr/src/usr.lib/libplot/bitgraph/arc.c	Mon Jan 10 23:03:56 1994
X***************
X*** 4,24 ****
X   * specifies the terms and conditions for redistribution.
X   */
X  
X! #ifndef lint
X! static char sccsid[] = "@(#)arc.c	5.2 (Berkeley) 4/30/85";
X  #endif not lint
X  
X  
X  #include "bg.h"
X- 
X- #ifdef BSD2_10
X- #define	screen_xc	scr_xc
X- #define	screen_xbeg	scr_xbeg
X- #define	screen_xend	scr_xend
X- #define	screen_yc	scr_yc
X- #define	screen_ybeg	scr_ybeg
X- #define	screen_yend	scr_yend
X- #endif
X  
X  /* should include test for equality? */
X  #define side(x,y)	(a*(x)+b*(y)+c > 0.0 ? 1 : -1)
X--- 4,15 ----
X   * specifies the terms and conditions for redistribution.
X   */
X  
X! #if	defined(DOSCCS) && !defined(lint)
X! static char sccsid[] = "@(#)arc.c	5.2.1 (2.11BSD GTE) 1/1/94";
X  #endif not lint
X  
X  
X  #include "bg.h"
X  
X  /* should include test for equality? */
X  #define side(x,y)	(a*(x)+b*(y)+c > 0.0 ? 1 : -1)
X*** /usr/src/usr.lib/libplot/bitgraph/bg.h.old	Sun Feb 22 02:42:21 1987
X--- /usr/src/usr.lib/libplot/bitgraph/bg.h	Mon Jan 10 23:04:16 1994
X***************
X*** 3,9 ****
X   * All rights reserved.  The Berkeley software License Agreement
X   * specifies the terms and conditions for redistribution.
X   *
X!  *	@(#)bg.h	5.1 (Berkeley) 4/30/85
X   */
X  
X  /*
X--- 3,9 ----
X   * All rights reserved.  The Berkeley software License Agreement
X   * specifies the terms and conditions for redistribution.
X   *
X!  *	@(#)bg.h	5.1.1 (2.11BSD GTE) 1/1/94
X   */
X  
X  /*
X***************
X*** 21,31 ****
X  #define YMAX	1024
X  #define scaleX(xi)	((int) ((xi - lowx)*scale +0.5))
X  #define scaleY(yi)	((int) ((yi - lowy)*scale +0.5))
X- 
X- #ifdef BSD2_10
X- #define currentx	crnt_x
X- #define currenty	crnt_y
X- #endif
X  
X  extern int currentx;
X  extern int currenty;
X--- 21,26 ----
X*** /usr/src/usr.lib/libplot/bitgraph/Makefile.old	Mon Jan 18 09:37:49 1993
X--- /usr/src/usr.lib/libplot/bitgraph/Makefile	Sun Jan  2 00:14:33 1994
X***************
X*** 2,8 ****
X  # All rights reserved.  The Berkeley software License Agreement
X  # specifies the terms and conditions for redistribution.
X  #
X! #	@(#)Makefile	5.1 (Berkeley) 4/30/85
X  #
X  #
X  CFLAGS=	-O
X--- 2,8 ----
X  # All rights reserved.  The Berkeley software License Agreement
X  # specifies the terms and conditions for redistribution.
X  #
X! #	@(#)Makefile	5.2 (2.11BSD GTE) 1/2/94
X  #
X  #
X  CFLAGS=	-O
X***************
X*** 10,16 ****
X  	label.o move.o open.o close.o space.o
X  
X  ../libplotbg:	${OBJS}
X! 	ar cu ../libplotbg ${OBJS}
X  
X  ${OBJS}:	bg.h
X  
X--- 10,16 ----
X  	label.o move.o open.o close.o space.o
X  
X  ../libplotbg:	${OBJS}
X! 	ar ru ../libplotbg ${OBJS}
X  
X  ${OBJS}:	bg.h
X  
X*** /usr/src/usr.lib/libplot/imagen/Makefile.old	Mon Jan 18 09:37:53 1993
X--- /usr/src/usr.lib/libplot/imagen/Makefile	Sun Jan  2 00:16:20 1994
X***************
X*** 1,9 ****
X- #
X  # Copyright (c) 1985 Regents of the University of California.
X  # All rights reserved.  The Berkeley software License Agreement
X  # specifies the terms and conditions for redistribution.
X  #
X! #	@(#)Makefile	5.4 (Berkeley) 9/21/85
X  #
X  CFLAGS=	-O
X  OBJS=	arc.o box.o charset.o circle.o close.o cont.o dot.o \
X--- 1,8 ----
X  # Copyright (c) 1985 Regents of the University of California.
X  # All rights reserved.  The Berkeley software License Agreement
X  # specifies the terms and conditions for redistribution.
X  #
X! #	@(#)Makefile	5.5 (2.11BSD GTE) 1/2/94
X  #
X  CFLAGS=	-O
X  OBJS=	arc.o box.o charset.o circle.o close.o cont.o dot.o \
X***************
X*** 15,21 ****
X  all:	../libplotimagen
X  
X  ../libplotimagen: ${OBJS}
X! 	ar cr ../libplotimagen ${OBJS}
X  
X  close.o erase.o label.o line.o open.o: imp.h imPcodes.h
X  cont.o move.o:	imp.h
X--- 14,20 ----
X  all:	../libplotimagen
X  
X  ../libplotimagen: ${OBJS}
X! 	ar ru ../libplotimagen ${OBJS}
X  
X  close.o erase.o label.o line.o open.o: imp.h imPcodes.h
X  cont.o move.o:	imp.h
X*** /usr/src/usr.lib/sendmail/src/daemon.c.old	Wed Jan 27 20:26:37 1993
X--- /usr/src/usr.lib/sendmail/src/daemon.c	Fri Dec 31 23:06:54 1993
X***************
X*** 534,549 ****
X  # else DAEMON
X  /* code for systems without sophisticated networking */
X  
X- #ifdef BSD2_10
X- # include <short_names.h>
X  # include <netdb.h>
X- # include <sys/signal.h>
X- # include <sys/wait.h>
X- # include <sys/time.h>
X- # include <sys/resource.h>
X- #endif
X  
X- 
X  /*
X  **  MYHOSTNAME -- stub version for case of no daemon code.
X  **
X--- 534,541 ----
X***************
X*** 557,563 ****
X  	char hostbuf[];
X  	int size;
X  {
X- #ifdef BSD2_10
X  	extern struct hostent *gethostbyname();
X  	struct hostent *hp;
X  
X--- 549,554 ----
X***************
X*** 573,591 ****
X  	}
X  	else
X  		return (NULL);
X- #else !BSD2_10
X- 	register FILE *f;
X- 
X- 	hostbuf[0] = '\0';
X- 	f = fopen("/usr/include/whoami", "r");
X- 	if (f != NULL)
X- 	{
X- 		(void) fgets(hostbuf, size, f);
X- 		fixcrlf(hostbuf, TRUE);
X- 		(void) fclose(f);
X- 	}
X- 	return (NULL);
X- #endif BSD2_10
X  }
X  /*
X  **  MAPHOSTNAME -- turn a hostname into canonical form
X--- 564,569 ----
X***************
X*** 611,615 ****
X  {
X  	return;
X  }
X- 
X  #endif DAEMON
X--- 589,592 ----
X*** /usr/src/usr.lib/sendmail/src/conf.h.old	Sun Sep 22 14:00:58 1991
X--- /usr/src/usr.lib/sendmail/src/conf.h	Mon Jan 10 23:05:05 1994
X***************
X*** 7,13 ****
X  **  All rights reserved.  The Berkeley software License Agreement
X  **  specifies the terms and conditions for redistribution.
X  **
X! **	@(#)conf.h	5.7 (Berkeley) 1/5/86
X  */
X  
X  /*
X--- 7,13 ----
X  **  All rights reserved.  The Berkeley software License Agreement
X  **  specifies the terms and conditions for redistribution.
X  **
X! **	@(#)conf.h	5.7.1 (2.11BSD GTE) 1/1/94
X  */
X  
X  /*
X***************
X*** 15,27 ****
X  */
X  
X  
X- 
X  /*
X  **  Table sizes, etc....
X  **	There shouldn't be much need to change these....
X  */
X  
X! #ifdef BSD2_10
X  # define MAXLINE	256		/* max line length */
X  # define MAXNAME	128		/* max length of a name */
X  # define MAXFIELD	1024		/* max total length of a hdr field */
X--- 15,26 ----
X  */
X  
X  
X  /*
X  **  Table sizes, etc....
X  **	There shouldn't be much need to change these....
X  */
X  
X! #ifdef pdp11
X  # define MAXLINE	256		/* max line length */
X  # define MAXNAME	128		/* max length of a name */
X  # define MAXFIELD	1024		/* max total length of a hdr field */
X***************
X*** 35,41 ****
X  # define MAXUSERENVIRON	35		/* max # of items in user environ */
X  # define QUEUESIZE	10		/* max # of jobs per queue run */
X  
X! #else !BSD2_10
X  
X  # define MAXLINE	1024		/* max line length */
X  # define MAXNAME	256		/* max length of a name */
X--- 34,40 ----
X  # define MAXUSERENVIRON	35		/* max # of items in user environ */
X  # define QUEUESIZE	10		/* max # of jobs per queue run */
X  
X! #else
X  
X  # define MAXLINE	1024		/* max line length */
X  # define MAXNAME	256		/* max length of a name */
X***************
X*** 49,55 ****
X  # define MAXTRUST	30		/* maximum number of trusted users */
X  # define MAXUSERENVIRON	40		/* max # of items in user environ */
X  # define QUEUESIZE	600		/* max # of jobs per queue run */
X! #endif BSD2_10
X  
X  /*
X  **  Compilation options.
X--- 48,54 ----
X  # define MAXTRUST	30		/* maximum number of trusted users */
X  # define MAXUSERENVIRON	40		/* max # of items in user environ */
X  # define QUEUESIZE	600		/* max # of jobs per queue run */
X! #endif pdp11
X  
X  /*
X  **  Compilation options.
X*** /usr/src/usr.lib/sendmail/src/conf.c.old	Wed Feb 10 15:26:11 1988
X--- /usr/src/usr.lib/sendmail/src/conf.c	Mon Jan 10 23:05:22 1994
X***************
X*** 9,15 ****
X  */
X  
X  #if !defined(lint) && !defined(NOSCCS)
X! static char	SccsId[] = "@(#)conf.c	5.14 (Berkeley) 1/10/86";
X  #endif
X  
X  # include <pwd.h>
X--- 9,15 ----
X  */
X  
X  #if !defined(lint) && !defined(NOSCCS)
X! static char	SccsId[] = "@(#)conf.c	5.14.1 (2.11BSD GTE) 1/1/94";
X  #endif
X  
X  # include <pwd.h>
X***************
X*** 547,553 ****
X  */
X  
X  #ifdef VMUNIX
X! #ifdef BSD2_10
X  
X  getla()
X  {
X--- 547,553 ----
X  */
X  
X  #ifdef VMUNIX
X! #ifdef pdp11
X  
X  getla()
X  {
X***************
X*** 557,563 ****
X  	return(avenrun[0]);
X  }
X  
X! #else !BSD2_10
X  
X  #include <nlist.h>
X  
X--- 557,563 ----
X  	return(avenrun[0]);
X  }
X  
X! #else
X  
X  #include <nlist.h>
X  
X***************
X*** 601,607 ****
X  # endif
X  }
X  
X! #endif BSD2_10
X  #else VMUNIX
X  
X  getla()
X--- 601,607 ----
X  # endif
X  }
X  
X! #endif pdp11
X  #else VMUNIX
X  
X  getla()
X*** /usr/src/usr.lib/lpr/filters/vplotf.c.old	Sun Feb 22 12:21:03 1987
X--- /usr/src/usr.lib/lpr/filters/vplotf.c	Mon Jan 10 23:06:02 1994
X***************
X*** 4,21 ****
X   * specifies the terms and conditions for redistribution.
X   */
X  
X! #ifndef lint
X! static char sccsid[] = "@(#)vplotf.c	5.2 (Berkeley) 11/11/85";
X! #endif not lint
X  
X  /*
X   *  Lpd filter to read standard graphics input and produce a plot on the
X   *  Varian or Versatec
X   */
X- 
X- #ifdef BSD2_10
X- #define DevRange8	DevR8
X- #endif
X  
X  #include <stdio.h>
X  #include <vfont.h>
X--- 4,17 ----
X   * specifies the terms and conditions for redistribution.
X   */
X  
X! #if	defined(DOSCCS) && !defined(lint)
X! static char sccsid[] = "@(#)vplotf.c	5.2.1 (2.11BSD GTE) 1/1/94";
X! #endif
X  
X  /*
X   *  Lpd filter to read standard graphics input and produce a plot on the
X   *  Varian or Versatec
X   */
X  
X  #include <stdio.h>
X  #include <vfont.h>
X*** /usr/src/usr.lib/lpr/lpr.c.old	Sun Feb 22 03:39:24 1987
X--- /usr/src/usr.lib/lpr/lpr.c	Mon Jan 10 23:06:27 1994
X***************
X*** 4,18 ****
X   * specifies the terms and conditions for redistribution.
X   */
X  
X! #ifndef lint
X  char copyright[] =
X  "@(#) Copyright (c) 1983 Regents of the University of California.\n\
X   All rights reserved.\n";
X- #endif not lint
X  
X! #ifndef lint
X! static char sccsid[] = "@(#)lpr.c	5.2 (Berkeley) 11/17/85";
X! #endif not lint
X  
X  /*
X   *      lpr -- off line print
X--- 4,16 ----
X   * specifies the terms and conditions for redistribution.
X   */
X  
X! #if	defined(DOSCCS) && !defined(lint)
X  char copyright[] =
X  "@(#) Copyright (c) 1983 Regents of the University of California.\n\
X   All rights reserved.\n";
X  
X! static char sccsid[] = "@(#)lpr.c	5.2.1 (2.11BSD GTE) 12/31/93";
X! #endif
X  
X  /*
X   *      lpr -- off line print
X***************
X*** 20,29 ****
X   * Allows multiple printers and printers on remote machines by
X   * using information from a printer data base.
X   */
X- 
X- #ifdef BSD2_10
X- #include <short_names.h>
X- #endif
X  
X  #include <stdio.h>
X  #include <sys/types.h>
X--- 18,23 ----
X*** /usr/src/usr.lib/lpr/cmds.c.old	Sun Jun 12 18:23:36 1988
X--- /usr/src/usr.lib/lpr/cmds.c	Mon Jan 10 23:06:47 1994
X***************
X*** 4,20 ****
X   * specifies the terms and conditions for redistribution.
X   */
X  
X! #ifndef lint
X! static char sccsid[] = "@(#)cmds.c	5.2 (Berkeley) 3/30/86";
X  #endif not lint
X  
X  /*
X   * lpc -- line printer control program -- commands:
X   */
X- 
X- #ifdef BSD2_10
X- #define	disablepr	dsablpr
X- #endif
X  
X  #include "lp.h"
X  #include <sys/time.h>
X--- 4,16 ----
X   * specifies the terms and conditions for redistribution.
X   */
X  
X! #if	defined(DOSCCS) && !defined(lint)
X! static char sccsid[] = "@(#)cmds.c	5.2.1 (2.11BSD GTE) 1/1/94";
X  #endif not lint
X  
X  /*
X   * lpc -- line printer control program -- commands:
X   */
X  
X  #include "lp.h"
X  #include <sys/time.h>
X*** /usr/src/usr.lib/lpr/cmdtab.c.old	Sun Feb 22 03:52:12 1987
X--- /usr/src/usr.lib/lpr/cmdtab.c	Mon Jan 10 23:07:06 1994
X***************
X*** 4,21 ****
X   * specifies the terms and conditions for redistribution.
X   */
X  
X! #ifndef lint
X! static char sccsid[] = "@(#)cmdtab.c	5.1 (Berkeley) 6/6/85";
X  #endif not lint
X  
X  /*
X   * lpc -- command tables
X   */
X- 
X- #ifdef BSD2_10
X- #define	disablehelp	dsbl_h
X- #define	restarthelp	rstr_h
X- #endif
X  
X  #include "lpc.h"
X  
X--- 4,16 ----
X   * specifies the terms and conditions for redistribution.
X   */
X  
X! #if	defined(DOSCCS) && !defined(lint)
X! static char sccsid[] = "@(#)cmdtab.c	5.1.1 (2.11BSD GTE) 1/1/94";
X  #endif not lint
X  
X  /*
X   * lpc -- command tables
X   */
X  
X  #include "lpc.h"
X  
X*** /usr/src/usr.lib/lpr/lpd.c.old	Sun Dec 25 23:51:43 1988
X--- /usr/src/usr.lib/lpr/lpd.c	Mon Jan 10 23:07:32 1994
X***************
X*** 4,18 ****
X   * specifies the terms and conditions for redistribution.
X   */
X  
X! #ifndef lint
X  char copyright[] =
X  "@(#) Copyright (c) 1983 Regents of the University of California.\n\
X   All rights reserved.\n";
X- #endif not lint
X  
X! #ifndef lint
X! static char sccsid[] = "@(#)lpd.c	5.4 (Berkeley) 5/6/86";
X! #endif not lint
X  
X  /*
X   * lpd -- line printer daemon.
X--- 4,16 ----
X   * specifies the terms and conditions for redistribution.
X   */
X  
X! #if	defined(DOSCCS) && !defined(lint)
X  char copyright[] =
X  "@(#) Copyright (c) 1983 Regents of the University of California.\n\
X   All rights reserved.\n";
X  
X! static char sccsid[] = "@(#)lpd.c	5.4.1 (2.11BSD GTE) 1/1/94";
X! #endif
X  
X  /*
X   * lpd -- line printer daemon.
X***************
X*** 49,57 ****
X  
X  int	reapchild();
X  int	mcleanup();
X- #ifdef BSD2_10
X  int	unblock, unpause();
X- #endif
X  
X  main(argc, argv)
X  	int argc;
X--- 47,53 ----
X***************
X*** 129,135 ****
X  	(void) unlink(SOCKETNAME);
X  	funix = socket(AF_UNIX, SOCK_STREAM, 0);
X  	if (funix < 0) {
X- #ifdef BSD2_10
X  		if (errno == EPROTONOSUPPORT) {
X  			sigblock(sigmask(SIGUSR1));
X  			signal(SIGUSR1, unpause);
X--- 125,130 ----
X***************
X*** 141,147 ****
X  				}
X  			}
X  		}
X- #endif
X  		syslog(LOG_ERR, "socket: %m");
X  		exit(1);
X  	}
X--- 136,141 ----
X***************
X*** 243,254 ****
X  	exit(0);
X  }
X  
X- #ifdef BSD2_10
X  unpause()
X  {
X  	unblock++;
X  }
X- #endif
X  
X  /*
X   * Stuff for handling job specifications
X--- 237,246 ----
X*** /usr/src/usr.lib/lpr/lpc.c.old	Sun Dec 17 13:07:41 1989
X--- /usr/src/usr.lib/lpr/lpc.c	Mon Jan 10 23:08:26 1994
X***************
X*** 4,18 ****
X   * specifies the terms and conditions for redistribution.
X   */
X  
X! #ifndef lint
X  char copyright[] =
X  "@(#) Copyright (c) 1983 Regents of the University of California.\n\
X   All rights reserved.\n";
X- #endif not lint
X  
X! #ifndef lint
X! static char sccsid[] = "@(#)lpc.c	5.2 (Berkeley) 11/17/85";
X! #endif not lint
X  
X  /*
X   * lpc -- line printer control program
X--- 4,16 ----
X   * specifies the terms and conditions for redistribution.
X   */
X  
X! #if	defined(DOSCCS) && !defined(lint)
X  char copyright[] =
X  "@(#) Copyright (c) 1983 Regents of the University of California.\n\
X   All rights reserved.\n";
X  
X! static char sccsid[] = "@(#)lpc.c	5.2.1 (2.11BSD GTE) 1/1/94";
X! #endif
X  
X  /*
X   * lpc -- line printer control program
X***************
X*** 79,87 ****
X  	longjmp(toplevel, 1);
X  }
X  
X- #ifdef BSD2_10
X  extern struct cmd cmdtab[];
X! #endif
X  /*
X   * Command parser.
X   */
X--- 77,84 ----
X  	longjmp(toplevel, 1);
X  }
X  
X  extern struct cmd cmdtab[];
X! 
X  /*
X   * Command parser.
X   */
X*** /usr/src/usr.lib/lpr/recvjob.c.old	Sun Dec 17 13:07:44 1989
X--- /usr/src/usr.lib/lpr/recvjob.c	Mon Jan 10 23:09:10 1994
X***************
X*** 4,12 ****
X   * specifies the terms and conditions for redistribution.
X   */
X  
X! #ifndef lint
X! static char sccsid[] = "@(#)recvjob.c	5.4 (Berkeley) 6/6/86";
X! #endif not lint
X  
X  /*
X   * Receive printer jobs from the network, queue them and
X--- 4,12 ----
X   * specifies the terms and conditions for redistribution.
X   */
X  
X! #if	defined(DOSCCS) && !defined(lint)
X! static char sccsid[] = "@(#)recvjob.c	5.4.1 (2.11BSD GTE) 1/1/94";
X! #endif
X  
X  /*
X   * Receive printer jobs from the network, queue them and
X***************
X*** 260,266 ****
X  		return(1);
X  	if (read(dfd, (char *)&fs, sizeof fs) != sizeof fs)
X  		return(1);
X! #ifdef BSD2_10
X  	spacefree = fs.fs_tfree;
X  #else
X  	spacefree = (fs.fs_cstotal.cs_nbfree * fs.fs_frag +
X--- 260,266 ----
X  		return(1);
X  	if (read(dfd, (char *)&fs, sizeof fs) != sizeof fs)
X  		return(1);
X! #ifdef pdp11
X  	spacefree = fs.fs_tfree;
X  #else
X  	spacefree = (fs.fs_cstotal.cs_nbfree * fs.fs_frag +
X*** /usr/src/usr.lib/lpr/startdaemon.c.old	Sun Jun 12 18:26:26 1988
X--- /usr/src/usr.lib/lpr/startdaemon.c	Mon Jan 10 23:09:34 1994
X***************
X*** 4,12 ****
X   * specifies the terms and conditions for redistribution.
X   */
X  
X! #ifndef lint
X! static char sccsid[] = "@(#)startdaemon.c	5.1 (Berkeley) 6/6/85";
X! #endif not lint
X  
X  /*
X   * Tell the printer daemon that there are new files in the spool directory.
X--- 4,12 ----
X   * specifies the terms and conditions for redistribution.
X   */
X  
X! #if	defined(DOSCCS) && !defined(lint)
X! static char sccsid[] = "@(#)startdaemon.c	5.1.1 (2.11BSD GTE) 1/1/94";
X! #endif
X  
X  /*
X   * Tell the printer daemon that there are new files in the spool directory.
X***************
X*** 29,35 ****
X  
X  	s = socket(AF_UNIX, SOCK_STREAM, 0);
X  	if (s < 0) {
X- #ifdef BSD2_10
X  		extern errno;
X  
X  		if (errno == EPROTONOSUPPORT) {
X--- 29,34 ----
X***************
X*** 51,57 ****
X  			}
X  			return(1);
X  		}
X- #endif
X  		perr("socket");
X  		return(0);
X  	}
X--- 50,55 ----
X*** /usr/src/usr.lib/libutil/Makefile.old	Mon Jan 18 09:38:01 1993
X--- /usr/src/usr.lib/libutil/Makefile	Sun Jan  2 01:59:06 1994
X***************
X*** 14,20 ****
X  # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
X  # FITNESS FOR A PARTICULAR PURPOSE.
X  #
X! # @(#)Makefile	5.3 (Berkeley) 5/10/89
X  #
X  
X  # DEFS=	-DLIBC_SCCS
X--- 14,20 ----
X  # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
X  # FITNESS FOR A PARTICULAR PURPOSE.
X  #
X! # @(#)Makefile	5.4 (2.11BSD GTE) 1/2/94
X  #
X  
X  # DEFS=	-DLIBC_SCCS
X***************
X*** 33,42 ****
X  
X  libutil.a libutil_p.a: ${OBJS}
X  	@echo building normal libutil
X! 	@ar cu libutil.a ${OBJS}
X  	ranlib libutil.a
X  	@echo building profiled libutil
X! 	@cd profiled; ar cu ../libutil_p.a ${OBJS}
X  	ranlib libutil_p.a
X  
X  clean:
X--- 33,42 ----
X  
X  libutil.a libutil_p.a: ${OBJS}
X  	@echo building normal libutil
X! 	@ar ru libutil.a ${OBJS}
X  	ranlib libutil.a
X  	@echo building profiled libutil
X! 	@cd profiled; ar ru ../libutil_p.a ${OBJS}
X  	ranlib libutil_p.a
X  
X  clean:
X*** /usr/src/usr.lib/sendmail.MX/src/conf.c.old	Wed Sep 14 06:03:00 1988
X--- /usr/src/usr.lib/sendmail.MX/src/conf.c	Sat Jan  1 01:11:03 1994
X***************
X*** 15,21 ****
X   */
X  
X  #if !defined(lint) && !defined(NOSCCS)
X! static char sccsid[] = "@(#)conf.c	5.16 (Berkeley) 4/1/88";
X  #endif /* not lint */
X  
X  # include <pwd.h>
X--- 15,21 ----
X   */
X  
X  #if !defined(lint) && !defined(NOSCCS)
X! static char sccsid[] = "@(#)conf.c	5.16.1 (2.11BSD) 1/1/94";
X  #endif /* not lint */
X  
X  # include <pwd.h>
X***************
X*** 389,395 ****
X  */
X  
X  #ifdef VMUNIX
X! #ifdef BSD2_10
X  
X  getla()
X  {
X--- 389,395 ----
X  */
X  
X  #ifdef VMUNIX
X! #ifdef pdp11
X  
X  getla()
X  {
X***************
X*** 399,405 ****
X  	return(avenrun[0]);
X  }
X  
X! #else !BSD2_10
X  
X  #include <nlist.h>
X  
X--- 399,405 ----
X  	return(avenrun[0]);
X  }
X  
X! #else !pdp11
X  
X  #include <nlist.h>
X  
X***************
X*** 443,449 ****
X  # endif
X  }
X  
X! #endif BSD2_10
X  #else VMUNIX
X  
X  getla()
X--- 443,449 ----
X  # endif
X  }
X  
X! #endif pdp11
X  #else VMUNIX
X  
X  getla()
X*** /usr/src/usr.lib/sendmail.MX/src/conf.h.old	Sat Sep 17 13:53:25 1988
X--- /usr/src/usr.lib/sendmail.MX/src/conf.h	Sat Jan  1 01:11:35 1994
X***************
X*** 9,15 ****
X   * software without specific prior written permission. This software
X   * is provided ``as is'' without express or implied warranty.
X   *
X!  *	@(#)conf.h	5.10 (Berkeley) 4/1/88
X   *
X   *  Sendmail
X   *  Copyright (c) 1983  Eric P. Allman
X--- 9,15 ----
X   * software without specific prior written permission. This software
X   * is provided ``as is'' without express or implied warranty.
X   *
X!  *	@(#)conf.h	5.10.1 (2.11BSD) 1/1/94
X   *
X   *  Sendmail
X   *  Copyright (c) 1983  Eric P. Allman
X***************
X*** 26,32 ****
X  **	There shouldn't be much need to change these....
X  */
X  
X! #ifdef BSD2_10
X  # define MAXLINE	256		/* max line length */
X  # define MAXNAME	128		/* max length of a name */
X  # define MAXFIELD	640		/* max total length of a hdr field */
X--- 26,32 ----
X  **	There shouldn't be much need to change these....
X  */
X  
X! #ifdef pdp11
X  # define MAXLINE	256		/* max line length */
X  # define MAXNAME	128		/* max length of a name */
X  # define MAXFIELD	640		/* max total length of a hdr field */
X***************
X*** 41,47 ****
X  # define QUEUESIZE	70		/* max # of jobs per queue run */
X  # define MAXMXHOSTS	10		/* max # of MX records */
X  
X! #else !BSD2_10
X  
X  # define MAXLINE	1024		/* max line length */
X  # define MAXNAME	256		/* max length of a name */
X--- 41,47 ----
X  # define QUEUESIZE	70		/* max # of jobs per queue run */
X  # define MAXMXHOSTS	10		/* max # of MX records */
X  
X! #else !pdp11
X  
X  # define MAXLINE	1024		/* max line length */
X  # define MAXNAME	256		/* max length of a name */
X***************
X*** 56,62 ****
X  # define MAXUSERENVIRON	40		/* max # of items in user environ */
X  # define QUEUESIZE	600		/* max # of jobs per queue run */
X  # define MAXMXHOSTS	10		/* max # of MX records */
X! #endif BSD2_10
X  
X  /*
X  **  Compilation options.
X--- 56,62 ----
X  # define MAXUSERENVIRON	40		/* max # of items in user environ */
X  # define QUEUESIZE	600		/* max # of jobs per queue run */
X  # define MAXMXHOSTS	10		/* max # of MX records */
X! #endif pdp11
X  
X  /*
X  **  Compilation options.
X*** /usr/src/usr.lib/sendmail.MX/src/err.c.old	Wed Sep 14 10:30:02 1988
X--- /usr/src/usr.lib/sendmail.MX/src/err.c	Sat Jan  1 01:12:38 1994
X***************
X*** 15,22 ****
X   */
X  
X  #if !defined(lint) && !defined(NOSCCS)
X! static char sccsid[] = "@(#)err.c	5.8 (Berkeley) 3/13/88";
X! #endif /* not lint */
X  
X  # include "sendmail.h"
X  # include <errno.h>
X--- 15,22 ----
X   */
X  
X  #if !defined(lint) && !defined(NOSCCS)
X! static char sccsid[] = "@(#)err.c	5.8.1 (2.11BSD) 1/1/94";
X! #endif
X  
X  # include "sendmail.h"
X  # include <errno.h>
X***************
X*** 45,51 ****
X  int	sys_nerr;
X  char	*sys_errlist[];
X  # endif lint
X! #ifdef BSD2_10
X  char	MsgBuf[BUFSIZ/2];	/* text of most recent message */
X  #else
X  char	MsgBuf[BUFSIZ*2];	/* text of most recent message */
X--- 45,51 ----
X  int	sys_nerr;
X  char	*sys_errlist[];
X  # endif lint
X! #ifdef pdp11
X  char	MsgBuf[BUFSIZ/2];	/* text of most recent message */
X  #else
X  char	MsgBuf[BUFSIZ*2];	/* text of most recent message */
SHAR_EOF
fi
exit 0
#	End of shell archive
