Date: Thu, 1 May 2003 19:30:41 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 30365 for review Message-ID: <200305020230.h422Uf5C021721@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=30365 Change 30365 by peter@peter_daintree on 2003/05/01 19:30:21 IFC @30363 Affected files ... .. //depot/projects/hammer/Makefile.inc1#13 integrate .. //depot/projects/hammer/bin/chio/chio.c#2 integrate .. //depot/projects/hammer/bin/chmod/chmod.c#3 integrate .. //depot/projects/hammer/bin/cp/cp.c#7 integrate .. //depot/projects/hammer/bin/dd/dd.c#3 integrate .. //depot/projects/hammer/bin/df/df.c#5 integrate .. //depot/projects/hammer/bin/domainname/domainname.c#2 integrate .. //depot/projects/hammer/bin/echo/echo.c#3 integrate .. //depot/projects/hammer/bin/ed/main.c#3 integrate .. //depot/projects/hammer/bin/hostname/hostname.c#2 integrate .. //depot/projects/hammer/bin/kill/kill.c#2 integrate .. //depot/projects/hammer/bin/ln/ln.c#2 integrate .. //depot/projects/hammer/bin/mkdir/mkdir.c#2 integrate .. //depot/projects/hammer/bin/mv/mv.c#2 integrate .. //depot/projects/hammer/bin/pax/cpio.c#4 integrate .. //depot/projects/hammer/bin/pax/options.c#4 integrate .. //depot/projects/hammer/bin/pax/pax.c#3 integrate .. //depot/projects/hammer/bin/pax/tar.c#3 integrate .. //depot/projects/hammer/bin/ps/Makefile#3 integrate .. //depot/projects/hammer/bin/pwd/pwd.c#2 integrate .. //depot/projects/hammer/bin/rcp/rcp.c#3 integrate .. //depot/projects/hammer/bin/rm/rm.c#3 integrate .. //depot/projects/hammer/bin/rmdir/rmdir.c#2 integrate .. //depot/projects/hammer/bin/sh/arith.y#2 integrate .. //depot/projects/hammer/bin/sh/arith_lex.l#2 integrate .. //depot/projects/hammer/bin/sh/mknodes.c#2 integrate .. //depot/projects/hammer/bin/sh/mksyntax.c#3 integrate .. //depot/projects/hammer/bin/sleep/sleep.c#3 integrate .. //depot/projects/hammer/bin/stty/stty.c#2 integrate .. //depot/projects/hammer/bin/sync/sync.c#2 integrate .. //depot/projects/hammer/contrib/groff/FREEBSD-upgrade#2 integrate .. //depot/projects/hammer/contrib/openpam/lib/openpam_dynamic.c#2 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_set_item.c#3 integrate .. //depot/projects/hammer/contrib/texinfo/AUTHORS#2 integrate .. //depot/projects/hammer/contrib/texinfo/COPYING#2 integrate .. //depot/projects/hammer/contrib/texinfo/COPYING.DOC#2 integrate .. //depot/projects/hammer/contrib/texinfo/ChangeLog#2 integrate .. //depot/projects/hammer/contrib/texinfo/FREEBSD-Xlist#2 integrate .. //depot/projects/hammer/contrib/texinfo/FREEBSD-upgrade#2 integrate .. //depot/projects/hammer/contrib/texinfo/INSTALL#2 integrate .. //depot/projects/hammer/contrib/texinfo/INTRODUCTION#2 integrate .. //depot/projects/hammer/contrib/texinfo/NEWS#2 integrate .. //depot/projects/hammer/contrib/texinfo/README#2 integrate .. //depot/projects/hammer/contrib/texinfo/TODO#2 integrate .. //depot/projects/hammer/contrib/texinfo/config.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/config.h.in#2 integrate .. //depot/projects/hammer/contrib/texinfo/doc/README#2 integrate .. //depot/projects/hammer/contrib/texinfo/doc/fdl.texi#2 integrate .. //depot/projects/hammer/contrib/texinfo/doc/help2man#2 integrate .. //depot/projects/hammer/contrib/texinfo/doc/info-stnd.texi#2 integrate .. //depot/projects/hammer/contrib/texinfo/doc/info.1#2 integrate .. //depot/projects/hammer/contrib/texinfo/doc/info.5#2 integrate .. //depot/projects/hammer/contrib/texinfo/doc/info.texi#2 integrate .. //depot/projects/hammer/contrib/texinfo/doc/install-info.1#2 integrate .. //depot/projects/hammer/contrib/texinfo/doc/makeinfo.1#2 integrate .. //depot/projects/hammer/contrib/texinfo/doc/texindex.1#2 integrate .. //depot/projects/hammer/contrib/texinfo/doc/texinfo.5#2 integrate .. //depot/projects/hammer/contrib/texinfo/doc/texinfo.txi#2 integrate .. //depot/projects/hammer/contrib/texinfo/doc/version-stnd.texi#2 integrate .. //depot/projects/hammer/contrib/texinfo/doc/version.texi#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/README#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/dir.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/display.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/display.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/doc.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/doc.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/echo-area.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/echo-area.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/filesys.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/filesys.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/footnotes.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/footnotes.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/funs.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/gc.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/indices.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/indices.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/info-utils.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/info-utils.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/info.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/info.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/infodoc.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/infokey.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/infokey.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/infomap.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/infomap.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/m-x.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/man.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/man.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/nodemenu.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/nodes.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/nodes.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/search.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/search.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/session.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/session.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/signals.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/signals.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/termdep.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/terminal.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/terminal.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/tilde.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/variables.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/variables.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/window.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/window.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/lib/README#2 integrate .. //depot/projects/hammer/contrib/texinfo/lib/getopt.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/lib/getopt.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/lib/getopt1.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/lib/gettext.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/lib/substring.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/lib/system.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/lib/xalloc.h#1 branch .. //depot/projects/hammer/contrib/texinfo/lib/xexit.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/lib/xstrdup.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/README#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/cmds.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/cmds.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/defun.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/defun.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/docbook.c#2 delete .. //depot/projects/hammer/contrib/texinfo/makeinfo/docbook.h#2 delete .. //depot/projects/hammer/contrib/texinfo/makeinfo/files.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/files.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/footnote.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/footnote.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/html.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/html.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/index.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/index.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/insertion.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/insertion.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/lang.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/lang.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/macro.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/macro.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/makeinfo.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/makeinfo.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/multi.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/node.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/node.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/sectioning.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/sectioning.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/texinfo.dtd#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/texinfo.xsl#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/toc.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/toc.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/xml.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/xml.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/util/README#2 integrate .. //depot/projects/hammer/contrib/texinfo/util/install-info.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/util/texindex.c#2 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/man/catman/Makefile#2 delete .. //depot/projects/hammer/gnu/usr.bin/man/catman/catman.1#2 delete .. //depot/projects/hammer/gnu/usr.bin/man/catman/catman.perl#2 delete .. //depot/projects/hammer/gnu/usr.bin/texinfo/makeinfo/Makefile#2 integrate .. //depot/projects/hammer/kerberos5/Makefile.inc#4 integrate .. //depot/projects/hammer/lib/Makefile#11 integrate .. //depot/projects/hammer/lib/libc/gen/arc4random.3#2 integrate .. //depot/projects/hammer/lib/libc/gen/check_utility_compat.c#3 integrate .. //depot/projects/hammer/lib/libc/gen/confstr.c#4 integrate .. //depot/projects/hammer/lib/libc/gen/fmtmsg.c#4 integrate .. //depot/projects/hammer/lib/libc/gen/getgrent.c#8 integrate .. //depot/projects/hammer/lib/libc/gen/getpwent.c#6 integrate .. //depot/projects/hammer/lib/libc/include/namespace.h#7 integrate .. //depot/projects/hammer/lib/libc/include/un-namespace.h#6 integrate .. //depot/projects/hammer/lib/libc/locale/setlocale.c#3 integrate .. //depot/projects/hammer/lib/libc/net/getaddrinfo.c#9 integrate .. //depot/projects/hammer/lib/libc/net/gethostbydns.c#6 integrate .. //depot/projects/hammer/lib/libc/net/getnameinfo.c#3 integrate .. //depot/projects/hammer/lib/libc/net/hesiod.c#4 integrate .. //depot/projects/hammer/lib/libc/net/if_nametoindex.c#4 integrate .. //depot/projects/hammer/lib/libc/nls/msgcat.c#5 integrate .. //depot/projects/hammer/lib/libc/rpc/rpc_soc.c#3 integrate .. //depot/projects/hammer/lib/libc/stdlib/realpath.c#5 integrate .. //depot/projects/hammer/lib/libc/string/strerror.c#4 integrate .. //depot/projects/hammer/lib/libc/string/strlcat.c#3 integrate .. //depot/projects/hammer/lib/libc/string/strlcpy.c#3 integrate .. //depot/projects/hammer/lib/libc/yp/yplib.c#3 integrate .. //depot/projects/hammer/lib/libpam/Makefile.inc#5 integrate .. //depot/projects/hammer/libexec/Makefile#9 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#14 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#18 integrate .. //depot/projects/hammer/sbin/dump/Makefile#4 integrate .. //depot/projects/hammer/sbin/dump/dump.8#4 integrate .. //depot/projects/hammer/sbin/dump/dumprmt.c#3 integrate .. //depot/projects/hammer/sbin/dump/main.c#7 integrate .. //depot/projects/hammer/sbin/restore/Makefile#2 integrate .. //depot/projects/hammer/sbin/restore/main.c#4 integrate .. //depot/projects/hammer/sbin/restore/restore.8#4 integrate .. //depot/projects/hammer/share/man/man9/ifnet.9#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acenv.h#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acfreebsd.h#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbcmds.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbxface.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hwsleep.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/psparse.c#5 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#7 integrate .. //depot/projects/hammer/sys/dev/fb/vga.c#11 integrate .. //depot/projects/hammer/sys/dev/ppbus/vpo.c#3 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumstate.c#2 integrate .. //depot/projects/hammer/sys/geom/geom.h#13 integrate .. //depot/projects/hammer/sys/geom/geom_event.c#9 integrate .. //depot/projects/hammer/sys/geom/geom_subr.c#11 integrate .. //depot/projects/hammer/sys/geom/geom_sunlabel.c#10 integrate .. //depot/projects/hammer/sys/kern/kern_exit.c#13 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#15 integrate .. //depot/projects/hammer/sys/kern/kern_idle.c#6 integrate .. //depot/projects/hammer/sys/kern/kern_intr.c#9 integrate .. //depot/projects/hammer/sys/kern/kern_ktr.c#5 integrate .. //depot/projects/hammer/sys/kern/kern_proc.c#15 integrate .. //depot/projects/hammer/sys/kern/kern_prot.c#4 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#5 integrate .. //depot/projects/hammer/sys/kern/subr_prof.c#5 integrate .. //depot/projects/hammer/sys/sparc64/pci/psycho.c#9 integrate .. //depot/projects/hammer/sys/sparc64/sbus/sbus.c#4 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/iommu.c#6 integrate .. //depot/projects/hammer/sys/sys/proc.h#21 integrate .. //depot/projects/hammer/usr.bin/Makefile#10 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#13 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.352 2003/04/30 12:38:20 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.353 2003/05/01 20:41:03 ru Exp $ # # Make command line options: # -DMAKE_KERBEROS5 to build Kerberos5 @@ -640,7 +640,7 @@ _strfile= games/fortune/strfile .endif -.if ${BOOTSTRAPPING} < 500042 +.if ${BOOTSTRAPPING} < 500113 _groff= gnu/usr.bin/groff .else _groff= gnu/usr.bin/groff/tmac ==== //depot/projects/hammer/bin/chio/chio.c#2 (text+ko) ==== @@ -35,13 +35,15 @@ * Addidional Copyright (c) 2000, by C. Stephen Gunn, Waterspout Communications */ +#if 0 #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1996 Jason R. Thorpe. All rights reserved."; #endif /* not lint */ +#endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/chio/chio.c,v 1.25 2002/07/01 10:46:39 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/bin/chio/chio.c,v 1.26 2003/05/01 16:58:54 obrien Exp $"); #include <sys/param.h> #include <sys/chio.h> ==== //depot/projects/hammer/bin/chmod/chmod.c#3 (text+ko) ==== @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1989, 1993, 1994\n\ @@ -38,12 +39,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)chmod.c 8.8 (Berkeley) 4/1/94"; +#endif /* not lint */ #endif -#endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/chmod/chmod.c,v 1.28 2003/01/29 21:46:12 mux Exp $"); +__FBSDID("$FreeBSD: src/bin/chmod/chmod.c,v 1.29 2003/05/01 16:58:54 obrien Exp $"); #include <sys/types.h> #include <sys/stat.h> ==== //depot/projects/hammer/bin/cp/cp.c#7 (text+ko) ==== @@ -34,6 +34,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1988, 1993, 1994\n\ @@ -41,12 +42,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)cp.c 8.2 (Berkeley) 4/1/94"; +#endif /* not lint */ #endif -#endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.47 2003/04/13 08:47:30 bde Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.48 2003/05/01 16:58:54 obrien Exp $"); /* * Cp copies source files to target files. ==== //depot/projects/hammer/bin/dd/dd.c#3 (text+ko) ==== @@ -35,6 +35,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1991, 1993, 1994\n\ @@ -42,12 +43,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)dd.c 8.5 (Berkeley) 4/2/94"; +#endif /* not lint */ #endif -#endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/dd/dd.c,v 1.39 2003/02/27 18:04:54 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/dd/dd.c,v 1.40 2003/05/01 16:58:54 obrien Exp $"); #include <sys/param.h> #include <sys/stat.h> ==== //depot/projects/hammer/bin/df/df.c#5 (text+ko) ==== @@ -36,6 +36,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1980, 1990, 1993, 1994\n\ @@ -43,12 +44,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)df.c 8.9 (Berkeley) 5/8/95"; +#endif /* not lint */ #endif -#endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.45 2002/12/30 18:10:37 mike Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.46 2003/05/01 16:58:55 obrien Exp $"); #include <sys/param.h> #include <sys/stat.h> ==== //depot/projects/hammer/bin/domainname/domainname.c#2 (text+ko) ==== @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1988, 1993\n\ @@ -38,12 +39,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char const sccsid[] = "From: @(#)hostname.c 8.1 (Berkeley) 5/31/93"; +#endif /* not lint */ #endif -#endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/domainname/domainname.c,v 1.16 2002/06/30 05:13:53 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/domainname/domainname.c,v 1.17 2003/05/01 16:58:55 obrien Exp $"); #include <sys/param.h> ==== //depot/projects/hammer/bin/echo/echo.c#3 (text+ko) ==== @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1989, 1993\n\ @@ -38,12 +39,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)echo.c 8.1 (Berkeley) 5/31/93"; +#endif /* not lint */ #endif -#endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/echo/echo.c,v 1.14 2002/11/13 01:39:02 njl Exp $"); +__FBSDID("$FreeBSD: src/bin/echo/echo.c,v 1.15 2003/05/01 16:58:55 obrien Exp $"); #include <unistd.h> #include <string.h> ==== //depot/projects/hammer/bin/ed/main.c#3 (text+ko) ==== @@ -27,13 +27,15 @@ */ #ifndef lint +#if 0 static const char copyright[] = "@(#) Copyright (c) 1993 Andrew Moore, Talke Studio. \n\ All rights reserved.\n"; +#endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ed/main.c,v 1.25 2002/08/25 13:01:43 charnier Exp $"); +__FBSDID("$FreeBSD: src/bin/ed/main.c,v 1.26 2003/05/01 16:58:55 obrien Exp $"); /* * CREDITS ==== //depot/projects/hammer/bin/hostname/hostname.c#2 (text+ko) ==== @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1988, 1993\n\ @@ -38,12 +39,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)hostname.c 8.1 (Berkeley) 5/31/93"; +#endif /* not lint */ #endif -#endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/hostname/hostname.c,v 1.14 2002/06/30 05:13:53 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/hostname/hostname.c,v 1.15 2003/05/01 16:58:55 obrien Exp $"); #include <sys/param.h> ==== //depot/projects/hammer/bin/kill/kill.c#2 (text+ko) ==== @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1988, 1993, 1994\n\ @@ -38,12 +39,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)kill.c 8.4 (Berkeley) 4/28/95"; +#endif /* not lint */ #endif -#endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/kill/kill.c,v 1.15 2002/06/30 05:13:53 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/kill/kill.c,v 1.16 2003/05/01 16:58:55 obrien Exp $"); #include <ctype.h> #include <err.h> ==== //depot/projects/hammer/bin/ln/ln.c#2 (text+ko) ==== @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1987, 1993, 1994\n\ @@ -38,12 +39,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)ln.c 8.2 (Berkeley) 3/31/94"; +#endif /* not lint */ #endif -#endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ln/ln.c,v 1.29 2002/07/31 16:53:59 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/ln/ln.c,v 1.30 2003/05/01 16:58:55 obrien Exp $"); #include <sys/param.h> #include <sys/stat.h> ==== //depot/projects/hammer/bin/mkdir/mkdir.c#2 (text+ko) ==== @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1983, 1992, 1993\n\ @@ -38,12 +39,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)mkdir.c 8.2 (Berkeley) 1/25/94"; +#endif /* not lint */ #endif -#endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/mkdir/mkdir.c,v 1.26 2002/06/30 05:13:54 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/mkdir/mkdir.c,v 1.27 2003/05/01 16:58:55 obrien Exp $"); #include <sys/types.h> #include <sys/stat.h> ==== //depot/projects/hammer/bin/mv/mv.c#2 (text+ko) ==== @@ -34,6 +34,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1989, 1993, 1994\n\ @@ -41,12 +42,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)mv.c 8.2 (Berkeley) 4/2/94"; +#endif /* not lint */ #endif -#endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.39 2002/07/09 17:45:13 johan Exp $"); +__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.40 2003/05/01 16:58:56 obrien Exp $"); #include <sys/param.h> #include <sys/time.h> ==== //depot/projects/hammer/bin/pax/cpio.c#4 (text+ko) ==== @@ -41,7 +41,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/pax/cpio.c,v 1.20 2003/01/01 18:48:39 schweikh Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/cpio.c,v 1.21 2003/05/02 00:03:10 obrien Exp $"); #include <sys/types.h> #include <sys/time.h> @@ -188,7 +188,7 @@ /* * do not even try bogus values */ - if ((nsz == 0) || (nsz > sizeof(arcn->name))) { + if ((nsz == 0) || (nsz > (int)sizeof(arcn->name))) { paxwarn(1, "Cpio file name length %d is out of range", nsz); return(-1); } @@ -266,7 +266,7 @@ int cpio_id(char *blk, int size) { - if ((size < sizeof(HD_CPIO)) || + if ((size < (int)sizeof(HD_CPIO)) || (strncmp(blk, AMAGIC, sizeof(AMAGIC) - 1) != 0)) return(-1); return(0); @@ -522,7 +522,7 @@ int vcpio_id(char *blk, int size) { - if ((size < sizeof(HD_VCPIO)) || + if ((size < (int)sizeof(HD_VCPIO)) || (strncmp(blk, AVMAGIC, sizeof(AVMAGIC) - 1) != 0)) return(-1); return(0); @@ -539,8 +539,8 @@ int crc_id(char *blk, int size) { - if ((size < sizeof(HD_VCPIO)) || - (strncmp(blk, AVCMAGIC, sizeof(AVCMAGIC) - 1) != 0)) + if ((size < (int)sizeof(HD_VCPIO)) || + (strncmp(blk, AVCMAGIC, (int)sizeof(AVCMAGIC) - 1) != 0)) return(-1); return(0); } @@ -860,7 +860,7 @@ int bcpio_id(char *blk, int size) { - if (size < sizeof(HD_BCPIO)) + if (size < (int)sizeof(HD_BCPIO)) return(-1); /* ==== //depot/projects/hammer/bin/pax/options.c#4 (text+ko) ==== @@ -42,7 +42,7 @@ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/pax/options.c,v 1.27 2003/01/01 18:48:39 schweikh Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/options.c,v 1.28 2003/05/02 00:03:10 obrien Exp $"); #include <sys/types.h> #include <sys/stat.h> @@ -188,7 +188,7 @@ pax_options(int argc, char **argv) { int c; - int i; + size_t i; unsigned int flg = 0; unsigned int bflg = 0; char *pt; @@ -1017,7 +1017,8 @@ static void cpio_options(int argc, char **argv) { - int c, i; + int c; + size_t i; char *str; FSUB tmp; FILE *fp; ==== //depot/projects/hammer/bin/pax/pax.c#3 (text+ko) ==== @@ -35,6 +35,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1992, 1993\n\ @@ -42,12 +43,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)pax.c 8.2 (Berkeley) 4/18/94"; +#endif /* not lint */ #endif -#endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/pax/pax.c,v 1.25 2002/08/21 17:32:37 trhodes Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/pax.c,v 1.26 2003/05/02 00:04:21 obrien Exp $"); #include <sys/types.h> #include <sys/stat.h> ==== //depot/projects/hammer/bin/pax/tar.c#3 (text+ko) ==== @@ -41,7 +41,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/pax/tar.c,v 1.21 2002/08/21 17:32:37 trhodes Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/tar.c,v 1.22 2003/05/02 00:03:10 obrien Exp $"); #include <sys/types.h> #include <sys/time.h> @@ -537,7 +537,7 @@ case PAX_SLK: case PAX_HLK: case PAX_HRG: - if (arcn->ln_nlen > sizeof(hd->linkname)) { + if (arcn->ln_nlen > (int)sizeof(hd->linkname)) { paxwarn(1,"Link name too long for tar %s", arcn->ln_name); return(1); } @@ -554,7 +554,7 @@ len = arcn->nlen; if (arcn->type == PAX_DIR) ++len; - if (len >= sizeof(hd->name)) { + if (len >= (int)sizeof(hd->name)) { paxwarn(1, "File name too long for tar %s", arcn->name); return(1); } @@ -903,7 +903,8 @@ * check the length of the linkname */ if (((arcn->type == PAX_SLK) || (arcn->type == PAX_HLK) || - (arcn->type == PAX_HRG)) && (arcn->ln_nlen >= sizeof(hd->linkname))){ + (arcn->type == PAX_HRG)) && + (arcn->ln_nlen >= (int)sizeof(hd->linkname))) { paxwarn(1, "Link name too long for ustar %s", arcn->ln_name); return(1); } ==== //depot/projects/hammer/bin/ps/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/bin/ps/Makefile,v 1.22 2002/10/24 00:00:57 rwatson Exp $ +# $FreeBSD: src/bin/ps/Makefile,v 1.23 2003/05/02 01:05:05 obrien Exp $ # @(#)Makefile 8.1 (Berkeley) 6/2/93 PROG= ps @@ -9,6 +9,7 @@ # keep ps from being an unnecessary load # on large systems. # +WARNS= 1 WFORMAT=0 CFLAGS+=-DLAZY_PS DPADD= ${LIBM} ${LIBKVM} ==== //depot/projects/hammer/bin/pwd/pwd.c#2 (text+ko) ==== @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1991, 1993, 1994\n\ @@ -38,12 +39,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)pwd.c 8.3 (Berkeley) 4/1/94"; +#endif /* not lint */ #endif -#endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/pwd/pwd.c,v 1.20 2002/06/30 05:15:02 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/pwd/pwd.c,v 1.21 2003/05/01 16:58:56 obrien Exp $"); #include <sys/param.h> #include <sys/stat.h> ==== //depot/projects/hammer/bin/rcp/rcp.c#3 (text+ko) ==== @@ -38,20 +38,19 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint 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 */ -#if 0 #ifndef lint static char sccsid[] = "@(#)rcp.c 8.2 (Berkeley) 4/2/94"; #endif /* not lint */ #endif - #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/rcp/rcp.c,v 1.39 2002/10/16 16:06:46 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/rcp/rcp.c,v 1.40 2003/05/01 16:58:56 obrien Exp $"); #include <sys/param.h> #include <sys/stat.h> ==== //depot/projects/hammer/bin/rm/rm.c#3 (text+ko) ==== @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1990, 1993, 1994\n\ @@ -38,12 +39,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)rm.c 8.5 (Berkeley) 4/18/94"; +#endif /* not lint */ #endif -#endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.42 2002/08/21 17:32:42 trhodes Exp $"); +__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.43 2003/05/01 16:58:56 obrien Exp $"); #include <sys/stat.h> #include <sys/param.h> ==== //depot/projects/hammer/bin/rmdir/rmdir.c#2 (text+ko) ==== @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1992, 1993, 1994\n\ @@ -38,12 +39,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)rmdir.c 8.3 (Berkeley) 4/2/94"; +#endif /* not lint */ #endif -#endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/rmdir/rmdir.c,v 1.13 2002/06/30 05:15:03 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/rmdir/rmdir.c,v 1.14 2003/05/01 16:58:56 obrien Exp $"); #include <err.h> #include <errno.h> ==== //depot/projects/hammer/bin/sh/arith.y#2 (text+ko) ==== @@ -93,9 +93,9 @@ #if 0 static char sccsid[] = "@(#)arith.y 8.3 (Berkeley) 5/4/95"; #endif -static const char rcsid[] = - "$FreeBSD: src/bin/sh/arith.y,v 1.13 2002/02/02 06:50:45 imp Exp $"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/bin/sh/arith.y,v 1.14 2003/05/01 16:58:56 obrien Exp $"); #include "shell.h" #include "error.h" ==== //depot/projects/hammer/bin/sh/arith_lex.l#2 (text+ko) ==== @@ -39,9 +39,9 @@ #if 0 static char sccsid[] = "@(#)arith_lex.l 8.3 (Berkeley) 5/4/95"; #endif -static const char rcsid[] = - "$FreeBSD: src/bin/sh/arith_lex.l,v 1.17 2002/02/02 06:50:46 imp Exp $"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/bin/sh/arith_lex.l,v 1.18 2003/05/01 16:58:56 obrien Exp $"); #include "y.tab.h" #include "error.h" ==== //depot/projects/hammer/bin/sh/mknodes.c#2 (text+ko) ==== @@ -34,6 +34,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1991, 1993\n\ @@ -41,12 +42,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)mknodes.c 8.2 (Berkeley) 5/4/95"; +#endif /* not lint */ #endif -#endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/mknodes.c,v 1.15 2002/06/30 05:15:04 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/mknodes.c,v 1.16 2003/05/01 16:58:56 obrien Exp $"); /* * This program reads the nodetypes file and nodes.c.pat file. It generates ==== //depot/projects/hammer/bin/sh/mksyntax.c#3 (text+ko) ==== @@ -34,6 +34,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1991, 1993\n\ @@ -41,12 +42,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)mksyntax.c 8.2 (Berkeley) 5/4/95"; +#endif /* not lint */ #endif -#endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/mksyntax.c,v 1.21 2002/10/02 09:57:54 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/mksyntax.c,v 1.22 2003/05/01 16:58:56 obrien Exp $"); /* * This program creates syntax.h and syntax.c. ==== //depot/projects/hammer/bin/sleep/sleep.c#3 (text+ko) ==== @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1988, 1993, 1994\n\ @@ -38,12 +39,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)sleep.c 8.3 (Berkeley) 4/2/94"; +#endif /* not lint */ #endif -#endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sleep/sleep.c,v 1.15 2002/11/14 01:14:35 njl Exp $"); +__FBSDID("$FreeBSD: src/bin/sleep/sleep.c,v 1.16 2003/05/01 16:58:56 obrien Exp $"); #include <ctype.h> #include <limits.h> ==== //depot/projects/hammer/bin/stty/stty.c#2 (text+ko) ==== @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1989, 1991, 1993, 1994\n\ @@ -38,12 +39,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)stty.c 8.3 (Berkeley) 4/2/94"; +#endif /* not lint */ #endif -#endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/stty/stty.c,v 1.20 2002/06/30 05:15:04 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/stty/stty.c,v 1.21 2003/05/01 16:58:57 obrien Exp $"); #include <sys/types.h> ==== //depot/projects/hammer/bin/sync/sync.c#2 (text+ko) ==== @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1987, 1993\n\ @@ -38,12 +39,11 @@ #endif /* not lint */ #ifndef lint -#if 0 >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200305020230.h422Uf5C021721>