Date: Tue, 6 Apr 2004 16:48:19 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 50538 for review Message-ID: <200404062348.i36NmJYe011564@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=50538 Change 50538 by peter@peter_daintree on 2004/04/06 16:48:00 IFC @50537 Affected files ... .. //depot/projects/hammer/bin/cat/cat.1#3 integrate .. //depot/projects/hammer/bin/cat/cat.c#4 integrate .. //depot/projects/hammer/bin/chflags/chflags.1#4 integrate .. //depot/projects/hammer/bin/chflags/chflags.c#4 integrate .. //depot/projects/hammer/bin/chmod/chmod.1#5 integrate .. //depot/projects/hammer/bin/chmod/chmod.c#6 integrate .. //depot/projects/hammer/bin/cp/cp.1#5 integrate .. //depot/projects/hammer/bin/cp/cp.c#9 integrate .. //depot/projects/hammer/bin/cp/extern.h#4 integrate .. //depot/projects/hammer/bin/cp/utils.c#6 integrate .. //depot/projects/hammer/bin/csh/USD.doc/csh.1#3 integrate .. //depot/projects/hammer/bin/csh/USD.doc/csh.2#2 integrate .. //depot/projects/hammer/bin/csh/USD.doc/csh.3#2 integrate .. //depot/projects/hammer/bin/csh/USD.doc/csh.4#2 integrate .. //depot/projects/hammer/bin/csh/USD.doc/csh.a#2 integrate .. //depot/projects/hammer/bin/csh/USD.doc/csh.g#4 integrate .. //depot/projects/hammer/bin/csh/USD.doc/tabs#2 integrate .. //depot/projects/hammer/bin/csh/host.defs#2 integrate .. //depot/projects/hammer/bin/date/date.1#5 integrate .. //depot/projects/hammer/bin/date/date.c#6 integrate .. //depot/projects/hammer/bin/date/extern.h#2 integrate .. //depot/projects/hammer/bin/date/netdate.c#3 integrate .. //depot/projects/hammer/bin/dd/args.c#5 integrate .. //depot/projects/hammer/bin/dd/conv.c#3 integrate .. //depot/projects/hammer/bin/dd/conv_tab.c#2 integrate .. //depot/projects/hammer/bin/dd/dd.1#4 integrate .. //depot/projects/hammer/bin/dd/dd.c#5 integrate .. //depot/projects/hammer/bin/dd/dd.h#5 integrate .. //depot/projects/hammer/bin/dd/extern.h#3 integrate .. //depot/projects/hammer/bin/dd/misc.c#3 integrate .. //depot/projects/hammer/bin/dd/position.c#3 integrate .. //depot/projects/hammer/bin/df/df.1#5 integrate .. //depot/projects/hammer/bin/df/df.c#14 integrate .. //depot/projects/hammer/bin/domainname/domainname.1#2 integrate .. //depot/projects/hammer/bin/domainname/domainname.c#3 integrate .. //depot/projects/hammer/bin/echo/echo.1#4 integrate .. //depot/projects/hammer/bin/echo/echo.c#5 integrate .. //depot/projects/hammer/bin/ed/cbc.c#4 integrate .. //depot/projects/hammer/bin/hostname/hostname.1#2 integrate .. //depot/projects/hammer/bin/hostname/hostname.c#3 integrate .. //depot/projects/hammer/bin/kill/kill.1#2 integrate .. //depot/projects/hammer/bin/kill/kill.c#5 integrate .. //depot/projects/hammer/bin/ln/ln.1#3 integrate .. //depot/projects/hammer/bin/ln/ln.c#3 integrate .. //depot/projects/hammer/bin/ln/symlink.7#3 integrate .. //depot/projects/hammer/bin/ls/cmp.c#3 integrate .. //depot/projects/hammer/bin/ls/extern.h#5 integrate .. //depot/projects/hammer/bin/ls/ls.1#11 integrate .. //depot/projects/hammer/bin/ls/ls.c#10 integrate .. //depot/projects/hammer/bin/ls/ls.h#4 integrate .. //depot/projects/hammer/bin/ls/print.c#11 integrate .. //depot/projects/hammer/bin/ls/util.c#5 integrate .. //depot/projects/hammer/bin/mkdir/mkdir.1#2 integrate .. //depot/projects/hammer/bin/mkdir/mkdir.c#3 integrate .. //depot/projects/hammer/bin/mv/mv.1#3 integrate .. //depot/projects/hammer/bin/mv/mv.c#5 integrate .. //depot/projects/hammer/bin/pax/ar_io.c#5 integrate .. //depot/projects/hammer/bin/pax/ar_subs.c#4 integrate .. //depot/projects/hammer/bin/pax/buf_subs.c#4 integrate .. //depot/projects/hammer/bin/pax/cache.c#5 integrate .. //depot/projects/hammer/bin/pax/cache.h#3 integrate .. //depot/projects/hammer/bin/pax/cpio.c#6 integrate .. //depot/projects/hammer/bin/pax/cpio.h#2 integrate .. //depot/projects/hammer/bin/pax/extern.h#3 integrate .. //depot/projects/hammer/bin/pax/file_subs.c#3 integrate .. //depot/projects/hammer/bin/pax/ftree.c#4 integrate .. //depot/projects/hammer/bin/pax/ftree.h#2 integrate .. //depot/projects/hammer/bin/pax/gen_subs.c#4 integrate .. //depot/projects/hammer/bin/pax/options.c#7 integrate .. //depot/projects/hammer/bin/pax/options.h#2 integrate .. //depot/projects/hammer/bin/pax/pat_rep.c#5 integrate .. //depot/projects/hammer/bin/pax/pat_rep.h#2 integrate .. //depot/projects/hammer/bin/pax/pax.1#5 integrate .. //depot/projects/hammer/bin/pax/pax.c#5 integrate .. //depot/projects/hammer/bin/pax/pax.h#5 integrate .. //depot/projects/hammer/bin/pax/sel_subs.c#3 integrate .. //depot/projects/hammer/bin/pax/sel_subs.h#2 integrate .. //depot/projects/hammer/bin/pax/tables.c#3 integrate .. //depot/projects/hammer/bin/pax/tables.h#3 integrate .. //depot/projects/hammer/bin/pax/tar.c#4 integrate .. //depot/projects/hammer/bin/pax/tar.h#2 integrate .. //depot/projects/hammer/bin/pax/tty_subs.c#3 integrate .. //depot/projects/hammer/bin/ps/extern.h#8 integrate .. //depot/projects/hammer/bin/ps/fmt.c#4 integrate .. //depot/projects/hammer/bin/ps/keyword.c#10 integrate .. //depot/projects/hammer/bin/ps/nlist.c#4 integrate .. //depot/projects/hammer/bin/ps/print.c#10 integrate .. //depot/projects/hammer/bin/ps/ps.1#14 integrate .. //depot/projects/hammer/bin/ps/ps.c#11 integrate .. //depot/projects/hammer/bin/ps/ps.h#6 integrate .. //depot/projects/hammer/bin/pwd/pwd.1#4 integrate .. //depot/projects/hammer/bin/pwd/pwd.c#4 integrate .. //depot/projects/hammer/bin/rcp/extern.h#2 integrate .. //depot/projects/hammer/bin/rcp/rcp.1#2 integrate .. //depot/projects/hammer/bin/rcp/util.c#4 integrate .. //depot/projects/hammer/bin/realpath/realpath.1#2 integrate .. //depot/projects/hammer/bin/realpath/realpath.c#3 integrate .. //depot/projects/hammer/bin/rm/rm.1#4 integrate .. //depot/projects/hammer/bin/rm/rm.c#7 integrate .. //depot/projects/hammer/bin/rmdir/rmdir.1#3 integrate .. //depot/projects/hammer/bin/rmdir/rmdir.c#4 integrate .. //depot/projects/hammer/bin/sh/alias.c#3 integrate .. //depot/projects/hammer/bin/sh/alias.h#2 integrate .. //depot/projects/hammer/bin/sh/arith.h#3 integrate .. //depot/projects/hammer/bin/sh/arith.y#4 integrate .. //depot/projects/hammer/bin/sh/arith_lex.l#4 integrate .. //depot/projects/hammer/bin/sh/bltin/bltin.h#2 integrate .. //depot/projects/hammer/bin/sh/bltin/echo.1#3 integrate .. //depot/projects/hammer/bin/sh/bltin/echo.c#3 integrate .. //depot/projects/hammer/bin/sh/builtins.def#3 integrate .. //depot/projects/hammer/bin/sh/cd.c#3 integrate .. //depot/projects/hammer/bin/sh/cd.h#2 integrate .. //depot/projects/hammer/bin/sh/error.c#4 integrate .. //depot/projects/hammer/bin/sh/error.h#3 integrate .. //depot/projects/hammer/bin/sh/eval.c#7 integrate .. //depot/projects/hammer/bin/sh/eval.h#2 integrate .. //depot/projects/hammer/bin/sh/exec.c#4 integrate .. //depot/projects/hammer/bin/sh/exec.h#3 integrate .. //depot/projects/hammer/bin/sh/expand.c#9 integrate .. //depot/projects/hammer/bin/sh/expand.h#3 integrate .. //depot/projects/hammer/bin/sh/funcs/cmv#2 integrate .. //depot/projects/hammer/bin/sh/funcs/dirs#2 integrate .. //depot/projects/hammer/bin/sh/funcs/kill#2 integrate .. //depot/projects/hammer/bin/sh/funcs/login#2 integrate .. //depot/projects/hammer/bin/sh/funcs/newgrp#2 integrate .. //depot/projects/hammer/bin/sh/funcs/popd#2 integrate .. //depot/projects/hammer/bin/sh/funcs/pushd#2 integrate .. //depot/projects/hammer/bin/sh/funcs/suspend#2 integrate .. //depot/projects/hammer/bin/sh/histedit.c#3 integrate .. //depot/projects/hammer/bin/sh/init.h#2 integrate .. //depot/projects/hammer/bin/sh/input.c#4 integrate .. //depot/projects/hammer/bin/sh/input.h#2 integrate .. //depot/projects/hammer/bin/sh/jobs.c#10 integrate .. //depot/projects/hammer/bin/sh/jobs.h#2 integrate .. //depot/projects/hammer/bin/sh/mail.c#2 integrate .. //depot/projects/hammer/bin/sh/mail.h#2 integrate .. //depot/projects/hammer/bin/sh/main.c#3 integrate .. //depot/projects/hammer/bin/sh/main.h#2 integrate .. //depot/projects/hammer/bin/sh/memalloc.c#4 integrate .. //depot/projects/hammer/bin/sh/memalloc.h#2 integrate .. //depot/projects/hammer/bin/sh/miscbltin.c#3 integrate .. //depot/projects/hammer/bin/sh/mkbuiltins#4 integrate .. //depot/projects/hammer/bin/sh/mkinit.c#2 integrate .. //depot/projects/hammer/bin/sh/mknodes.c#3 integrate .. //depot/projects/hammer/bin/sh/mksyntax.c#4 integrate .. //depot/projects/hammer/bin/sh/mktokens#2 integrate .. //depot/projects/hammer/bin/sh/myhistedit.h#2 integrate .. //depot/projects/hammer/bin/sh/mystring.c#2 integrate .. //depot/projects/hammer/bin/sh/mystring.h#2 integrate .. //depot/projects/hammer/bin/sh/nodes.c.pat#4 integrate .. //depot/projects/hammer/bin/sh/nodetypes#2 integrate .. //depot/projects/hammer/bin/sh/options.c#2 integrate .. //depot/projects/hammer/bin/sh/options.h#2 integrate .. //depot/projects/hammer/bin/sh/output.c#4 integrate .. //depot/projects/hammer/bin/sh/output.h#2 integrate .. //depot/projects/hammer/bin/sh/parser.c#7 integrate .. //depot/projects/hammer/bin/sh/parser.h#2 integrate .. //depot/projects/hammer/bin/sh/redir.c#5 integrate .. //depot/projects/hammer/bin/sh/redir.h#3 integrate .. //depot/projects/hammer/bin/sh/sh.1#8 integrate .. //depot/projects/hammer/bin/sh/shell.h#3 integrate .. //depot/projects/hammer/bin/sh/show.c#4 integrate .. //depot/projects/hammer/bin/sh/show.h#2 integrate .. //depot/projects/hammer/bin/sh/trap.c#4 integrate .. //depot/projects/hammer/bin/sh/trap.h#2 integrate .. //depot/projects/hammer/bin/sh/var.c#5 integrate .. //depot/projects/hammer/bin/sh/var.h#3 integrate .. //depot/projects/hammer/bin/sleep/sleep.1#2 integrate .. //depot/projects/hammer/bin/sleep/sleep.c#5 integrate .. //depot/projects/hammer/bin/stty/cchar.c#2 integrate .. //depot/projects/hammer/bin/stty/extern.h#2 integrate .. //depot/projects/hammer/bin/stty/gfmt.c#3 integrate .. //depot/projects/hammer/bin/stty/key.c#2 integrate .. //depot/projects/hammer/bin/stty/modes.c#2 integrate .. //depot/projects/hammer/bin/stty/print.c#2 integrate .. //depot/projects/hammer/bin/stty/stty.1#2 integrate .. //depot/projects/hammer/bin/stty/stty.c#3 integrate .. //depot/projects/hammer/bin/stty/stty.h#2 integrate .. //depot/projects/hammer/bin/stty/util.c#2 integrate .. //depot/projects/hammer/bin/sync/sync.8#2 integrate .. //depot/projects/hammer/bin/sync/sync.c#3 integrate .. //depot/projects/hammer/bin/test/test.1#2 integrate .. //depot/projects/hammer/etc/rc.d/ramdisk#2 integrate .. //depot/projects/hammer/etc/rc.d/ramdisk-own#1 branch .. //depot/projects/hammer/lib/libarchive/archive_entry.c#5 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.h#4 integrate .. //depot/projects/hammer/lib/libarchive/archive_private.h#5 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_extract.c#4 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_pax.c#6 integrate .. //depot/projects/hammer/lib/libc/locale/btowc.c#3 integrate .. //depot/projects/hammer/lib/libc/locale/mblen.c#4 integrate .. //depot/projects/hammer/lib/libc/locale/mbrlen.c#2 integrate .. //depot/projects/hammer/lib/libc/locale/mbrtowc.c#5 integrate .. //depot/projects/hammer/lib/libc/locale/mbsrtowcs.c#2 integrate .. //depot/projects/hammer/lib/libc/locale/mbstowcs.c#5 integrate .. //depot/projects/hammer/lib/libc/locale/mbtowc.c#4 integrate .. //depot/projects/hammer/lib/libc/locale/wcrtomb.c#6 integrate .. //depot/projects/hammer/lib/libc/locale/wcsrtombs.c#2 integrate .. //depot/projects/hammer/lib/libc/locale/wcstombs.c#4 integrate .. //depot/projects/hammer/lib/libc/locale/wctob.c#3 integrate .. //depot/projects/hammer/lib/libc/locale/wctomb.c#4 integrate .. //depot/projects/hammer/lib/libc/net/name6.c#10 integrate .. //depot/projects/hammer/lib/libc/sys/getfh.2#4 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#49 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#64 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/ct.4#4 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/ctau.4#2 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/cx.4#9 integrate .. //depot/projects/hammer/share/man/man9/suser.9#3 integrate .. //depot/projects/hammer/share/man/man9/sysctl_ctx_init.9#2 integrate .. //depot/projects/hammer/share/man/man9/timeout.9#3 integrate .. //depot/projects/hammer/sys/conf/options#35 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#30 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbb.c#24 integrate .. //depot/projects/hammer/sys/dev/usb/if_rue.c#9 integrate .. //depot/projects/hammer/sys/ia64/ia64/pmap.c#24 integrate .. //depot/projects/hammer/sys/ia64/include/pmap.h#10 integrate .. //depot/projects/hammer/sys/kern/kern_condvar.c#16 integrate .. //depot/projects/hammer/sys/kern/kern_mutex.c#17 integrate .. //depot/projects/hammer/sys/kern/kern_timeout.c#12 integrate .. //depot/projects/hammer/sys/kern/subr_turnstile.c#8 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#25 integrate .. //depot/projects/hammer/sys/modules/pf/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/pflog/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/pfsync/Makefile#2 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.c#21 integrate .. //depot/projects/hammer/sys/nfsserver/nfs.h#5 integrate .. //depot/projects/hammer/sys/pc98/conf/NOTES#24 integrate .. //depot/projects/hammer/sys/pci/if_ste.c#23 integrate .. //depot/projects/hammer/sys/pci/if_stereg.h#7 integrate .. //depot/projects/hammer/sys/sys/callout.h#2 integrate .. //depot/projects/hammer/sys/sys/condvar.h#4 integrate .. //depot/projects/hammer/sys/sys/mount.h#15 integrate .. //depot/projects/hammer/sys/sys/turnstile.h#3 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_softdep.c#13 integrate .. //depot/projects/hammer/sys/vm/device_pager.c#8 integrate .. //depot/projects/hammer/sys/vm/pmap.h#17 integrate .. //depot/projects/hammer/sys/vm/swap_pager.h#9 integrate .. //depot/projects/hammer/sys/vm/vm.h#3 integrate .. //depot/projects/hammer/sys/vm/vm_contig.c#16 integrate .. //depot/projects/hammer/sys/vm/vm_extern.h#11 integrate .. //depot/projects/hammer/sys/vm/vm_glue.c#26 integrate .. //depot/projects/hammer/sys/vm/vm_init.c#8 integrate .. //depot/projects/hammer/sys/vm/vm_kern.c#17 integrate .. //depot/projects/hammer/sys/vm/vm_kern.h#4 integrate .. //depot/projects/hammer/sys/vm/vm_map.c#33 integrate .. //depot/projects/hammer/sys/vm/vm_map.h#12 integrate .. //depot/projects/hammer/sys/vm/vm_meter.c#8 integrate .. //depot/projects/hammer/sys/vm/vm_mmap.c#22 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#37 integrate .. //depot/projects/hammer/sys/vm/vm_object.h#16 integrate .. //depot/projects/hammer/sys/vm/vm_page.c#24 integrate .. //depot/projects/hammer/sys/vm/vm_page.h#14 integrate .. //depot/projects/hammer/sys/vm/vm_pageout.h#8 integrate .. //depot/projects/hammer/sys/vm/vm_pager.c#12 integrate .. //depot/projects/hammer/sys/vm/vm_pager.h#6 integrate .. //depot/projects/hammer/sys/vm/vm_param.h#3 integrate .. //depot/projects/hammer/sys/vm/vm_unix.c#6 integrate .. //depot/projects/hammer/sys/vm/vnode_pager.c#18 integrate .. //depot/projects/hammer/sys/vm/vnode_pager.h#2 integrate .. //depot/projects/hammer/usr.bin/Makefile#29 integrate .. //depot/projects/hammer/usr.bin/fetch/fetch.c#8 integrate .. //depot/projects/hammer/usr.bin/tar/write.c#2 integrate Differences ... ==== //depot/projects/hammer/bin/cat/cat.1#3 (text+ko) ==== @@ -12,10 +12,6 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by the University of -.\" California, Berkeley and its contributors. .\" 4. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. @@ -33,7 +29,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)cat.1 8.3 (Berkeley) 5/2/95 -.\" $FreeBSD: src/bin/cat/cat.1,v 1.21 2004/03/21 11:04:59 tjr Exp $ +.\" $FreeBSD: src/bin/cat/cat.1,v 1.22 2004/04/06 20:06:44 markm Exp $ .\" .Dd March 21, 2004 .Dt CAT 1 ==== //depot/projects/hammer/bin/cat/cat.c#4 (text+ko) ==== @@ -13,10 +13,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -48,7 +44,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/cat/cat.c,v 1.29 2003/04/30 17:40:28 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/cat/cat.c,v 1.30 2004/04/06 20:06:44 markm Exp $"); #include <sys/param.h> #include <sys/stat.h> ==== //depot/projects/hammer/bin/chflags/chflags.1#4 (text+ko) ==== @@ -12,10 +12,6 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by the University of -.\" California, Berkeley and its contributors. .\" 4. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. @@ -33,7 +29,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)chflags.1 8.4 (Berkeley) 5/2/95 -.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.17 2003/05/16 21:18:01 ru Exp $ +.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.18 2004/04/06 20:06:44 markm Exp $ .\" .Dd March 24, 2003 .Dt CHFLAGS 1 ==== //depot/projects/hammer/bin/chflags/chflags.c#4 (text+ko) ==== @@ -10,10 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -44,7 +40,7 @@ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.19 2004/02/18 18:45:11 ceri Exp $"); +__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.20 2004/04/06 20:06:44 markm Exp $"); #include <sys/types.h> #include <sys/stat.h> ==== //depot/projects/hammer/bin/chmod/chmod.1#5 (text+ko) ==== @@ -12,10 +12,6 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by the University of -.\" California, Berkeley and its contributors. .\" 4. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. @@ -33,7 +29,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)chmod.1 8.4 (Berkeley) 3/31/94 -.\" $FreeBSD: src/bin/chmod/chmod.1,v 1.35 2002/11/25 14:18:42 ru Exp $ +.\" $FreeBSD: src/bin/chmod/chmod.1,v 1.36 2004/04/06 20:06:44 markm Exp $ .\" .Dd March 31, 1994 .Dt CHMOD 1 ==== //depot/projects/hammer/bin/chmod/chmod.c#6 (text+ko) ==== @@ -10,10 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -43,7 +39,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/chmod/chmod.c,v 1.31 2003/12/16 15:17:30 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/chmod/chmod.c,v 1.32 2004/04/06 20:06:44 markm Exp $"); #include <sys/types.h> #include <sys/stat.h> ==== //depot/projects/hammer/bin/cp/cp.1#5 (text+ko) ==== @@ -12,10 +12,6 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by the University of -.\" California, Berkeley and its contributors. .\" 4. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. @@ -33,7 +29,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)cp.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/cp/cp.1,v 1.27 2003/06/07 06:35:36 ru Exp $ +.\" $FreeBSD: src/bin/cp/cp.1,v 1.28 2004/04/06 20:06:44 markm Exp $ .\" .Dd July 23, 2002 .Dt CP 1 ==== //depot/projects/hammer/bin/cp/cp.c#9 (text+ko) ==== @@ -13,10 +13,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -46,7 +42,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.49 2003/06/30 06:16:06 jmg Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.50 2004/04/06 20:06:44 markm Exp $"); /* * Cp copies source files to target files. ==== //depot/projects/hammer/bin/cp/extern.h#4 (text+ko) ==== @@ -10,10 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -31,7 +27,7 @@ * SUCH DAMAGE. * * @(#)extern.h 8.2 (Berkeley) 4/1/94 - * $FreeBSD: src/bin/cp/extern.h,v 1.18 2003/04/07 12:09:17 mdodd Exp $ + * $FreeBSD: src/bin/cp/extern.h,v 1.19 2004/04/06 20:06:44 markm Exp $ */ typedef struct { ==== //depot/projects/hammer/bin/cp/utils.c#6 (text+ko) ==== @@ -10,10 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -37,7 +33,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.42 2003/11/13 05:26:55 alc Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.43 2004/04/06 20:06:44 markm Exp $"); #include <sys/param.h> #include <sys/stat.h> ==== //depot/projects/hammer/bin/csh/USD.doc/csh.1#3 (text+ko) ==== @@ -9,10 +9,6 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by the University of -.\" California, Berkeley and its contributors. .\" 4. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. @@ -30,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)csh.1 8.1 (Berkeley) 6/8/93 -.\" $FreeBSD: src/bin/csh/USD.doc/csh.1,v 1.11 2002/12/30 21:18:01 schweikh Exp $ +.\" $FreeBSD: src/bin/csh/USD.doc/csh.1,v 1.12 2004/04/06 20:06:45 markm Exp $ .\" .EH 'USD:4-%''An Introduction to the C shell' .OH 'An Introduction to the C shell''USD:4-%' ==== //depot/projects/hammer/bin/csh/USD.doc/csh.2#2 (text+ko) ==== @@ -9,10 +9,6 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by the University of -.\" California, Berkeley and its contributors. .\" 4. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. @@ -30,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)csh.2 8.1 (Berkeley) 6/8/93 -.\" $FreeBSD: src/bin/csh/USD.doc/csh.2,v 1.8 2001/07/15 07:49:00 dd Exp $ +.\" $FreeBSD: src/bin/csh/USD.doc/csh.2,v 1.9 2004/04/06 20:06:45 markm Exp $ .\" .nr H1 1 .NH ==== //depot/projects/hammer/bin/csh/USD.doc/csh.3#2 (text+ko) ==== @@ -9,10 +9,6 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by the University of -.\" California, Berkeley and its contributors. .\" 4. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. @@ -30,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)csh.3 8.1 (Berkeley) 6/8/93 -.\" $FreeBSD: src/bin/csh/USD.doc/csh.3,v 1.7 2001/07/15 07:49:00 dd Exp $ +.\" $FreeBSD: src/bin/csh/USD.doc/csh.3,v 1.8 2004/04/06 20:06:45 markm Exp $ .\" .nr H1 2 .NH ==== //depot/projects/hammer/bin/csh/USD.doc/csh.4#2 (text+ko) ==== @@ -9,10 +9,6 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by the University of -.\" California, Berkeley and its contributors. .\" 4. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. @@ -30,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)csh.4 8.1 (Berkeley) 6/8/93 -.\" $FreeBSD: src/bin/csh/USD.doc/csh.4,v 1.5 1999/08/27 23:13:55 peter Exp $ +.\" $FreeBSD: src/bin/csh/USD.doc/csh.4,v 1.6 2004/04/06 20:06:45 markm Exp $ .\" .nr H1 3 .NH ==== //depot/projects/hammer/bin/csh/USD.doc/csh.a#2 (text+ko) ==== @@ -9,10 +9,6 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by the University of -.\" California, Berkeley and its contributors. .\" 4. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. @@ -30,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)csh.a 8.1 (Berkeley) 6/8/93 -.\" $FreeBSD: src/bin/csh/USD.doc/csh.a,v 1.6 2000/11/27 08:50:56 ru Exp $ +.\" $FreeBSD: src/bin/csh/USD.doc/csh.a,v 1.7 2004/04/06 20:06:45 markm Exp $ .\" .SH Appendix \- Special characters ==== //depot/projects/hammer/bin/csh/USD.doc/csh.g#4 (text+ko) ==== @@ -9,10 +9,6 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by the University of -.\" California, Berkeley and its contributors. .\" 4. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. @@ -30,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)csh.g 8.1 (Berkeley) 6/8/93 -.\" $FreeBSD: src/bin/csh/USD.doc/csh.g,v 1.7 2002/12/30 21:18:01 schweikh Exp $ +.\" $FreeBSD: src/bin/csh/USD.doc/csh.g,v 1.8 2004/04/06 20:06:45 markm Exp $ .\" .SH Glossary ==== //depot/projects/hammer/bin/csh/USD.doc/tabs#2 (text+ko) ==== @@ -9,10 +9,6 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by the University of -.\" California, Berkeley and its contributors. .\" 4. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. @@ -30,6 +26,6 @@ .\" SUCH DAMAGE. .\" .\" @(#)tabs 8.1 (Berkeley) 6/8/93 -.\" $FreeBSD: src/bin/csh/USD.doc/tabs,v 1.5 1999/08/27 23:13:56 peter Exp $ +.\" $FreeBSD: src/bin/csh/USD.doc/tabs,v 1.6 2004/04/06 20:06:45 markm Exp $ .\" .ta 5n 10n 15n 20n 25n 30n 35n 40n 45n 50n 55n 60n 65n 70n 75n 80n ==== //depot/projects/hammer/bin/csh/host.defs#2 (text+ko) ==== @@ -1,6 +1,6 @@ newcode : /* $Header: /src/pub/tcsh/host.defs,v 1.31 2001/06/10 02:19:11 christos Exp $ */ -/* $FreeBSD: src/bin/csh/host.defs,v 1.2 2001/09/05 21:11:56 mp Exp $ */ +/* $FreeBSD: src/bin/csh/host.defs,v 1.3 2004/04/06 20:06:45 markm Exp $ */ /* * host.defs: Hosttype/Machtype etc. */ @@ -16,10 +16,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. ==== //depot/projects/hammer/bin/date/date.1#5 (text+ko) ==== @@ -12,10 +12,6 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by the University of -.\" California, Berkeley and its contributors. .\" 4. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. @@ -33,7 +29,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)date.1 8.3 (Berkeley) 4/28/95 -.\" $FreeBSD: src/bin/date/date.1,v 1.61 2004/01/06 19:01:34 obrien Exp $ +.\" $FreeBSD: src/bin/date/date.1,v 1.63 2004/04/06 22:03:38 green Exp $ .\" .Dd November 17, 1993 .Dt DATE 1 @@ -42,11 +38,9 @@ .Nm date .Nd display or set date and time .Sh SYNOPSIS -.Nm -.Op Fl jnu -.Op Fl d Ar dst +.Nm +.Op Fl ju .Op Fl r Ar seconds -.Op Fl t Ar minutes_west .Oo .Fl v .Sm off @@ -55,15 +49,21 @@ .Sm on .Oc .Ar ... -.Oo -.Fl f -.Ar fmt date | +.Op Cm + Ns Ar output_fmt +.Nm +.Op Fl jnu .Sm off .Op Oo Oo Oo Oo Ar cc Oc Ar yy Oc Ar mm Oc Ar dd Oc Ar HH .Ar MM Op Ar .ss .Sm on -.Oc -.Op Cm + Ns Ar format +.Nm +.Op Fl jnu +.Fl f +.Ar input_fmt new_date +.Op Cm + Ns Ar output_fmt +.Nm +.Op Fl d Ar dst +.Op Fl t Ar minutes_west .Sh DESCRIPTION When invoked without arguments, the .Nm ==== //depot/projects/hammer/bin/date/date.c#6 (text+ko) ==== @@ -10,10 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -44,7 +40,7 @@ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/date/date.c,v 1.45 2004/03/04 15:46:14 mtm Exp $"); +__FBSDID("$FreeBSD: src/bin/date/date.c,v 1.46 2004/04/06 20:06:45 markm Exp $"); #include <sys/param.h> #include <sys/time.h> ==== //depot/projects/hammer/bin/date/extern.h#2 (text+ko) ==== @@ -10,10 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -31,7 +27,7 @@ * SUCH DAMAGE. * * @(#)extern.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD: src/bin/date/extern.h,v 1.6 2002/02/02 06:24:12 imp Exp $ + * $FreeBSD: src/bin/date/extern.h,v 1.7 2004/04/06 20:06:45 markm Exp $ */ int netsettime(time_t); ==== //depot/projects/hammer/bin/date/netdate.c#3 (text+ko) ==== @@ -10,10 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -38,7 +34,7 @@ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/date/netdate.c,v 1.17 2003/02/05 12:56:40 charnier Exp $"); +__FBSDID("$FreeBSD: src/bin/date/netdate.c,v 1.18 2004/04/06 20:06:45 markm Exp $"); #include <sys/param.h> #include <sys/time.h> ==== //depot/projects/hammer/bin/dd/args.c#5 (text+ko) ==== @@ -14,10 +14,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -41,7 +37,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/dd/args.c,v 1.37 2004/03/05 19:35:51 phk Exp $"); +__FBSDID("$FreeBSD: src/bin/dd/args.c,v 1.38 2004/04/06 20:06:45 markm Exp $"); #include <sys/types.h> ==== //depot/projects/hammer/bin/dd/conv.c#3 (text+ko) ==== @@ -14,10 +14,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -41,7 +37,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/dd/conv.c,v 1.18 2003/02/27 18:04:54 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/dd/conv.c,v 1.19 2004/04/06 20:06:45 markm Exp $"); #include <sys/param.h> ==== //depot/projects/hammer/bin/dd/conv_tab.c#2 (text+ko) ==== @@ -14,10 +14,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -41,7 +37,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/dd/conv_tab.c,v 1.11 2002/06/30 05:13:52 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/dd/conv_tab.c,v 1.12 2004/04/06 20:06:45 markm Exp $"); #include <sys/types.h> ==== //depot/projects/hammer/bin/dd/dd.1#4 (text+ko) ==== @@ -12,10 +12,6 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by the University of -.\" California, Berkeley and its contributors. .\" 4. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. @@ -33,7 +29,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)dd.1 8.2 (Berkeley) 1/13/94 -.\" $FreeBSD: src/bin/dd/dd.1,v 1.22 2004/03/05 19:35:51 phk Exp $ +.\" $FreeBSD: src/bin/dd/dd.1,v 1.23 2004/04/06 20:06:46 markm Exp $ .\" .Dd January 13, 1994 .Dt DD 1 ==== //depot/projects/hammer/bin/dd/dd.c#5 (text+ko) ==== @@ -14,10 +14,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -47,7 +43,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/dd/dd.c,v 1.41 2004/03/05 19:35:51 phk Exp $"); +__FBSDID("$FreeBSD: src/bin/dd/dd.c,v 1.42 2004/04/06 20:06:46 markm Exp $"); #include <sys/param.h> #include <sys/stat.h> ==== //depot/projects/hammer/bin/dd/dd.h#5 (text+ko) ==== @@ -14,10 +14,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -35,7 +31,7 @@ * SUCH DAMAGE. * * @(#)dd.h 8.3 (Berkeley) 4/2/94 - * $FreeBSD: src/bin/dd/dd.h,v 1.20 2004/03/06 08:21:32 bde Exp $ + * $FreeBSD: src/bin/dd/dd.h,v 1.21 2004/04/06 20:06:46 markm Exp $ */ /* Input/output stream state. */ ==== //depot/projects/hammer/bin/dd/extern.h#3 (text+ko) ==== @@ -14,10 +14,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -35,7 +31,7 @@ * SUCH DAMAGE. * * @(#)extern.h 8.3 (Berkeley) 4/2/94 - * $FreeBSD: src/bin/dd/extern.h,v 1.13 2003/02/27 18:04:54 markm Exp $ + * $FreeBSD: src/bin/dd/extern.h,v 1.14 2004/04/06 20:06:46 markm Exp $ */ void block(void); ==== //depot/projects/hammer/bin/dd/misc.c#3 (text+ko) ==== @@ -14,10 +14,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -41,7 +37,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/dd/misc.c,v 1.26 2003/02/27 18:04:54 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/dd/misc.c,v 1.27 2004/04/06 20:06:46 markm Exp $"); #include <sys/types.h> #include <sys/time.h> >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200404062348.i36NmJYe011564>