Add a bunch of old revision history comments that we are missing to

make diffing easier.  No code changes...

22 files changed, 346 insertions, 41 deletions

diff --git a/usr.bin/sup/src/libc.h b/usr.bin/sup/src/libc.h
index 6a0c2740926..94df059080b 100644
--- a/usr.bin/sup/src/libc.h
+++ b/usr.bin/sup/src/libc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: libc.h,v 1.4 2001/04/29 21:42:41 millert Exp $	*/
+/*	$OpenBSD: libc.h,v 1.5 2001/04/29 21:52:14 millert Exp $	*/
 
 /*
  * Copyright (c) 1991 Carnegie Mellon University
@@ -27,6 +27,34 @@
 /*
  **********************************************************************
  * HISTORY
+
+ * Revision 1.7  89/04/03  11:10:45  vanryzin
+ * 	Changed definition of qsort for c++ to indicate the procedure
+ * 	passed to qsort has parameters.  Since we were unsure if ANSI C
+ * 	could handle the syntax I placed the new definition within #if
+ * 	defined(c_plusplus) conditionals.  This may not be necessary
+ * 	and perhaps should be fixed at a later time.
+ * 	[89/04/03            vanryzin]
+ * 
+ * Revision 1.6  89/02/05  15:55:57  gm0w
+ * 	Added extern char *errmsg().
+ * 	[89/02/04            gm0w]
+ * 
+ * Revision 1.5  89/01/20  15:34:40  gm0w
+ * 	Moved all of the STDC changes to other existing include files
+ * 	back into this one.  Added non-STDC extern declarations for
+ * 	all functions without int return values to match those defined
+ * 	by STDC.  Added include of sysent.h.  Removed obsolete cdate
+ * 	extern declaration.
+ * 	[88/12/17            gm0w]
+ * 
+ * Revision 1.4  88/12/22  16:58:56  mja
+ * 	Correct __STDC__ parameter type for getenv().
+ * 	[88/12/20            dld]
+ * 
+ * Revision 1.3  88/12/14  23:31:42  mja
+ * 	Made file reentrant.  Added declarations for __STDC__.
+ * 	[88/01/06            jjk]
  * 
  * 30-Apr-88  Glenn Marcy (gm0w) at Carnegie-Mellon University
  *	Added pathof() extern.
diff --git a/usr.bin/sup/src/log.c b/usr.bin/sup/src/log.c
index 44122f30153..5bebec22499 100644
--- a/usr.bin/sup/src/log.c
+++ b/usr.bin/sup/src/log.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: log.c,v 1.4 2000/06/29 00:23:13 millert Exp $	*/
+/*	$OpenBSD: log.c,v 1.5 2001/04/29 21:52:14 millert Exp $	*/
 
 /*
  * Copyright (c) 1992 Carnegie Mellon University
@@ -16,7 +16,7 @@
  *
  * Carnegie Mellon requests users of this software to return to
  *
- *  Software Distribution Coordinator  or  Software_Distribution@CS.CMU.EDU
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
@@ -28,6 +28,14 @@
  * Logging support for SUP
  **********************************************************************
  * HISTORY
+ * Revision 1.5  92/08/11  12:03:43  mrt
+ * 	Brad's delinting and variable argument list usage
+ * 	changes. Added copyright.
+ * 
+ * Revision 1.3  89/08/15  15:30:37  bww
+ * 	Updated to use v*printf() in place of _doprnt().
+ * 	From "[89/04/19            mja]" at CMU.
+ * 	[89/08/15            bww]
  * 
  * 27-Dec-87  Glenn Marcy (gm0w) at Carnegie-Mellon University
  *	Added check to allow logopen() to be called multiple times.
diff --git a/usr.bin/sup/src/netcryptvoid.c b/usr.bin/sup/src/netcryptvoid.c
index 4d1786e24a4..833bb7cd8d0 100644
--- a/usr.bin/sup/src/netcryptvoid.c
+++ b/usr.bin/sup/src/netcryptvoid.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: netcryptvoid.c,v 1.3 1997/04/01 07:35:10 todd Exp $	*/
+/*	$OpenBSD: netcryptvoid.c,v 1.4 2001/04/29 21:52:14 millert Exp $	*/
 
 /*
  * Copyright (c) 1992 Carnegie Mellon University
@@ -16,7 +16,7 @@
  *
  * Carnegie Mellon requests users of this software to return to
  *
- *  Software Distribution Coordinator  or  Software_Distribution@CS.CMU.EDU
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
@@ -26,6 +26,9 @@
  */
 /**********************************************************************
  * HISTORY
+ * Revision 2.2  92/09/09  22:04:34  mrt
+ * 	Created.
+ * 	[92/09/09            mrt]
  * 
  */
 /*
diff --git a/usr.bin/sup/src/quit.c b/usr.bin/sup/src/quit.c
index 7d8bcf827dd..fbbf0a0f3c6 100644
--- a/usr.bin/sup/src/quit.c
+++ b/usr.bin/sup/src/quit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: quit.c,v 1.3 1997/04/01 07:35:15 todd Exp $	*/
+/*	$OpenBSD: quit.c,v 1.4 2001/04/29 21:52:15 millert Exp $	*/
 
 /*
  * Copyright (c) 1991 Carnegie Mellon University
@@ -37,6 +37,9 @@
  *
  **********************************************************************
  * HISTORY
+ * Revision 1.2  88/12/13  13:52:41  gm0w
+ * 	Rewritten to use varargs.
+ * 	[88/12/13            gm0w]
  * 
  **********************************************************************
  */
diff --git a/usr.bin/sup/src/run.c b/usr.bin/sup/src/run.c
index 6974bc57189..7658d4fb03f 100644
--- a/usr.bin/sup/src/run.c
+++ b/usr.bin/sup/src/run.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: run.c,v 1.5 1998/06/03 16:20:35 deraadt Exp $	*/
+/*	$OpenBSD: run.c,v 1.6 2001/04/29 21:52:15 millert Exp $	*/
 
 /*
  * Copyright (c) 1991 Carnegie Mellon University
@@ -49,6 +49,12 @@
  *
  **********************************************************************
  * HISTORY
+ * Revision 1.1  89/10/14  19:53:39  rvb
+ * Initial revision
+ * 
+ * Revision 1.2  89/08/03  14:36:46  mja
+ * 	Update run() and runp() to use <varargs.h>.
+ * 	[89/04/19            mja]
  * 
  * 23-Sep-86  Glenn Marcy (gm0w) at Carnegie-Mellon University
  *	Merged old runv and runvp modules.
diff --git a/usr.bin/sup/src/scan.c b/usr.bin/sup/src/scan.c
index 1162568a80b..6a2d28177a9 100644
--- a/usr.bin/sup/src/scan.c
+++ b/usr.bin/sup/src/scan.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scan.c,v 1.9 2001/04/29 18:16:19 millert Exp $	*/
+/*	$OpenBSD: scan.c,v 1.10 2001/04/29 21:52:15 millert Exp $	*/
 
 /*
  * Copyright (c) 1992 Carnegie Mellon University
@@ -16,7 +16,7 @@
  *
  * Carnegie Mellon requests users of this software to return to
  *
- *  Software Distribution Coordinator  or  Software_Distribution@CS.CMU.EDU
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
@@ -29,6 +29,10 @@
  *
  **********************************************************************
  * HISTORY
+ * Revision 1.8  92/08/11  12:04:28  mrt
+ * 	Brad's changes: delinted, added forward declarations of static
+ * 	functions.Added Copyright.
+ * 	[92/07/24            mrt]
  * 
  * 18-Mar-88  Glenn Marcy (gm0w) at Carnegie-Mellon University
  *	Added host=<hostfile> support to releases file.
diff --git a/usr.bin/sup/src/scm.c b/usr.bin/sup/src/scm.c
index d027ffadc6e..c2402624b19 100644
--- a/usr.bin/sup/src/scm.c
+++ b/usr.bin/sup/src/scm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scm.c,v 1.9 2000/02/01 03:23:40 deraadt Exp $	*/
+/*	$OpenBSD: scm.c,v 1.10 2001/04/29 21:52:15 millert Exp $	*/
 
 /*
  * Copyright (c) 1992 Carnegie Mellon University
@@ -16,7 +16,7 @@
  *
  * Carnegie Mellon requests users of this software to return to
  *
- *  Software Distribution Coordinator  or  Software_Distribution@CS.CMU.EDU
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
@@ -69,6 +69,23 @@
  *  2-Oct-92  Mary Thompson (mrt) at Carnegie-Mellon University
  *	Added conditional declarations of INADDR_NONE and INADDR_LOOPBACK
  *	since Tahoe version of <netinet/in.h> does not define them.
+ *
+ * Revision 1.13  92/08/11  12:05:35  mrt
+ * 	Added changes from stump:
+ * 	  Allow for multiple interfaces, and for numeric addresses.
+ * 	  Changed to use builtin port for the "supfiledbg"
+ * 	    service when getservbyname() cannot find it.
+ * 	  Added forward static declatations, delinted.
+ * 	  Updated variable argument usage.
+ * 	[92/08/08            mrt]
+ * 
+ * Revision 1.12  92/02/08  19:01:11  mja
+ * 	Add (struct sockaddr *) casts for HC 2.1.
+ * 	[92/02/08  18:59:09  mja]
+ * 
+ * Revision 1.11  89/08/03  19:49:03  mja
+ * 	Updated to use v*printf() in place of _doprnt().
+ * 	[89/04/19            mja]
  * 
  * 11-Feb-88  Glenn Marcy (gm0w) at Carnegie-Mellon University
  *	Moved sleep into computeBackoff, renamed to dobackoff.
diff --git a/usr.bin/sup/src/scmio.c b/usr.bin/sup/src/scmio.c
index 9cd3911439a..27733faa72b 100644
--- a/usr.bin/sup/src/scmio.c
+++ b/usr.bin/sup/src/scmio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scmio.c,v 1.4 2000/02/01 03:23:40 deraadt Exp $	*/
+/*	$OpenBSD: scmio.c,v 1.5 2001/04/29 21:52:15 millert Exp $	*/
 
 /*
  * Copyright (c) 1992 Carnegie Mellon University
@@ -16,7 +16,7 @@
  *
  * Carnegie Mellon requests users of this software to return to
  *
- *  Software Distribution Coordinator  or  Software_Distribution@CS.CMU.EDU
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
@@ -110,6 +110,14 @@
  *
  **********************************************************************
  * HISTORY
+ * Revision 1.7  92/09/09  22:04:41  mrt
+ * 	Removed the data encryption routines from here to netcrypt.c
+ * 	[92/09/09            mrt]
+ * 
+ * Revision 1.6  92/08/11  12:05:57  mrt
+ * 	Brad's changes: Delinted,Added forward declarations of 
+ * 	static functions. Added copyright.
+ * 	[92/07/24            mrt]
  * 
  * 27-Dec-87  Glenn Marcy (gm0w) at Carnegie-Mellon University
  *	Added crosspatch support.
diff --git a/usr.bin/sup/src/stree.c b/usr.bin/sup/src/stree.c
index 89a8d570394..924cb17d42d 100644
--- a/usr.bin/sup/src/stree.c
+++ b/usr.bin/sup/src/stree.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stree.c,v 1.6 1999/01/09 19:32:34 millert Exp $	*/
+/*	$OpenBSD: stree.c,v 1.7 2001/04/29 21:52:15 millert Exp $	*/
 
 /*
  * Copyright (c) 1992 Carnegie Mellon University
@@ -16,7 +16,7 @@
  *
  * Carnegie Mellon requests users of this software to return to
  *
- *  Software Distribution Coordinator  or  Software_Distribution@CS.CMU.EDU
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
@@ -29,6 +29,16 @@
  *
  **********************************************************************
  * HISTORY
+ * Revision 1.4  92/08/11  12:06:32  mrt
+ * 	Added copyright. Delinted
+ * 	[92/08/10            mrt]
+ * 
+ * 
+ * Revision 1.3  89/08/15  15:30:57  bww
+ * 	Changed code in Tlookup to Tsearch for each subpart of path.
+ * 	Added indent formatting code to Tprint.
+ * 	From "[89/06/24            gm0w]" at CMU.
+ * 	[89/08/15            bww]
  * 
  * 20-May-87  Glenn Marcy (gm0w) at Carnegie-Mellon University
  *	Added code to please lint.
diff --git a/usr.bin/sup/src/sup.h b/usr.bin/sup/src/sup.h
index ed369eb3e78..e64538f180f 100644
--- a/usr.bin/sup/src/sup.h
+++ b/usr.bin/sup/src/sup.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sup.h,v 1.5 2001/04/29 18:14:09 millert Exp $	*/
+/*	$OpenBSD: sup.h,v 1.6 2001/04/29 21:52:15 millert Exp $	*/
 
 /*
  * Copyright (c) 1992 Carnegie Mellon University
@@ -16,7 +16,7 @@
  *
  * Carnegie Mellon requests users of this software to return to
  *
- *  Software Distribution Coordinator  or  Software_Distribution@CS.CMU.EDU
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
@@ -40,6 +40,19 @@
  *	Modified SUP to use gzip based compression when sending files
  *	across the network to save BandWidth
  *
+ * Revision 1.10  92/08/11  12:06:42  mrt
+ * 	Added definition for DEBUGFPORTNUM, the debugging port number.
+ * 	Changed so that last and when file names could include
+ * 	the relase name if any.
+ * 	[92/07/23            mrt]
+ * 
+ * Revision 1.9  91/04/29  14:39:03  mja
+ * 	Reduce MAXCHILDREN from 8 to 3.
+ * 
+ * Revision 1.8  89/08/23  14:55:30  gm0w
+ * 	Moved coll.dir from supservers to supfiles.
+ * 	[89/08/23            gm0w]
+ * 
  * 18-Mar-88  Glenn Marcy (gm0w) at Carnegie-Mellon University
  *	Added host=<hostfile> support to releases file.
  *
diff --git a/usr.bin/sup/src/supcdefs.h b/usr.bin/sup/src/supcdefs.h
index 83a95b8b112..0193d808f69 100644
--- a/usr.bin/sup/src/supcdefs.h
+++ b/usr.bin/sup/src/supcdefs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: supcdefs.h,v 1.4 1997/04/01 07:35:30 todd Exp $	*/
+/*	$OpenBSD: supcdefs.h,v 1.5 2001/04/29 21:52:16 millert Exp $	*/
 
 /*
  * Copyright (c) 1992 Carnegie Mellon University
@@ -16,7 +16,7 @@
  *
  * Carnegie Mellon requests users of this software to return to
  *
- *  Software Distribution Coordinator  or  Software_Distribution@CS.CMU.EDU
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
@@ -33,6 +33,15 @@
  * 7-July-93  Nate Williams at Montana State University
  *	Modified SUP to use gzip based compression when sending files
  *	across the network to save BandWidth
+ *
+ * Revision 1.6  92/08/11  12:06:52  mrt
+ * 	Added CFURELSUF  - use-release-suffix flag
+ * 	Made rpause code conditional on MACH rather than CMUCS
+ * 	[92/07/26            mrt]
+ * 
+ * Revision 1.5  92/02/08  18:23:57  mja
+ * 	Added CFKEEP flag.
+ * 	[92/01/17            vdelvecc]
  * 
  * 10-Feb-88  Glenn Marcy (gm0w) at Carnegie-Mellon University
  *	Added timeout for backoff.
diff --git a/usr.bin/sup/src/supcmain.c b/usr.bin/sup/src/supcmain.c
index aa8a7b32cfb..dc70da713ef 100644
--- a/usr.bin/sup/src/supcmain.c
+++ b/usr.bin/sup/src/supcmain.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: supcmain.c,v 1.8 1998/06/03 16:20:36 deraadt Exp $	*/
+/*	$OpenBSD: supcmain.c,v 1.9 2001/04/29 21:52:16 millert Exp $	*/
 
 /*
  * Copyright (c) 1992 Carnegie Mellon University
@@ -16,7 +16,7 @@
  *
  * Carnegie Mellon requests users of this software to return to
  *
- *  Software Distribution Coordinator  or  Software_Distribution@CS.CMU.EDU
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
@@ -175,6 +175,20 @@
  *	Modified SUP to use gzip based compression when sending files
  *	across the network to save BandWidth
  *
+ * Revision 1.6  92/08/11  12:06:59  mrt
+ * 	Merged in Brad's changes. Made resource pausing code conditional
+ * 	on MACH, rather than CMUCS. Fixed some calls to sprintf to
+ * 	return void.
+ * 	[92/08/09            mrt]
+ * 
+ * Revision 1.5  92/02/08  19:01:18  mja
+ * 	Correct oldsigsys type when ANSI C.
+ * 	[92/02/08  18:59:47  mja]
+ * 
+ * Revision 1.4  92/02/08  18:24:01  mja
+ * 	Added -k and -K switches.
+ * 	[92/01/17            vdelvecc]
+ * 
  * 27-Dec-87  Glenn Marcy (gm0w) at Carnegie-Mellon University
  *	Added crosspatch support (is currently ignored).
  *
diff --git a/usr.bin/sup/src/supcmeat.c b/usr.bin/sup/src/supcmeat.c
index 3cc9e09a04f..0bc6287b94c 100644
--- a/usr.bin/sup/src/supcmeat.c
+++ b/usr.bin/sup/src/supcmeat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: supcmeat.c,v 1.10 2001/04/29 18:16:19 millert Exp $	*/
+/*	$OpenBSD: supcmeat.c,v 1.11 2001/04/29 21:52:16 millert Exp $	*/
 
 /*
  * Copyright (c) 1992 Carnegie Mellon University
@@ -16,7 +16,7 @@
  *
  * Carnegie Mellon requests users of this software to return to
  *
- *  Software Distribution Coordinator  or  Software_Distribution@CS.CMU.EDU
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
@@ -33,6 +33,59 @@
  *	Modified SUP to use gzip based compression when sending files
  *	across the network to save BandWidth
  *
+ * Revision 1.16  92/09/09  22:04:51  mrt
+ * 	Really added bww's recvone changes this time. 
+ * 	Added code to support non-crypting version of sup.
+ * 	[92/09/01            mrt]
+ * 
+ * Revision 1.15  92/08/11  12:07:09  mrt
+ * 	Added support to add release to FILEWHEN name.
+ * 	Updated variable arguemnt list usage - bww
+ * 	Updated recvone() to take a va_list - bww
+ * 	Changed conditional for rpausing code from CMUCS to MACH
+ * 	[92/07/24            mrt]
+ * 
+ * Revision 1.14  92/02/08  18:24:12  mja
+ * 	Only apply "keep" mode when local file is strictly newer
+ * 	otherwise allow update as before if necessary.
+ * 	[92/02/08  18:09:00  mja]
+ * 
+ * 	Added support for -k (keep) option to needone().  Rewrote and
+ * 	commented other parts of needone().
+ * 	[92/01/17            vdelvecc]
+ * 
+ * Revision 1.13  91/05/16  14:49:41  ern
+ * 	Add timestap to fileserver.
+ * 	Drop day of the week from 5 messages.
+ * 	[91/05/16  14:47:53  ern]
+ * 
+ * Revision 1.12  89/08/23  14:55:44  gm0w
+ * 	Changed msgf routines to msg routines.
+ * 	[89/08/23            gm0w]
+ * 
+ * Revision 1.11  89/08/03  19:49:10  mja
+ * 	Updated to use v*printf() in place of _doprnt().
+ * 	[89/04/19            mja]
+ * 
+ * Revision 1.10  89/06/18  14:41:27  gm0w
+ * 	Fixed up some notify messages of errors to use "SUP:" prefix.
+ * 	[89/06/18            gm0w]
+ * 
+ * Revision 1.9  89/06/10  15:12:17  gm0w
+ * 	Changed to always use rename to install targets.  This breaks hard
+ * 	links and recreates those known to sup, other links will be orphaned.
+ * 	[89/06/10            gm0w]
+ * 
+ * Revision 1.8  89/05/24  15:04:23  gm0w
+ * 	Added code to check for EINVAL from FSPARAM ioctl for disk
+ * 	space check failures when the ioctl is not implemented.
+ * 	[89/05/24            gm0w]
+ * 
+ * Revision 1.7  89/01/16  18:22:28  gm0w
+ * 	Changed needone() to check that mode of files match before
+ * 	setting update if times also match.
+ * 	[89/01/16            gm0w]
+ * 
  * 10-Feb-88  Glenn Marcy (gm0w) at Carnegie-Mellon University
  *	Added timeout to backoff.
  *
diff --git a/usr.bin/sup/src/supcmisc.c b/usr.bin/sup/src/supcmisc.c
index 52d1d16e308..7268cd2e8aa 100644
--- a/usr.bin/sup/src/supcmisc.c
+++ b/usr.bin/sup/src/supcmisc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: supcmisc.c,v 1.6 1997/09/16 11:01:21 deraadt Exp $	*/
+/*	$OpenBSD: supcmisc.c,v 1.7 2001/04/29 21:52:16 millert Exp $	*/
 
 /*
  * Copyright (c) 1992 Carnegie Mellon University
@@ -16,7 +16,7 @@
  *
  * Carnegie Mellon requests users of this software to return to
  *
- *  Software Distribution Coordinator  or  Software_Distribution@CS.CMU.EDU
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
@@ -28,6 +28,15 @@
  * sup misc. routines, include list processing.
  **********************************************************************
  * HISTORY
+ * Revision 1.5  92/08/11  12:07:22  mrt
+ * 	Added release to FILEWHEN name.
+ * 	Brad's changes: delinted and updated variable arguement usage.
+ * 	[92/07/26            mrt]
+ * 
+ * Revision 1.3  89/08/15  15:31:28  bww
+ * 	Updated to use v*printf() in place of _doprnt().
+ * 	From "[89/04/19            mja]" at CMU.
+ * 	[89/08/15            bww]
  * 
  * 27-Dec-87  Glenn Marcy (gm0w) at Carnegie-Mellon University
  *	Fixed bug in ugconvert() which left pw uninitialized.
diff --git a/usr.bin/sup/src/supcname.c b/usr.bin/sup/src/supcname.c
index 3e323e15a1c..f983534c759 100644
--- a/usr.bin/sup/src/supcname.c
+++ b/usr.bin/sup/src/supcname.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: supcname.c,v 1.5 1997/09/16 10:42:56 deraadt Exp $	*/
+/*	$OpenBSD: supcname.c,v 1.6 2001/04/29 21:52:16 millert Exp $	*/
 
 /*
  * Copyright (c) 1992 Carnegie Mellon University
@@ -16,7 +16,7 @@
  *
  * Carnegie Mellon requests users of this software to return to
  *
- *  Software Distribution Coordinator  or  Software_Distribution@CS.CMU.EDU
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
@@ -28,6 +28,9 @@
  * sup client name server interface
  **********************************************************************
  * HISTORY
+ * Revision 1.4  92/08/11  12:07:32  mrt
+ * 	Added copyright.
+ * 	[92/08/10            mrt]
  * 
  * 21-Dec-87  Glenn Marcy (gm0w) at Carnegie-Mellon University
  *	Changed to no longer use a name server.
diff --git a/usr.bin/sup/src/supcparse.c b/usr.bin/sup/src/supcparse.c
index f5d76a3e31e..2818dc5333b 100644
--- a/usr.bin/sup/src/supcparse.c
+++ b/usr.bin/sup/src/supcparse.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: supcparse.c,v 1.4 1997/09/16 10:42:57 deraadt Exp $	*/
+/*	$OpenBSD: supcparse.c,v 1.5 2001/04/29 21:52:16 millert Exp $	*/
 
 /*
  * Copyright (c) 1992 Carnegie Mellon University
@@ -16,7 +16,7 @@
  *
  * Carnegie Mellon requests users of this software to return to
  *
- *  Software Distribution Coordinator  or  Software_Distribution@CS.CMU.EDU
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
@@ -33,6 +33,20 @@
  *	Modified SUP to use gzip based compression when sending files
  *	across the network to save BandWidth
  *
+ * Revision 1.6  92/08/11  12:07:38  mrt
+ * 	Added use-rel-suffix option corresponding to -u switch.
+ * 	[92/07/26            mrt]
+ * 
+ * Revision 1.5  92/02/08  18:24:19  mja
+ * 	Added "keep" supfile option, corresponding to -k switch.
+ * 	[92/01/17            vdelvecc]
+ * 
+ * Revision 1.4  91/05/16  14:49:50  ern
+ * 	Change default timeout from none to 3 hours so we don't accumalute 
+ * 	processes running sups to dead hosts especially for users.
+ * 	[91/05/16  14:49:21  ern]
+ * 
+ *
  * 10-Feb-88  Glenn Marcy (gm0w) at Carnegie-Mellon University
  *	Added timeout to backoff.
  *
diff --git a/usr.bin/sup/src/supcvers.c b/usr.bin/sup/src/supcvers.c
index 5d408b13dd6..9b3e1e0ad32 100644
--- a/usr.bin/sup/src/supcvers.c
+++ b/usr.bin/sup/src/supcvers.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: supcvers.c,v 1.3 1997/04/01 07:35:39 todd Exp $	*/
+/*	$OpenBSD: supcvers.c,v 1.4 2001/04/29 21:52:16 millert Exp $	*/
 
 /*
  * Copyright (c) 1992 Carnegie Mellon University
@@ -16,7 +16,7 @@
  *
  * Carnegie Mellon requests users of this software to return to
  *
- *  Software Distribution Coordinator  or  Software_Distribution@CS.CMU.EDU
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
@@ -27,6 +27,13 @@
 /*
  **********************************************************************
  * HISTORY
+ * Revision 1.8  92/08/11  12:07:51  mrt
+ * 	Added use-rel-suffix option. Picked up STUMP changes.
+ * 	[V7.26]
+ * 
+ * Revision 1.7  92/02/08  18:24:23  mja
+ * 	Support for -k/-K and "keep" option. [V7.25]
+ * 	[92/01/17            vdelvecc]
  * 
  * 27-Dec-87  Glenn Marcy (gm0w) at Carnegie-Mellon University
  *	Added crosspatch support.  Removed nameserver support. [V7.24]
diff --git a/usr.bin/sup/src/supmsg.c b/usr.bin/sup/src/supmsg.c
index 1f70d8d0159..5800c2774aa 100644
--- a/usr.bin/sup/src/supmsg.c
+++ b/usr.bin/sup/src/supmsg.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: supmsg.c,v 1.4 1997/04/01 07:35:45 todd Exp $	*/
+/*	$OpenBSD: supmsg.c,v 1.5 2001/04/29 21:52:16 millert Exp $	*/
 
 /*
  * Copyright (c) 1992 Carnegie Mellon University
@@ -16,7 +16,7 @@
  *
  * Carnegie Mellon requests users of this software to return to
  *
- *  Software Distribution Coordinator  or  Software_Distribution@CS.CMU.EDU
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
@@ -31,6 +31,22 @@
  * 7-July-93  Nate Williams at Montana State University
  *	Modified SUP to use gzip based compression when sending files
  *	across the network to save BandWidth
+ *
+ * Revision 2.4  92/09/09  22:05:17  mrt
+ * 	Moved PFI definition under __STDC__ conditional since it
+ * 	is already defined in libc.h in this case.
+ * 	[92/09/01            mrt]
+ * 
+ * Revision 2.3  92/08/11  12:08:12  mrt
+ * 	Added copyright
+ * 	[92/08/10            mrt]
+ * 	Brad's changes: Delinted, Incorporated updated variable 
+ * 	argument list usage from old msgxfer.c
+ * 	[92/07/24            mrt]
+ * 
+ * Revision 2.2  89/08/23  15:02:56  gm0w
+ * 	Created from separate message modules.
+ * 	[89/08/14            gm0w]
  * 
  **********************************************************************
  */
diff --git a/usr.bin/sup/src/supmsg.h b/usr.bin/sup/src/supmsg.h
index 2056e841a5d..2a58b2430ce 100644
--- a/usr.bin/sup/src/supmsg.h
+++ b/usr.bin/sup/src/supmsg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: supmsg.h,v 1.5 2001/04/29 18:14:09 millert Exp $	*/
+/*	$OpenBSD: supmsg.h,v 1.6 2001/04/29 21:52:17 millert Exp $	*/
 
 /*
  * Copyright (c) 1992 Carnegie Mellon University
@@ -16,7 +16,7 @@
  *
  * Carnegie Mellon requests users of this software to return to
  *
- *  Software Distribution Coordinator  or  Software_Distribution@CS.CMU.EDU
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
@@ -34,6 +34,14 @@
  *	Modified SUP to use gzip based compression when sending files
  *	across the network to save BandWidth
  *
+ * Revision 1.7  92/08/11  12:08:20  mrt
+ * 	Added copyright.
+ * 	[92/08/10            mrt]
+ * 
+ * Revision 1.6  89/08/23  14:56:42  gm0w
+ * 	Changed MSGF to MSG constants.
+ * 	[89/08/23            gm0w]
+ * 
  * 27-Dec-87  Glenn Marcy (gm0w) at Carnegie-Mellon University
  *	Added crosspatch support.  Removed nameserver support.
  *
diff --git a/usr.bin/sup/src/supscan.c b/usr.bin/sup/src/supscan.c
index 00de100f10a..c1a1968e06e 100644
--- a/usr.bin/sup/src/supscan.c
+++ b/usr.bin/sup/src/supscan.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: supscan.c,v 1.8 1997/09/16 11:01:24 deraadt Exp $	*/
+/*	$OpenBSD: supscan.c,v 1.9 2001/04/29 21:52:17 millert Exp $	*/
 
 /*
  * Copyright (c) 1992 Carnegie Mellon University
@@ -16,7 +16,7 @@
  *
  * Carnegie Mellon requests users of this software to return to
  *
- *  Software Distribution Coordinator  or  Software_Distribution@CS.CMU.EDU
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
@@ -40,6 +40,39 @@
  *
  **********************************************************************
  * HISTORY
+ * Revision 1.14  92/08/11  12:08:30  mrt
+ * 	Picked up Brad's deliniting and variable argument changes
+ * 	[92/08/10            mrt]
+ * 
+ * Revision 1.13  92/02/08  18:04:44  dlc
+ * 	Once again revised localhost().  Do not use gethostbyname() at
+ * 	all, but assume that the host names in the coll.host file are at
+ * 	least a prefix of the fully qualified name.  Modcoll (and related
+ * 	scripts) will maintain this fact.
+ * 	[92/02/08            dlc]
+ * 
+ * Revision 1.12  91/08/17  23:35:31  dlc
+ * 	Changes to localhost() function:
+ * 		- Use host name in kernel for local host name; assume it is
+ * 		  fully qualified.
+ * 		- If gethostbyname() of host to see if we are the repository
+ * 		  fails, with TRY_AGAIN or NO_RECOVERY, then use the "host"
+ * 		  parameter.  Print a diagnostic in this case.
+ * 	[91/08/17            dlc]
+ * 
+ * Revision 1.11  90/04/04  10:53:01  dlc
+ * 	Changed localhost to retry getting the local host name 4 times with
+ * 	30 second sleep intervals before aborting; after 4 tries, things are
+ * 	probably too messed up for the supscan to do anything useful
+ * 	[90/04/04            dlc]
+ * 
+ * Revision 1.10  89/08/03  19:49:33  mja
+ * 	Updated to use v*printf() in place of _doprnt().
+ * 	[89/04/19            mja]
+ * 
+ * Revision 1.9  89/06/18  14:41:37  gm0w
+ * 	Fixed up some notify messages of errors to use "SUP:" prefix.
+ * 	[89/06/18            gm0w]
  * 
  * 13-May-88  Glenn Marcy (gm0w) at Carnegie-Mellon University
  *	Changed goaway to longjmp back to top-level to scan next
diff --git a/usr.bin/sup/src/sysent.h b/usr.bin/sup/src/sysent.h
index f34fbbaa514..31a2538fdfc 100644
--- a/usr.bin/sup/src/sysent.h
+++ b/usr.bin/sup/src/sysent.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sysent.h,v 1.3 1997/04/01 07:35:52 todd Exp $	*/
+/*	$OpenBSD: sysent.h,v 1.4 2001/04/29 21:52:17 millert Exp $	*/
 
 /*
  * Copyright (c) 1991 Carnegie Mellon University
@@ -26,6 +26,22 @@
  */
 /*
  **********************************************************************
+ * HISTORY
+ * Revision 2.4  89/12/05  16:02:00  mrt
+ * 	Removed include of sys/features.h as it is no longer
+ * 	exported or needed.
+ * 	[89/12/05            mrt]
+ * 
+ * Revision 2.3  89/01/20  15:44:24  gm0w
+ * 	Added externs to the non-STDC case for functions that do not
+ * 	have int return values.
+ * 	[88/12/17            gm0w]
+ * 
+ * Revision 2.2  88/12/14  23:35:52  mja
+ * 	Created.
+ * 	[88/01/06            jjk]
+ * 
+ **********************************************************************
  */
 
 #ifndef _SYSENT_H_
diff --git a/usr.bin/sup/src/vprintf.c b/usr.bin/sup/src/vprintf.c
index 0e500681c48..88d40115bfe 100644
--- a/usr.bin/sup/src/vprintf.c
+++ b/usr.bin/sup/src/vprintf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vprintf.c,v 1.5 1997/10/11 23:34:22 beck Exp $	*/
+/*	$OpenBSD: vprintf.c,v 1.6 2001/04/29 21:52:17 millert Exp $	*/
 
 /*
  * Copyright (c) 1991 Carnegie Mellon University
@@ -28,15 +28,38 @@
  * varargs versions of printf routines
  *
  **********************************************************************
+ * HISTORY
+ * Revision 2.5  89/09/08  18:15:55  mbj
+ * 	Use _doprnt() for the Multimax (an "old" architecture).
+ * 	[89/09/08            mbj]
+ * 
+ * Revision 2.4  89/08/03  14:40:10  mja
+ * 	Add vsnprintf() routine.
+ * 	[89/07/12            mja]
+ * 
+ * 	Terminate vsprintf() string with null byte.
+ * 	[89/04/21            mja]
+ * 
+ * 	Change to use new hidden name for _doprnt on MIPS.
+ * 	[89/04/18            mja]
+ * 
+ * Revision 2.3  89/06/10  14:13:43  gm0w
+ * 	Added putc of NULL byte to vsprintf.
+ * 	[89/06/10            gm0w]
+ * 
+ * Revision 2.2  88/12/13  13:53:17  gm0w
+ * 	From Brad White.
+ * 	[88/12/13            gm0w]
+ ************************************************************
  */
 
 #include <stdio.h>
 #include <varargs.h>
 
 #ifdef _IOSTRG
-#define STRFLAG		(_IOSTRG|_IOWRT)	/* no _IOWRT: avoid stdio bug */
+#define STRFLAG	(_IOSTRG|_IOWRT)	/* no _IOWRT: avoid stdio bug */
 #else
-#define STRFLAG		(_IOREAD)		/* XXX: Assume svr4 stdio */
+#define STRFLAG	(_IOREAD)		/* XXX: Assume svr4 stdio */
 #endif
 
 #ifdef DOPRINT_VA