diff --git a/bin/dd/args.c b/bin/dd/args.c
index b3cc1a8ad437..c13be12c0256 100644
--- a/bin/dd/args.c
+++ b/bin/dd/args.c
@@ -34,11 +34,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: args.c,v 1.4 1996/11/12 23:08:58 phk Exp $
+ *	$Id: args.c,v 1.5 1996/11/13 19:59:54 phk Exp $
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)args.c	8.3 (Berkeley) 4/2/94";
+static char const sccsid[] = "@(#)args.c	8.3 (Berkeley) 4/2/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/dd/conv.c b/bin/dd/conv.c
index 09ee56af0d07..dcadadcb8716 100644
--- a/bin/dd/conv.c
+++ b/bin/dd/conv.c
@@ -34,11 +34,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: conv.c,v 1.4 1996/11/12 23:09:04 phk Exp $
+ *	$Id: conv.c,v 1.5 1996/11/13 19:59:56 phk Exp $
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)conv.c	8.3 (Berkeley) 4/2/94";
+static char const sccsid[] = "@(#)conv.c	8.3 (Berkeley) 4/2/94";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -129,7 +129,7 @@ block()
 	 * Copy records (max cbsz size chunks) into the output buffer.  The
 	 * translation is done as we copy into the output buffer.
 	 */
-	ch = 0;			/* Help the compiler. */
+	ch = 0;
 	for (inp = in.dbp - in.dbcnt, outp = out.dbp; in.dbcnt;) {
 		maxlen = MIN(cbsz, in.dbcnt);
 		if ((t = ctab) != NULL)
diff --git a/bin/dd/conv_tab.c b/bin/dd/conv_tab.c
index 2fb2bc6ec706..dba3316f71f9 100644
--- a/bin/dd/conv_tab.c
+++ b/bin/dd/conv_tab.c
@@ -34,11 +34,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: conv_tab.c,v 1.2 1994/09/24 02:54:47 davidg Exp $
+ *	$Id: conv_tab.c,v 1.3 1995/01/17 23:04:28 ache Exp $
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)conv_tab.c	8.1 (Berkeley) 5/31/93";
+static char const sccsid[] = "@(#)conv_tab.c	8.1 (Berkeley) 5/31/93";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/dd/dd.c b/bin/dd/dd.c
index a86c1301f3ea..cccb360746a0 100644
--- a/bin/dd/dd.c
+++ b/bin/dd/dd.c
@@ -34,17 +34,17 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: dd.c,v 1.6 1996/11/12 23:09:09 phk Exp $
+ *	$Id: dd.c,v 1.7 1996/11/13 19:59:58 phk Exp $
  */
 
 #ifndef lint
-static char copyright[] =
+static char const copyright[] =
 "@(#) Copyright (c) 1991, 1993, 1994\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
-static char sccsid[] = "@(#)dd.c	8.5 (Berkeley) 4/2/94";
+static char const sccsid[] = "@(#)dd.c	8.5 (Berkeley) 4/2/94";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -169,7 +169,7 @@ setup()
 	 * Truncate the output file; ignore errors because it fails on some
 	 * kinds of output files, tapes, for example.
 	 */
-	if (ddflags & (C_OF | C_SEEK | C_NOTRUNC) == (C_OF | C_SEEK))
+	if ((ddflags & (C_OF | C_SEEK | C_NOTRUNC)) == (C_OF | C_SEEK))
 		(void)ftruncate(out.fd, (off_t)out.offset * out.dbsz);
 
 	/*
diff --git a/bin/dd/misc.c b/bin/dd/misc.c
index 9b577ef166eb..f1865ed28819 100644
--- a/bin/dd/misc.c
+++ b/bin/dd/misc.c
@@ -34,11 +34,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: misc.c,v 1.3 1996/11/12 23:09:15 phk Exp $
+ *	$Id: misc.c,v 1.4 1996/11/13 20:00:03 phk Exp $
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)misc.c	8.3 (Berkeley) 4/2/94";
+static char const sccsid[] = "@(#)misc.c	8.3 (Berkeley) 4/2/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/dd/position.c b/bin/dd/position.c
index c50102241c99..b317cdc0f764 100644
--- a/bin/dd/position.c
+++ b/bin/dd/position.c
@@ -34,11 +34,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: position.c,v 1.2 1994/09/24 02:55:03 davidg Exp $
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)position.c	8.3 (Berkeley) 4/2/94";
+static char const sccsid[] = "@(#)position.c	8.3 (Berkeley) 4/2/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/domainname/domainname.c b/bin/domainname/domainname.c
index 4295ec5bff27..ade845224184 100644
--- a/bin/domainname/domainname.c
+++ b/bin/domainname/domainname.c
@@ -29,18 +29,18 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ *	$Id: domainname.c,v 1.5 1995/03/19 13:28:17 joerg Exp $
  */
 
 #ifndef lint
-static char copyright[] =
+static char const copyright[] =
 "@(#) Copyright (c) 1988, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
-/*static char sccsid[] = "From: @(#)hostname.c	8.1 (Berkeley) 5/31/93"; */
-static const char rcsid[] =
-	"$Id: domainname.c,v 1.4 1994/09/26 02:14:27 wollman Exp $";
+static char const sccsid[] = "From: @(#)hostname.c	8.1 (Berkeley) 5/31/93";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/echo/echo.c b/bin/echo/echo.c
index e604765e48a3..28152aa65f99 100644
--- a/bin/echo/echo.c
+++ b/bin/echo/echo.c
@@ -30,17 +30,17 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: echo.c,v 1.2 1994/09/24 02:55:18 davidg Exp $
+ *	$Id: echo.c,v 1.3 1995/08/31 17:25:55 jkh Exp $
  */
 
 #ifndef lint
-static char copyright[] =
+static char const copyright[] =
 "@(#) Copyright (c) 1989, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
-static char sccsid[] = "@(#)echo.c	8.1 (Berkeley) 5/31/93";
+static char const sccsid[] = "@(#)echo.c	8.1 (Berkeley) 5/31/93";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/bin/ed/buf.c b/bin/ed/buf.c
index e14a65c59730..7f22076a794f 100644
--- a/bin/ed/buf.c
+++ b/bin/ed/buf.c
@@ -25,10 +25,10 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: buf.c,v 1.6 1994/09/24 02:55:22 davidg Exp $
+ *	$Id: buf.c,v 1.7 1995/05/30 00:06:43 rgrimes Exp $
  */
 #ifndef lint
-static char *rcsid = "@(#)buf.c,v 1.4 1994/02/01 00:34:35 alm Exp";
+static char * const rcsid = "@(#)buf.c,v 1.4 1994/02/01 00:34:35 alm Exp";
 #endif /* not lint */
 
 #include <sys/file.h>
diff --git a/bin/ed/cbc.c b/bin/ed/cbc.c
index 4c5211a2a63f..4095cbfff769 100644
--- a/bin/ed/cbc.c
+++ b/bin/ed/cbc.c
@@ -35,11 +35,11 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)bdes.c	5.5 (Berkeley) 6/27/91
- *	$Id: cbc.c,v 1.5 1995/03/19 13:28:24 joerg Exp $
+ *	$Id: cbc.c,v 1.6 1996/08/11 16:48:11 ache Exp $
  */
 
 #ifndef lint
-static char *rcsid = "@(#)cbc.c,v 1.2 1994/02/01 00:34:36 alm Exp";
+static char * const rcsid = "@(#)cbc.c,v 1.2 1994/02/01 00:34:36 alm Exp";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/ed/glbl.c b/bin/ed/glbl.c
index b9856c3e6654..ccdddc65be2f 100644
--- a/bin/ed/glbl.c
+++ b/bin/ed/glbl.c
@@ -25,11 +25,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: glbl.c,v 1.3 1995/03/19 13:28:27 joerg Exp $
+ *	$Id: glbl.c,v 1.4 1995/05/30 00:06:46 rgrimes Exp $
  */
 
 #ifndef lint
-static char *rcsid = "@(#)glob.c,v 1.1 1994/02/01 00:34:40 alm Exp";
+static char * const rcsid = "@(#)glob.c,v 1.1 1994/02/01 00:34:40 alm Exp";
 #endif /* not lint */
 
 #include <sys/ioctl.h>
diff --git a/bin/ed/io.c b/bin/ed/io.c
index 99e832acbb7b..8581d8566f74 100644
--- a/bin/ed/io.c
+++ b/bin/ed/io.c
@@ -24,11 +24,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: io.c,v 1.4 1995/03/19 13:28:32 joerg Exp $
+ *	$Id: io.c,v 1.5 1996/05/23 06:36:34 tg Exp $
  */
 
 #ifndef lint
-static char *rcsid = "@(#)io.c,v 1.1 1994/02/01 00:34:41 alm Exp";
+static char * const rcsid = "@(#)io.c,v 1.1 1994/02/01 00:34:41 alm Exp";
 #endif /* not lint */
 
 #include "ed.h"
diff --git a/bin/ed/main.c b/bin/ed/main.c
index ae713086e1a1..d67eee610161 100644
--- a/bin/ed/main.c
+++ b/bin/ed/main.c
@@ -25,17 +25,17 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: main.c,v 1.5 1995/05/30 00:06:47 rgrimes Exp $
+ *	$Id: main.c,v 1.6 1996/08/11 16:48:11 ache Exp $
  */
 
 #ifndef lint
-char *copyright =
+static char * const copyright =
 "@(#) Copyright (c) 1993 Andrew Moore, Talke Studio. \n\
  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
-static char *rcsid = "@(#)main.c,v 1.1 1994/02/01 00:34:42 alm Exp";
+static char * const rcsid = "@(#)main.c,v 1.1 1994/02/01 00:34:42 alm Exp";
 #endif /* not lint */
 
 /*
@@ -112,6 +112,11 @@ main(argc, argv)
 {
 	int c, n;
 	long status = 0;
+#if __GNUC__
+	/* Avoid longjmp clobbering */
+	(void) &argc;
+	(void) &argv;
+#endif
 
 	(void)setlocale(LC_ALL, "");
 
diff --git a/bin/ed/re.c b/bin/ed/re.c
index 252e8f8678d9..61ee7635809c 100644
--- a/bin/ed/re.c
+++ b/bin/ed/re.c
@@ -25,11 +25,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: re.c,v 1.9 1995/03/19 13:28:36 joerg Exp $
+ *	$Id: re.c,v 1.10 1995/05/30 00:06:47 rgrimes Exp $
  */
 
 #ifndef lint
-static char *rcsid = "@(#)re.c,v 1.6 1994/02/01 00:34:43 alm Exp";
+static char * const rcsid = "@(#)re.c,v 1.6 1994/02/01 00:34:43 alm Exp";
 #endif /* not lint */
 
 #include "ed.h"
diff --git a/bin/ed/sub.c b/bin/ed/sub.c
index c61c7e4e196c..32e44672a7e9 100644
--- a/bin/ed/sub.c
+++ b/bin/ed/sub.c
@@ -25,11 +25,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sub.c,v 1.5 1995/03/19 13:28:38 joerg Exp $
+ *	$Id: sub.c,v 1.6 1995/05/30 00:06:48 rgrimes Exp $
  */
 
 #ifndef lint
-static char *rcsid = "@(#)sub.c,v 1.1 1994/02/01 00:34:44 alm Exp";
+static char * const rcsid = "@(#)sub.c,v 1.1 1994/02/01 00:34:44 alm Exp";
 #endif /* not lint */
 
 #include "ed.h"
diff --git a/bin/ed/undo.c b/bin/ed/undo.c
index ec813c2d5c7d..490362ecdd23 100644
--- a/bin/ed/undo.c
+++ b/bin/ed/undo.c
@@ -24,11 +24,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: undo.c,v 1.3 1994/09/24 02:55:32 davidg Exp $
  */
 
 #ifndef lint
-static char *rcsid = "@(#)undo.c,v 1.1 1994/02/01 00:34:44 alm Exp";
+static char * const rcsid = "@(#)undo.c,v 1.1 1994/02/01 00:34:44 alm Exp";
 #endif /* not lint */
 
 #include "ed.h"
diff --git a/bin/ln/ln.c b/bin/ln/ln.c
index b9c4f3f1eed5..5af826ad41cb 100644
--- a/bin/ln/ln.c
+++ b/bin/ln/ln.c
@@ -30,17 +30,17 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ln.c,v 1.5 1994/12/06 18:50:44 bde Exp $
+ *	$Id: ln.c,v 1.6 1996/05/24 20:36:16 peter Exp $
  */
 
 #ifndef lint
-static char copyright[] =
+static char const copyright[] =
 "@(#) Copyright (c) 1987, 1993, 1994\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
-static char sccsid[] = "@(#)ln.c	8.2 (Berkeley) 3/31/94";
+static char const sccsid[] = "@(#)ln.c	8.2 (Berkeley) 3/31/94";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/mv/mv.c b/bin/mv/mv.c
index b63c4aee9d20..fa201dd9caff 100644
--- a/bin/mv/mv.c
+++ b/bin/mv/mv.c
@@ -33,17 +33,17 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mv.c,v 1.7 1996/02/20 23:27:57 wosch Exp $
+ *	$Id: mv.c,v 1.8 1996/03/01 06:14:13 wosch Exp $
  */
 
 #ifndef lint
-static char copyright[] =
+static char const copyright[] =
 "@(#) Copyright (c) 1989, 1993, 1994\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
-static char sccsid[] = "@(#)mv.c	8.2 (Berkeley) 4/2/94";
+static char const sccsid[] = "@(#)mv.c	8.2 (Berkeley) 4/2/94";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/pax/ar_io.c b/bin/pax/ar_io.c
index 827a02d2224d..bb0d590a19e2 100644
--- a/bin/pax/ar_io.c
+++ b/bin/pax/ar_io.c
@@ -34,11 +34,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ar_io.c,v 1.3 1995/05/30 00:06:52 rgrimes Exp $
+ *	$Id: ar_io.c,v 1.4 1995/10/23 21:22:56 ache Exp $
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)ar_io.c	8.2 (Berkeley) 4/18/94";
+static char const sccsid[] = "@(#)ar_io.c	8.2 (Berkeley) 4/18/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/ar_subs.c b/bin/pax/ar_subs.c
index 7777afb79f41..6a748daaf00c 100644
--- a/bin/pax/ar_subs.c
+++ b/bin/pax/ar_subs.c
@@ -34,11 +34,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ar_subs.c,v 1.3 1995/05/30 00:06:52 rgrimes Exp $
+ *	$Id: ar_subs.c,v 1.4 1995/10/23 21:22:58 ache Exp $
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)ar_subs.c	8.2 (Berkeley) 4/18/94";
+static char const sccsid[] = "@(#)ar_subs.c	8.2 (Berkeley) 4/18/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/buf_subs.c b/bin/pax/buf_subs.c
index fa6f925ac3b1..3d1a5bbe9d01 100644
--- a/bin/pax/buf_subs.c
+++ b/bin/pax/buf_subs.c
@@ -34,11 +34,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: buf_subs.c,v 1.3 1995/05/30 00:06:53 rgrimes Exp $
+ *	$Id: buf_subs.c,v 1.4 1995/10/23 21:23:00 ache Exp $
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)buf_subs.c	8.2 (Berkeley) 4/18/94";
+static char const sccsid[] = "@(#)buf_subs.c	8.2 (Berkeley) 4/18/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/cache.c b/bin/pax/cache.c
index 6ffe469ac7c4..ba416ca5a38a 100644
--- a/bin/pax/cache.c
+++ b/bin/pax/cache.c
@@ -34,11 +34,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cache.c,v 1.2 1994/09/24 02:56:14 davidg Exp $
+ *	$Id: cache.c,v 1.3 1995/10/23 21:23:02 ache Exp $
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)cache.c	8.1 (Berkeley) 5/31/93";
+static char const sccsid[] = "@(#)cache.c	8.1 (Berkeley) 5/31/93";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -244,7 +244,7 @@ name_uid(uid, frc)
 #		ifdef NET2_STAT
 		(void)sprintf(ptr->name, "%u", uid);
 #		else
-		(void)sprintf(ptr->name, "%lu", uid);
+		(void)sprintf(ptr->name, "%lu", (u_long)uid);
 #		endif
 		if (frc == 0)
 			return("");
@@ -321,7 +321,7 @@ name_gid(gid, frc)
 #		ifdef NET2_STAT
 		(void)sprintf(ptr->name, "%u", gid);
 #		else
-		(void)sprintf(ptr->name, "%lu", gid);
+		(void)sprintf(ptr->name, "%lu", (u_long)gid);
 #		endif
 		if (frc == 0)
 			return("");
diff --git a/bin/pax/cpio.c b/bin/pax/cpio.c
index e3fd4f1a420d..4d7a0510a8bc 100644
--- a/bin/pax/cpio.c
+++ b/bin/pax/cpio.c
@@ -34,11 +34,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cpio.c,v 1.3 1995/05/30 00:06:54 rgrimes Exp $
+ *	$Id: cpio.c,v 1.4 1995/10/23 21:23:04 ache Exp $
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)cpio.c	8.1 (Berkeley) 5/31/93";
+static char const sccsid[] = "@(#)cpio.c	8.1 (Berkeley) 5/31/93";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c
index 107a1003329e..b642caeab3c4 100644
--- a/bin/pax/file_subs.c
+++ b/bin/pax/file_subs.c
@@ -34,11 +34,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: file_subs.c,v 1.3 1995/05/30 00:06:56 rgrimes Exp $
+ *	$Id: file_subs.c,v 1.4 1995/10/23 21:23:06 ache Exp $
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)file_subs.c	8.1 (Berkeley) 5/31/93";
+static char const sccsid[] = "@(#)file_subs.c	8.1 (Berkeley) 5/31/93";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/ftree.c b/bin/pax/ftree.c
index 375e62071693..f336a7645e86 100644
--- a/bin/pax/ftree.c
+++ b/bin/pax/ftree.c
@@ -34,11 +34,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ftree.c,v 1.3 1995/05/30 00:06:57 rgrimes Exp $
+ *	$Id: ftree.c,v 1.4 1995/10/23 21:23:10 ache Exp $
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)ftree.c	8.2 (Berkeley) 4/18/94";
+static char const sccsid[] = "@(#)ftree.c	8.2 (Berkeley) 4/18/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/gen_subs.c b/bin/pax/gen_subs.c
index 4c3efdfa47c1..c5bdd6c9032b 100644
--- a/bin/pax/gen_subs.c
+++ b/bin/pax/gen_subs.c
@@ -34,11 +34,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: gen_subs.c,v 1.5 1995/08/07 19:17:36 wollman Exp $
+ *	$Id: gen_subs.c,v 1.6 1995/10/23 21:23:14 ache Exp $
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)gen_subs.c	8.1 (Berkeley) 5/31/93";
+static char const sccsid[] = "@(#)gen_subs.c	8.1 (Berkeley) 5/31/93";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -132,10 +132,11 @@ ls_list(arcn, now)
 	if ((arcn->type == PAX_CHR) || (arcn->type == PAX_BLK))
 #		ifdef NET2_STAT
 		(void)printf("%4u,%4u ", MAJOR(sbp->st_rdev),
+		    MINOR(sbp->st_rdev));
 #		else
 		(void)printf("%4lu,%4lu ", (unsigned long)MAJOR(sbp->st_rdev),
+		    (unsigned long)MINOR(sbp->st_rdev));
 #		endif
-		    MINOR(sbp->st_rdev));
 	else {
 #		ifdef NET2_STAT
 		(void)printf("%9lu ", sbp->st_size);
diff --git a/bin/pax/options.c b/bin/pax/options.c
index 53a9ad6b06a2..244cefa06eda 100644
--- a/bin/pax/options.c
+++ b/bin/pax/options.c
@@ -34,11 +34,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: options.c,v 1.3 1995/03/19 13:28:53 joerg Exp $
+ *	$Id: options.c,v 1.4 1995/10/23 21:23:16 ache Exp $
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)options.c	8.2 (Berkeley) 4/18/94";
+static char const sccsid[] = "@(#)options.c	8.2 (Berkeley) 4/18/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/pat_rep.c b/bin/pax/pat_rep.c
index 451a9dfc0a2f..8a0eeb54c7f9 100644
--- a/bin/pax/pat_rep.c
+++ b/bin/pax/pat_rep.c
@@ -34,11 +34,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: pat_rep.c,v 1.4 1995/05/30 00:06:59 rgrimes Exp $
+ *	$Id: pat_rep.c,v 1.5 1995/10/23 21:23:17 ache Exp $
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)pat_rep.c	8.2 (Berkeley) 4/18/94";
+static char const sccsid[] = "@(#)pat_rep.c	8.2 (Berkeley) 4/18/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/pax.c b/bin/pax/pax.c
index 590072c9e90d..b98ed9ab7fc5 100644
--- a/bin/pax/pax.c
+++ b/bin/pax/pax.c
@@ -34,17 +34,17 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: pax.c,v 1.4 1995/10/23 21:23:19 ache Exp $
+ *	$Id: pax.c,v 1.5 1996/08/11 16:59:27 ache Exp $
  */
 
 #ifndef lint
-static char copyright[] =
+static char const copyright[] =
 "@(#) Copyright (c) 1992, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
-static char sccsid[] = "@(#)pax.c	8.2 (Berkeley) 4/18/94";
+static char const sccsid[] = "@(#)pax.c	8.2 (Berkeley) 4/18/94";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/bin/pax/sel_subs.c b/bin/pax/sel_subs.c
index e759bdb58dbc..ac7400d13716 100644
--- a/bin/pax/sel_subs.c
+++ b/bin/pax/sel_subs.c
@@ -34,11 +34,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sel_subs.c,v 1.2 1994/09/24 02:56:29 davidg Exp $
+ *	$Id: sel_subs.c,v 1.3 1995/10/23 21:23:21 ache Exp $
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)sel_subs.c	8.1 (Berkeley) 5/31/93";
+static char const sccsid[] = "@(#)sel_subs.c	8.1 (Berkeley) 5/31/93";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/tables.c b/bin/pax/tables.c
index b0694176c06d..d076da8b43c6 100644
--- a/bin/pax/tables.c
+++ b/bin/pax/tables.c
@@ -34,11 +34,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: tables.c,v 1.3 1995/05/30 00:07:01 rgrimes Exp $
+ *	$Id: tables.c,v 1.4 1995/10/23 21:23:23 ache Exp $
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)tables.c	8.1 (Berkeley) 5/31/93";
+static char const sccsid[] = "@(#)tables.c	8.1 (Berkeley) 5/31/93";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/tar.c b/bin/pax/tar.c
index a88f6585c090..fff2af6f68d3 100644
--- a/bin/pax/tar.c
+++ b/bin/pax/tar.c
@@ -34,11 +34,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: tar.c,v 1.3 1995/05/30 00:07:03 rgrimes Exp $
+ *	$Id: tar.c,v 1.4 1995/10/23 21:23:25 ache Exp $
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)tar.c	8.2 (Berkeley) 4/18/94";
+static char const sccsid[] = "@(#)tar.c	8.2 (Berkeley) 4/18/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/tty_subs.c b/bin/pax/tty_subs.c
index 0c47facdca90..8aceb7f811a6 100644
--- a/bin/pax/tty_subs.c
+++ b/bin/pax/tty_subs.c
@@ -34,11 +34,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: tty_subs.c,v 1.2 1994/09/24 02:56:38 davidg Exp $
+ *	$Id: tty_subs.c,v 1.3 1995/10/23 21:23:27 ache Exp $
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)tty_subs.c	8.2 (Berkeley) 4/18/94";
+static char const sccsid[] = "@(#)tty_subs.c	8.2 (Berkeley) 4/18/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/ps/devname.c b/bin/ps/devname.c
index 0aedb2b293be..07aa61243212 100644
--- a/bin/ps/devname.c
+++ b/bin/ps/devname.c
@@ -30,11 +30,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: devname.c,v 1.2 1994/09/24 02:56:41 davidg Exp $
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)devname.c	8.1 (Berkeley) 5/31/93";
+static char const sccsid[] = "@(#)devname.c	8.1 (Berkeley) 5/31/93";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/bin/ps/fmt.c b/bin/ps/fmt.c
index 8231c73850be..ceffa30d3ab8 100644
--- a/bin/ps/fmt.c
+++ b/bin/ps/fmt.c
@@ -30,11 +30,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: fmt.c,v 1.5 1995/03/09 20:40:17 davidg Exp $
+ *	$Id: fmt.c,v 1.6 1995/10/23 21:03:40 ache Exp $
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)fmt.c	8.4 (Berkeley) 4/15/94";
+static char const sccsid[] = "@(#)fmt.c	8.4 (Berkeley) 4/15/94";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c
index 16cb8dd32a72..7cd2419cece2 100644
--- a/bin/ps/keyword.c
+++ b/bin/ps/keyword.c
@@ -30,11 +30,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: keyword.c,v 1.8 1995/10/28 20:11:15 phk Exp $
+ *	$Id: keyword.c,v 1.9 1996/07/31 09:27:23 davidg Exp $
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)keyword.c	8.5 (Berkeley) 4/2/94";
+static char const sccsid[] = "@(#)keyword.c	8.5 (Berkeley) 4/2/94";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/ps/nlist.c b/bin/ps/nlist.c
index 293a6273aaf0..2e3be51deeee 100644
--- a/bin/ps/nlist.c
+++ b/bin/ps/nlist.c
@@ -30,11 +30,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: nlist.c,v 1.4 1994/10/02 08:33:29 davidg Exp $
+ *	$Id: nlist.c,v 1.5 1994/11/24 13:13:55 davidg Exp $
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)nlist.c	8.4 (Berkeley) 4/2/94";
+static char const sccsid[] = "@(#)nlist.c	8.4 (Berkeley) 4/2/94";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/ps/print.c b/bin/ps/print.c
index 0d5a09ff74a1..5b7b40fe1afe 100644
--- a/bin/ps/print.c
+++ b/bin/ps/print.c
@@ -30,11 +30,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: print.c,v 1.15 1996/06/29 10:25:31 peter Exp $
+ *	$Id: print.c,v 1.16 1996/10/21 07:30:24 peter Exp $
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)print.c	8.6 (Berkeley) 4/16/94";
+static char const sccsid[] = "@(#)print.c	8.6 (Berkeley) 4/16/94";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -475,7 +475,7 @@ p_rssize(k, ve)		/* doesn't account for text */
 #ifndef NEWVM
 	(void)printf("%*d", v->width, pgtok(KI_PROC(k)->p_rssize));
 #else
-	(void)printf("%*ld", v->width, pgtok(KI_EPROC(k)->e_vm.vm_rssize));
+	(void)printf("%*ld", v->width, (long)pgtok(KI_EPROC(k)->e_vm.vm_rssize));
 #endif
 }
 
@@ -637,7 +637,7 @@ tsize(k, ve)
 #ifndef NEWVM
 	(void)printf("%*d", v->width, pgtok(KI_EPROC(k)->e_xsize));
 #else
-	(void)printf("%*ld", v->width, pgtok(KI_EPROC(k)->e_vm.vm_tsize));
+	(void)printf("%*ld", v->width, (long)pgtok(KI_EPROC(k)->e_vm.vm_tsize));
 #endif
 }
 
diff --git a/bin/ps/ps.c b/bin/ps/ps.c
index 0a91a8eb6fc3..3b4bb46914bb 100644
--- a/bin/ps/ps.c
+++ b/bin/ps/ps.c
@@ -30,17 +30,17 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ps.c,v 1.13 1996/10/21 07:30:26 peter Exp $
+ *	$Id: ps.c,v 1.14 1996/11/10 06:13:12 hsu Exp $
  */
 
 #ifndef lint
-static char copyright[] =
+static char const copyright[] =
 "@(#) Copyright (c) 1990, 1993, 1994\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
-static char sccsid[] = "@(#)ps.c	8.4 (Berkeley) 4/2/94";
+static char const sccsid[] = "@(#)ps.c	8.4 (Berkeley) 4/2/94";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/rcp/rcp.c b/bin/rcp/rcp.c
index d23f451c7153..7d2389707167 100644
--- a/bin/rcp/rcp.c
+++ b/bin/rcp/rcp.c
@@ -30,17 +30,17 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: rcp.c,v 1.7 1996/02/11 09:01:32 markm Exp $
+ *	$Id: rcp.c,v 1.8 1996/09/20 04:45:59 nate Exp $
  */
 
 #ifndef lint
-static char copyright[] =
+static char const copyright[] =
 "@(#) Copyright (c) 1983, 1990, 1992, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
-static char sccsid[] = "@(#)rcp.c	8.2 (Berkeley) 4/2/94";
+static char const sccsid[] = "@(#)rcp.c	8.2 (Berkeley) 4/2/94";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/rcp/util.c b/bin/rcp/util.c
index 099d2f9f2a54..78be62660c4e 100644
--- a/bin/rcp/util.c
+++ b/bin/rcp/util.c
@@ -30,11 +30,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: util.c,v 1.3 1995/03/19 13:29:16 joerg Exp $
+ *	$Id: util.c,v 1.4 1995/05/30 00:07:07 rgrimes Exp $
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)util.c	8.2 (Berkeley) 4/2/94";
+static char const sccsid[] = "@(#)util.c	8.2 (Berkeley) 4/2/94";
 #endif /* not lint */
 
 #include <sys/param.h>