PERFORCE change 50764 for review
Marcel Moolenaar
marcel at FreeBSD.org
Fri Apr 9 19:32:49 PDT 2004
http://perforce.freebsd.org/chv.cgi?CH=50764
Change 50764 by marcel at marcel_nfs on 2004/04/09 19:31:52
IFC @50763
Affected files ...
.. //depot/projects/gdb/bin/dd/Makefile#4 integrate
.. //depot/projects/gdb/etc/defaults/pccard.conf#2 integrate
.. //depot/projects/gdb/etc/rc.d/initrandom#3 integrate
.. //depot/projects/gdb/lib/libc/gen/wordexp.c#2 integrate
.. //depot/projects/gdb/lib/libc/locale/big5.c#3 integrate
.. //depot/projects/gdb/lib/libc/locale/euc.c#3 integrate
.. //depot/projects/gdb/lib/libc/locale/gb18030.c#4 integrate
.. //depot/projects/gdb/lib/libc/locale/gb2312.c#3 integrate
.. //depot/projects/gdb/lib/libc/locale/gbk.c#3 integrate
.. //depot/projects/gdb/lib/libc/locale/mskanji.c#3 integrate
.. //depot/projects/gdb/lib/libc/locale/utf2.c#4 integrate
.. //depot/projects/gdb/lib/libc/locale/utf8.c#3 integrate
.. //depot/projects/gdb/lib/libsdp/util.c#2 integrate
.. //depot/projects/gdb/sbin/badsect/badsect.8#2 integrate
.. //depot/projects/gdb/sbin/badsect/badsect.c#2 integrate
.. //depot/projects/gdb/sbin/bsdlabel/bsdlabel.5#2 integrate
.. //depot/projects/gdb/sbin/bsdlabel/bsdlabel.8#3 integrate
.. //depot/projects/gdb/sbin/bsdlabel/pathnames.h#2 integrate
.. //depot/projects/gdb/sbin/ccdconfig/ccdconfig.8#2 integrate
.. //depot/projects/gdb/sbin/clri/clri.8#2 integrate
.. //depot/projects/gdb/sbin/clri/clri.c#2 integrate
.. //depot/projects/gdb/sbin/dmesg/dmesg.8#3 integrate
.. //depot/projects/gdb/sbin/dmesg/dmesg.c#4 integrate
.. //depot/projects/gdb/sbin/dump/dump.8#3 integrate
.. //depot/projects/gdb/sbin/dump/dump.h#2 integrate
.. //depot/projects/gdb/sbin/dump/dumprmt.c#2 integrate
.. //depot/projects/gdb/sbin/dump/itime.c#2 integrate
.. //depot/projects/gdb/sbin/dump/main.c#2 integrate
.. //depot/projects/gdb/sbin/dump/optr.c#2 integrate
.. //depot/projects/gdb/sbin/dump/pathnames.h#2 integrate
.. //depot/projects/gdb/sbin/dump/tape.c#2 integrate
.. //depot/projects/gdb/sbin/dump/traverse.c#2 integrate
.. //depot/projects/gdb/sbin/dump/unctime.c#2 integrate
.. //depot/projects/gdb/sbin/dumpfs/dumpfs.8#2 integrate
.. //depot/projects/gdb/sbin/dumpfs/dumpfs.c#2 integrate
.. //depot/projects/gdb/sbin/dumpon/dumpon.8#2 integrate
.. //depot/projects/gdb/sbin/dumpon/dumpon.c#2 integrate
.. //depot/projects/gdb/sbin/fsck/fsutil.c#2 integrate
.. //depot/projects/gdb/sbin/fsck/preen.c#2 integrate
.. //depot/projects/gdb/sbin/fsck_ffs/SMM.doc/0.t#2 integrate
.. //depot/projects/gdb/sbin/fsck_ffs/SMM.doc/1.t#2 integrate
.. //depot/projects/gdb/sbin/fsck_ffs/SMM.doc/2.t#2 integrate
.. //depot/projects/gdb/sbin/fsck_ffs/SMM.doc/3.t#2 integrate
.. //depot/projects/gdb/sbin/fsck_ffs/SMM.doc/4.t#2 integrate
.. //depot/projects/gdb/sbin/fsck_ffs/dir.c#2 integrate
.. //depot/projects/gdb/sbin/fsck_ffs/fsck.h#3 integrate
.. //depot/projects/gdb/sbin/fsck_ffs/fsck_ffs.8#2 integrate
.. //depot/projects/gdb/sbin/fsck_ffs/fsutil.c#2 integrate
.. //depot/projects/gdb/sbin/fsck_ffs/inode.c#2 integrate
.. //depot/projects/gdb/sbin/fsck_ffs/main.c#3 integrate
.. //depot/projects/gdb/sbin/fsck_ffs/pass1.c#4 integrate
.. //depot/projects/gdb/sbin/fsck_ffs/pass1b.c#3 integrate
.. //depot/projects/gdb/sbin/fsck_ffs/pass2.c#3 integrate
.. //depot/projects/gdb/sbin/fsck_ffs/pass3.c#3 integrate
.. //depot/projects/gdb/sbin/fsck_ffs/pass4.c#3 integrate
.. //depot/projects/gdb/sbin/fsck_ffs/pass5.c#4 integrate
.. //depot/projects/gdb/sbin/fsck_ffs/setup.c#3 integrate
.. //depot/projects/gdb/sbin/fsck_ffs/utilities.c#3 integrate
.. //depot/projects/gdb/sbin/ifconfig/ifconfig.8#5 integrate
.. //depot/projects/gdb/sbin/ifconfig/ifconfig.c#7 integrate
.. //depot/projects/gdb/sbin/init/init.8#3 integrate
.. //depot/projects/gdb/sbin/init/init.c#3 integrate
.. //depot/projects/gdb/sbin/init/pathnames.h#2 integrate
.. //depot/projects/gdb/sbin/ipfw/ipfw2.c#3 integrate
.. //depot/projects/gdb/sbin/mknod/mknod.8#2 integrate
.. //depot/projects/gdb/sbin/mknod/mknod.c#2 integrate
.. //depot/projects/gdb/sbin/mount/getmntopts.3#2 integrate
.. //depot/projects/gdb/sbin/mount/getmntopts.c#2 integrate
.. //depot/projects/gdb/sbin/mount/mntopts.h#2 integrate
.. //depot/projects/gdb/sbin/mount/mount.8#5 integrate
.. //depot/projects/gdb/sbin/mount/mount.c#3 integrate
.. //depot/projects/gdb/sbin/mount/mount_ufs.c#2 integrate
.. //depot/projects/gdb/sbin/mount/pathnames.h#2 integrate
.. //depot/projects/gdb/sbin/mount/vfslist.c#2 integrate
.. //depot/projects/gdb/sbin/mount_cd9660/mount_cd9660.8#2 integrate
.. //depot/projects/gdb/sbin/mount_cd9660/mount_cd9660.c#2 integrate
.. //depot/projects/gdb/sbin/mount_ext2fs/mount_ext2fs.8#2 integrate
.. //depot/projects/gdb/sbin/mount_ext2fs/mount_ext2fs.c#3 integrate
.. //depot/projects/gdb/sbin/mount_nfs/mount_nfs.8#2 integrate
.. //depot/projects/gdb/sbin/mount_nfs/mount_nfs.c#2 integrate
.. //depot/projects/gdb/sbin/mount_nfs4/mount_nfs4.8#2 integrate
.. //depot/projects/gdb/sbin/mount_nullfs/mount_nullfs.8#2 integrate
.. //depot/projects/gdb/sbin/mount_nullfs/mount_nullfs.c#2 integrate
.. //depot/projects/gdb/sbin/mount_std/mount_std.8#2 integrate
.. //depot/projects/gdb/sbin/mount_std/mount_std.c#2 integrate
.. //depot/projects/gdb/sbin/mount_udf/mount_udf.c#2 integrate
.. //depot/projects/gdb/sbin/mount_umapfs/mount_umapfs.8#2 integrate
.. //depot/projects/gdb/sbin/mount_umapfs/mount_umapfs.c#2 integrate
.. //depot/projects/gdb/sbin/mount_unionfs/mount_unionfs.8#2 integrate
.. //depot/projects/gdb/sbin/mount_unionfs/mount_unionfs.c#2 integrate
.. //depot/projects/gdb/sbin/newfs/mkfs.c#3 integrate
.. //depot/projects/gdb/sbin/newfs/newfs.8#3 integrate
.. //depot/projects/gdb/sbin/newfs/newfs.c#3 integrate
.. //depot/projects/gdb/sbin/newfs/newfs.h#3 integrate
.. //depot/projects/gdb/sbin/nfsiod/nfsiod.8#2 integrate
.. //depot/projects/gdb/sbin/nfsiod/nfsiod.c#2 integrate
.. //depot/projects/gdb/sbin/pfctl/missing/altq/altq_classq.h#2 integrate
.. //depot/projects/gdb/sbin/pfctl/missing/altq/altq_rmclass.h#2 integrate
.. //depot/projects/gdb/sbin/ping/ping.8#2 integrate
.. //depot/projects/gdb/sbin/ping/ping.c#4 integrate
.. //depot/projects/gdb/sbin/quotacheck/preen.c#2 integrate
.. //depot/projects/gdb/sbin/quotacheck/quotacheck.8#2 integrate
.. //depot/projects/gdb/sbin/quotacheck/quotacheck.c#3 integrate
.. //depot/projects/gdb/sbin/reboot/boot_i386.8#2 integrate
.. //depot/projects/gdb/sbin/reboot/reboot.8#2 integrate
.. //depot/projects/gdb/sbin/reboot/reboot.c#2 integrate
.. //depot/projects/gdb/sbin/restore/dirs.c#2 integrate
.. //depot/projects/gdb/sbin/restore/extern.h#2 integrate
.. //depot/projects/gdb/sbin/restore/interactive.c#2 integrate
.. //depot/projects/gdb/sbin/restore/main.c#2 integrate
.. //depot/projects/gdb/sbin/restore/restore.8#2 integrate
.. //depot/projects/gdb/sbin/restore/restore.c#2 integrate
.. //depot/projects/gdb/sbin/restore/restore.h#2 integrate
.. //depot/projects/gdb/sbin/restore/symtab.c#2 integrate
.. //depot/projects/gdb/sbin/restore/tape.c#2 integrate
.. //depot/projects/gdb/sbin/restore/utilities.c#2 integrate
.. //depot/projects/gdb/sbin/route/route.8#2 integrate
.. //depot/projects/gdb/sbin/route/route.c#2 integrate
.. //depot/projects/gdb/sbin/routed/defs.h#3 integrate
.. //depot/projects/gdb/sbin/routed/if.c#3 integrate
.. //depot/projects/gdb/sbin/routed/input.c#3 integrate
.. //depot/projects/gdb/sbin/routed/main.c#3 integrate
.. //depot/projects/gdb/sbin/routed/output.c#3 integrate
.. //depot/projects/gdb/sbin/routed/parms.c#3 integrate
.. //depot/projects/gdb/sbin/routed/pathnames.h#3 integrate
.. //depot/projects/gdb/sbin/routed/radix.c#3 integrate
.. //depot/projects/gdb/sbin/routed/radix.h#2 integrate
.. //depot/projects/gdb/sbin/routed/rdisc.c#3 integrate
.. //depot/projects/gdb/sbin/routed/routed.8#3 integrate
.. //depot/projects/gdb/sbin/routed/rtquery/rtquery.c#3 integrate
.. //depot/projects/gdb/sbin/routed/table.c#3 integrate
.. //depot/projects/gdb/sbin/routed/trace.c#3 integrate
.. //depot/projects/gdb/sbin/savecore/savecore.8#2 integrate
.. //depot/projects/gdb/sbin/shutdown/shutdown.8#2 integrate
.. //depot/projects/gdb/sbin/shutdown/shutdown.c#2 integrate
.. //depot/projects/gdb/sbin/slattach/slattach.8#2 integrate
.. //depot/projects/gdb/sbin/slattach/slattach.c#2 integrate
.. //depot/projects/gdb/sbin/startslip/startslip.1#2 integrate
.. //depot/projects/gdb/sbin/startslip/startslip.c#2 integrate
.. //depot/projects/gdb/sbin/swapon/swapon.8#2 integrate
.. //depot/projects/gdb/sbin/swapon/swapon.c#3 integrate
.. //depot/projects/gdb/sbin/sysctl/sysctl.8#2 integrate
.. //depot/projects/gdb/sbin/sysctl/sysctl.c#3 integrate
.. //depot/projects/gdb/sbin/tunefs/tunefs.8#2 integrate
.. //depot/projects/gdb/sbin/tunefs/tunefs.c#3 integrate
.. //depot/projects/gdb/sbin/umount/umount.8#3 integrate
.. //depot/projects/gdb/sbin/umount/umount.c#2 integrate
.. //depot/projects/gdb/share/man/man4/random.4#3 integrate
.. //depot/projects/gdb/sys/conf/files#13 integrate
.. //depot/projects/gdb/sys/dev/acpica/acpi.c#10 integrate
.. //depot/projects/gdb/sys/dev/acpica/acpi_acad.c#3 integrate
.. //depot/projects/gdb/sys/dev/acpica/acpi_button.c#3 integrate
.. //depot/projects/gdb/sys/dev/acpica/acpi_cmbat.c#2 integrate
.. //depot/projects/gdb/sys/dev/acpica/acpi_cpu.c#4 integrate
.. //depot/projects/gdb/sys/dev/acpica/acpi_ec.c#4 integrate
.. //depot/projects/gdb/sys/dev/acpica/acpi_isab.c#2 integrate
.. //depot/projects/gdb/sys/dev/acpica/acpi_lid.c#3 integrate
.. //depot/projects/gdb/sys/dev/acpica/acpi_package.c#2 integrate
.. //depot/projects/gdb/sys/dev/acpica/acpi_pci.c#5 integrate
.. //depot/projects/gdb/sys/dev/acpica/acpi_pcib_acpi.c#3 integrate
.. //depot/projects/gdb/sys/dev/acpica/acpi_pcib_pci.c#2 integrate
.. //depot/projects/gdb/sys/dev/acpica/acpi_powerres.c#4 integrate
.. //depot/projects/gdb/sys/dev/acpica/acpi_resource.c#4 integrate
.. //depot/projects/gdb/sys/dev/acpica/acpi_thermal.c#4 integrate
.. //depot/projects/gdb/sys/dev/acpica/acpi_timer.c#4 integrate
.. //depot/projects/gdb/sys/dev/acpica/acpivar.h#7 integrate
.. //depot/projects/gdb/sys/dev/md/md.c#8 integrate
.. //depot/projects/gdb/sys/dev/pccard/pccarddevs#4 integrate
.. //depot/projects/gdb/sys/dev/pccard/pccarddevs.h#4 integrate
.. //depot/projects/gdb/sys/dev/pci/pci.c#2 integrate
.. //depot/projects/gdb/sys/dev/pci/pci_pci.c#3 integrate
.. //depot/projects/gdb/sys/dev/pci/pci_private.h#2 integrate
.. //depot/projects/gdb/sys/dev/random/harvest.c#3 integrate
.. //depot/projects/gdb/sys/dev/random/hash.c#2 integrate
.. //depot/projects/gdb/sys/dev/random/hash.h#2 integrate
.. //depot/projects/gdb/sys/dev/random/nehemiah.c#1 branch
.. //depot/projects/gdb/sys/dev/random/nehemiah.h#1 branch
.. //depot/projects/gdb/sys/dev/random/probe.c#1 branch
.. //depot/projects/gdb/sys/dev/random/randomdev.c#4 integrate
.. //depot/projects/gdb/sys/dev/random/randomdev.h#2 integrate
.. //depot/projects/gdb/sys/dev/random/randomdev_soft.c#1 branch
.. //depot/projects/gdb/sys/dev/random/randomdev_soft.h#1 branch
.. //depot/projects/gdb/sys/dev/random/yarrow.c#2 integrate
.. //depot/projects/gdb/sys/dev/random/yarrow.h#2 integrate
.. //depot/projects/gdb/sys/dev/xe/if_xe_pccard.c#2 integrate
.. //depot/projects/gdb/sys/dev/xe/if_xevar.h#2 integrate
.. //depot/projects/gdb/sys/i386/i386/identcpu.c#5 integrate
.. //depot/projects/gdb/sys/kern/kern_linker.c#3 integrate
.. //depot/projects/gdb/sys/kern/sched_ule.c#8 integrate
.. //depot/projects/gdb/sys/kern/uipc_socket.c#6 integrate
.. //depot/projects/gdb/sys/modules/random/Makefile#2 integrate
.. //depot/projects/gdb/sys/modules/twa/Makefile#2 integrate
.. //depot/projects/gdb/sys/netatalk/aarp.c#4 integrate
.. //depot/projects/gdb/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#3 integrate
.. //depot/projects/gdb/sys/netgraph/bluetooth/hci/ng_hci_evnt.c#2 integrate
.. //depot/projects/gdb/sys/netgraph/bluetooth/hci/ng_hci_misc.c#2 integrate
.. //depot/projects/gdb/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c#2 integrate
.. //depot/projects/gdb/sys/netgraph/bluetooth/hci/ng_hci_var.h#2 integrate
.. //depot/projects/gdb/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c#2 integrate
.. //depot/projects/gdb/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c#2 integrate
.. //depot/projects/gdb/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#2 integrate
.. //depot/projects/gdb/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c#2 integrate
.. //depot/projects/gdb/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h#2 integrate
.. //depot/projects/gdb/sys/sys/wait.h#4 integrate
.. //depot/projects/gdb/usr.bin/bluetooth/btsockstat/btsockstat.c#2 integrate
.. //depot/projects/gdb/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c#2 integrate
.. //depot/projects/gdb/usr.bin/mt/mt.c#3 integrate
.. //depot/projects/gdb/usr.bin/wc/wc.c#2 integrate
.. //depot/projects/gdb/usr.sbin/arp/Makefile#2 integrate
.. //depot/projects/gdb/usr.sbin/arp/arp.c#2 integrate
.. //depot/projects/gdb/usr.sbin/bluetooth/bt3cfw/bt3cfw.c#2 integrate
.. //depot/projects/gdb/usr.sbin/bluetooth/bthidcontrol/Makefile#1 branch
.. //depot/projects/gdb/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.8#1 branch
.. //depot/projects/gdb/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.c#1 branch
.. //depot/projects/gdb/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.h#1 branch
.. //depot/projects/gdb/usr.sbin/bluetooth/bthidcontrol/hid.c#1 branch
.. //depot/projects/gdb/usr.sbin/bluetooth/bthidcontrol/sdp.c#1 branch
.. //depot/projects/gdb/usr.sbin/bluetooth/bthidd/Makefile#1 branch
.. //depot/projects/gdb/usr.sbin/bluetooth/bthidd/bthid_config.h#1 branch
.. //depot/projects/gdb/usr.sbin/bluetooth/bthidd/bthidd.c#1 branch
.. //depot/projects/gdb/usr.sbin/bluetooth/bthidd/bthidd.conf.sample#1 branch
.. //depot/projects/gdb/usr.sbin/bluetooth/bthidd/bthidd.h#1 branch
.. //depot/projects/gdb/usr.sbin/bluetooth/bthidd/client.c#1 branch
.. //depot/projects/gdb/usr.sbin/bluetooth/bthidd/hid.c#1 branch
.. //depot/projects/gdb/usr.sbin/bluetooth/bthidd/lexer.l#1 branch
.. //depot/projects/gdb/usr.sbin/bluetooth/bthidd/parser.y#1 branch
.. //depot/projects/gdb/usr.sbin/bluetooth/bthidd/server.c#1 branch
.. //depot/projects/gdb/usr.sbin/bluetooth/bthidd/session.c#1 branch
.. //depot/projects/gdb/usr.sbin/bluetooth/hccontrol/hccontrol.h#2 integrate
.. //depot/projects/gdb/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c#2 integrate
.. //depot/projects/gdb/usr.sbin/bluetooth/hccontrol/link_control.c#2 integrate
.. //depot/projects/gdb/usr.sbin/bluetooth/hccontrol/link_policy.c#2 integrate
.. //depot/projects/gdb/usr.sbin/bluetooth/hccontrol/send_recv.c#3 integrate
.. //depot/projects/gdb/usr.sbin/bluetooth/hccontrol/status.c#2 integrate
.. //depot/projects/gdb/usr.sbin/bluetooth/hccontrol/util.c#2 integrate
.. //depot/projects/gdb/usr.sbin/bluetooth/hcsecd/hcsecd.c#2 integrate
.. //depot/projects/gdb/usr.sbin/bluetooth/hcsecd/hcsecd.h#2 integrate
.. //depot/projects/gdb/usr.sbin/bluetooth/l2ping/l2ping.c#3 integrate
.. //depot/projects/gdb/usr.sbin/bluetooth/sdpcontrol/search.c#2 integrate
.. //depot/projects/gdb/usr.sbin/pppd/sys-bsd.c#2 integrate
Differences ...
==== //depot/projects/gdb/bin/dd/Makefile#4 (text+ko) ====
@@ -1,26 +1,29 @@
# @(#)Makefile 8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/bin/dd/Makefile,v 1.17 2004/03/08 18:09:33 ache Exp $
+# $FreeBSD: src/bin/dd/Makefile,v 1.18 2004/04/09 07:13:27 njl Exp $
+
+MAINTAINER= green at FreeBSD.org
PROG= dd
SRCS= args.c conv.c conv_tab.c dd.c misc.c position.c
-MAINTAINER= green at FreeBSD.org
-
-.include <bsd.prog.mk>
-
#
# Test the character conversion functions. We have to be explicit about
# which LC_LANG we use because the definition of upper and lower case
# depends on it.
-test: ${PROG}
- cc ${.CURDIR}/gen.c
+#
+
+CLEANFILES= gen
+
+test: ${PROG} gen
.for conv in ascii ebcdic ibm oldascii oldebcdic oldibm \
pareven parnone parodd parset \
swab lcase ucase
- @echo testing conv=${conv}
- @./a.out | \
- /usr/bin/env -i LC_CTYPE=en_US.US-ASCII ./dd conv=${conv} 2>/dev/null | \
- /usr/bin/env -i LC_CTYPE=en_US.US-ASCII hexdump -C | \
- diff -IFreeBSD - ${.CURDIR}/ref.${conv}
+ @${ECHO} testing conv=${conv}
+ @./gen | \
+ LC_ALL=en_US.US-ASCII ./dd conv=${conv} 2>/dev/null | \
+ LC_ALL=en_US.US-ASCII hexdump -C | \
+ diff -I FreeBSD - ${.CURDIR}/ref.${conv}
.endfor
- @rm -f a.out
+ @rm -f gen
+
+.include <bsd.prog.mk>
==== //depot/projects/gdb/etc/defaults/pccard.conf#2 (text+ko) ====
@@ -1,7 +1,7 @@
#
# Default PCCARD configuration file
#
-# $FreeBSD: src/etc/defaults/pccard.conf,v 1.266 2003/10/04 18:44:29 imp Exp $
+# $FreeBSD: src/etc/defaults/pccard.conf,v 1.267 2004/04/09 17:15:18 rsm Exp $
#
# Please send new entries for this file to imp at freebsd.org. He likes to
# review them before they are committed to make sure they are correct for
@@ -2261,13 +2261,20 @@
# insert /etc/pccard_ether $device start
# remove /etc/pccard_ether $device stop
+# Xircom Realport 10/100 Ethernet + modem (Ethernet part) (XEM5600)
+card "Xircom" "10/100 Network + 56K Modem PC Card"
+ config 0x27 "xe" ?
+# config auto "sio" ?
+ insert /etc/pccard_ether $device start
+ remove /etc/pccard_ether $device stop
+
# Xircom 10/100 Network PC Card
card "Xircom" "10/100 Network PC Card"
config auto "xe" ?
insert /etc/pccard_ether $device start
remove /etc/pccard_ether $device stop
-# Xircom Realport card + modem
+# Xircom Realport 10/100 Ethernet + modem (Ethernet part) (REM56)
card "Xircom" "16-bit Ethernet + Modem 56"
config 0x27 "xe" ?
# config auto "sio" ?
@@ -2286,6 +2293,21 @@
insert /etc/pccard_ether $device start
remove /etc/pccard_ether $device stop
+# Xircom CreditCard Ethernet + modem (Ethernet part) (CEM28)
+card "Xircom" "CreditCard Ethernet+Modem 28.8"
+ config auto "xe" ?
+# config auto "sio" ?
+# ether 0x98
+ insert /etc/pccard_ether $device start
+ remove /etc/pccard_ether $device stop
+
+# Xircom CreditCard Ethernet + modem (Ethernet part) (CEM33)
+card "Xircom" "CreditCard Ethernet+Modem 33.6"
+ config auto "xe" ?
+# config auto "sio" ?
+ insert /etc/pccard_ether $device start
+ remove /etc/pccard_ether $device stop
+
# Xircom CreditCard Ethernet 10/100 + modem (Ethernet part) (CEM56)
card "Xircom" "CreditCard Ethernet 10/100 + Modem 56"
config 0x27 "xe" ?
==== //depot/projects/gdb/etc/rc.d/initrandom#3 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/initrandom,v 1.2 2004/03/08 12:25:05 pjd Exp $
+# $FreeBSD: src/etc/rc.d/initrandom,v 1.3 2004/04/09 15:56:16 markm Exp $
#
# PROVIDE: initrandom
@@ -23,50 +23,57 @@
initrandom_start()
{
+ soft_random_generator=`sysctl kern.random 2>/dev/null`
+
echo -n 'Entropy harvesting:'
- if checkyesno harvest_interrupt; then
- if [ -w /dev/random ]; then
- ${SYSCTL_W} kern.random.sys.harvest.interrupt=1 >/dev/null
- echo -n ' interrupts'
+ if [ \! -z "${soft_random_generator}" ] ; then
+
+ if checkyesno harvest_interrupt; then
+ if [ -w /dev/random ]; then
+ ${SYSCTL_W} kern.random.sys.harvest.interrupt=1 >/dev/null
+ echo -n ' interrupts'
+ fi
fi
- fi
- if checkyesno harvest_ethernet; then
- if [ -w /dev/random ]; then
- ${SYSCTL_W} kern.random.sys.harvest.ethernet=1 >/dev/null
- echo -n ' ethernet'
+ if checkyesno harvest_ethernet; then
+ if [ -w /dev/random ]; then
+ ${SYSCTL_W} kern.random.sys.harvest.ethernet=1 >/dev/null
+ echo -n ' ethernet'
+ fi
fi
- fi
- if checkyesno harvest_p_to_p; then
- if [ -w /dev/random ]; then
- ${SYSCTL_W} kern.random.sys.harvest.point_to_point=1 >/dev/null
- echo -n ' point_to_point'
+ if checkyesno harvest_p_to_p; then
+ if [ -w /dev/random ]; then
+ ${SYSCTL_W} kern.random.sys.harvest.point_to_point=1 >/dev/null
+ echo -n ' point_to_point'
+ fi
fi
+
+ # XXX temporary until we can improve the entropy
+ # harvesting rate.
+ # Entropy below is not great, but better than nothing.
+ # This unblocks the generator at startup
+ ( ps -fauxww; sysctl -a; date; df -ib; dmesg; ps -fauxww; ) \
+ | dd of=/dev/random bs=8k 2>/dev/null
+ cat /bin/ls | dd of=/dev/random bs=8k 2>/dev/null
+
+ # First pass at reseeding /dev/random.
+ #
+ case ${entropy_file} in
+ [Nn][Oo] | '')
+ ;;
+ *)
+ if [ -w /dev/random ]; then
+ feed_dev_random "${entropy_file}"
+ fi
+ ;;
+ esac
+
+ echo -n ' kickstart'
fi
echo '.'
-
- # First pass at reseeding /dev/random.
- #
- case ${entropy_file} in
- [Nn][Oo] | '')
- ;;
- *)
- if [ -w /dev/random ]; then
- feed_dev_random "${entropy_file}"
- fi
- ;;
- esac
-
- # XXX temporary until we can get the entropy
- # harvesting rate up
- # Entropy below is not great,
- # but better than nothing.
- ( ps -fauxww; sysctl -a; date; df -ib; dmesg; ps -fauxww; ) \
- | dd of=/dev/random bs=8k 2>/dev/null
- cat /bin/ls | dd of=/dev/random bs=8k 2>/dev/null
}
load_rc_config random
==== //depot/projects/gdb/lib/libc/gen/wordexp.c#2 (text+ko) ====
@@ -37,7 +37,7 @@
#include <wordexp.h>
#include "un-namespace.h"
-__FBSDID("$FreeBSD: src/lib/libc/gen/wordexp.c,v 1.4 2003/01/07 06:07:56 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/wordexp.c,v 1.5 2004/04/09 11:32:32 tjr Exp $");
static int we_askshell(const char *, wordexp_t *, int);
static int we_check(const char *, int);
@@ -128,7 +128,7 @@
_close(devnull);
}
execl(_PATH_BSHELL, "sh", flags & WRDE_UNDEF ? "-u" : "+u",
- "-c", cmd, NULL);
+ "-c", cmd, (char *)NULL);
_exit(1);
}
==== //depot/projects/gdb/lib/libc/locale/big5.c#3 (text+ko) ====
@@ -39,7 +39,7 @@
static char sccsid[] = "@(#)big5.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/big5.c,v 1.10 2004/04/07 10:48:19 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/big5.c,v 1.11 2004/04/10 00:27:52 tjr Exp $");
#include <runetype.h>
#include <stdlib.h>
@@ -78,7 +78,7 @@
_BIG5_mbsinit(const mbstate_t *ps)
{
- return (ps == NULL || ((_BIG5State *)ps)->count == 0);
+ return (ps == NULL || ((const _BIG5State *)ps)->count == 0);
}
static __inline int
==== //depot/projects/gdb/lib/libc/locale/euc.c#3 (text+ko) ====
@@ -39,7 +39,7 @@
static char sccsid[] = "@(#)euc.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/euc.c,v 1.14 2004/04/07 10:48:19 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/euc.c,v 1.15 2004/04/10 00:27:52 tjr Exp $");
#include <errno.h>
#include <limits.h>
@@ -126,7 +126,7 @@
_EUC_mbsinit(const mbstate_t *ps)
{
- return (ps == NULL || ((_EucState *)ps)->count == 0);
+ return (ps == NULL || ((const _EucState *)ps)->count == 0);
}
#define CEI ((_EucInfo *)(_CurrentRuneLocale->variable))
==== //depot/projects/gdb/lib/libc/locale/gb18030.c#4 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/param.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/gb18030.c,v 1.3 2004/04/07 10:48:19 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/gb18030.c,v 1.4 2004/04/10 00:27:52 tjr Exp $");
#include <errno.h>
#include <runetype.h>
@@ -71,7 +71,7 @@
_GB18030_mbsinit(const mbstate_t *ps)
{
- return (ps == NULL || ((_GB18030State *)ps)->count == 0);
+ return (ps == NULL || ((const _GB18030State *)ps)->count == 0);
}
size_t
==== //depot/projects/gdb/lib/libc/locale/gb2312.c#3 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/param.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/gb2312.c,v 1.4 2004/04/07 10:48:19 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/gb2312.c,v 1.5 2004/04/10 00:27:52 tjr Exp $");
#include <runetype.h>
#include <stdlib.h>
@@ -65,7 +65,7 @@
_GB2312_mbsinit(const mbstate_t *ps)
{
- return (ps == NULL || ((_GB2312State *)ps)->count == 0);
+ return (ps == NULL || ((const _GB2312State *)ps)->count == 0);
}
static __inline int
==== //depot/projects/gdb/lib/libc/locale/gbk.c#3 (text+ko) ====
@@ -36,7 +36,7 @@
*/
#include <sys/param.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/gbk.c,v 1.5 2004/04/07 10:48:19 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/gbk.c,v 1.6 2004/04/10 00:27:52 tjr Exp $");
#include <runetype.h>
#include <stdlib.h>
@@ -75,7 +75,7 @@
_GBK_mbsinit(const mbstate_t *ps)
{
- return (ps == NULL || ((_GBKState *)ps)->count == 0);
+ return (ps == NULL || ((const _GBKState *)ps)->count == 0);
}
static __inline int
==== //depot/projects/gdb/lib/libc/locale/mskanji.c#3 (text+ko) ====
@@ -37,7 +37,7 @@
static char sccsid[] = "@(#)mskanji.c 1.0 (Phase One) 5/5/95";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/mskanji.c,v 1.11 2004/04/07 10:48:19 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/mskanji.c,v 1.12 2004/04/10 00:27:52 tjr Exp $");
#include <runetype.h>
#include <stdlib.h>
@@ -76,7 +76,7 @@
_MSKanji_mbsinit(const mbstate_t *ps)
{
- return (ps == NULL || ((_MSKanjiState *)ps)->count == 0);
+ return (ps == NULL || ((const _MSKanjiState *)ps)->count == 0);
}
size_t
==== //depot/projects/gdb/lib/libc/locale/utf2.c#4 (text+ko) ====
@@ -37,7 +37,7 @@
#define OBSOLETE_IN_6
#include <sys/param.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/utf2.c,v 1.10 2004/04/07 10:48:19 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/utf2.c,v 1.11 2004/04/10 00:27:52 tjr Exp $");
#include <errno.h>
#include <runetype.h>
@@ -77,7 +77,7 @@
_UTF2_mbsinit(const mbstate_t *ps)
{
- return (ps == NULL || ((_UTF2State *)ps)->count == 0);
+ return (ps == NULL || ((const _UTF2State *)ps)->count == 0);
}
size_t
==== //depot/projects/gdb/lib/libc/locale/utf8.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/param.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/utf8.c,v 1.5 2004/04/07 10:48:19 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/utf8.c,v 1.6 2004/04/10 00:27:52 tjr Exp $");
#include <errno.h>
#include <runetype.h>
@@ -65,7 +65,7 @@
_UTF8_mbsinit(const mbstate_t *ps)
{
- return (ps == NULL || ((_UTF8State *)ps)->count == 0);
+ return (ps == NULL || ((const _UTF8State *)ps)->count == 0);
}
size_t
==== //depot/projects/gdb/lib/libsdp/util.c#2 (text+ko) ====
@@ -26,7 +26,7 @@
* SUCH DAMAGE.
*
* $Id: util.c,v 1.5 2003/09/08 02:29:35 max Exp $
- * $FreeBSD: src/lib/libsdp/util.c,v 1.3 2004/01/09 18:19:12 emax Exp $
+ * $FreeBSD: src/lib/libsdp/util.c,v 1.4 2004/04/09 23:01:38 emax Exp $
*/
#include <bluetooth.h>
@@ -312,7 +312,7 @@
break;
case SDP_DATA_UINT64:
SDP_GET64(value.uint64, start);
- printf("uint64 %llu\n", value.uint64);
+ printf("uint64 %ju\n", value.uint64);
break;
case SDP_DATA_UINT128:
@@ -342,7 +342,7 @@
break;
case SDP_DATA_INT64:
SDP_GET64(value.int64, start);
- printf("int64 %lld\n", value.int64);
+ printf("int64 %ju\n", value.int64);
break;
case SDP_DATA_UUID16:
==== //depot/projects/gdb/sbin/badsect/badsect.8#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 acknowledgment:
-.\" 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.
.\"
.\" @(#)badsect.8 8.1 (Berkeley) 6/5/93
-.\" $FreeBSD: src/sbin/badsect/badsect.8,v 1.19 2003/06/08 12:40:50 charnier Exp $
+.\" $FreeBSD: src/sbin/badsect/badsect.8,v 1.20 2004/04/09 19:58:25 markm Exp $
.\"
.Dd June 5, 1993
.Dt BADSECT 8
==== //depot/projects/gdb/sbin/badsect/badsect.c#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.
@@ -43,7 +39,7 @@
#endif
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/badsect/badsect.c,v 1.19 2003/05/03 18:41:56 obrien Exp $");
+__FBSDID("$FreeBSD: src/sbin/badsect/badsect.c,v 1.20 2004/04/09 19:58:25 markm Exp $");
/*
* badsect
==== //depot/projects/gdb/sbin/bsdlabel/bsdlabel.5#2 (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 acknowledgment:
-.\" 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.
.\"
.\" @(#)disklabel.5.5 8.1 (Berkeley) 6/5/93
-.\" $FreeBSD: src/sbin/bsdlabel/bsdlabel.5,v 1.16 2003/09/10 19:24:34 ru Exp $
+.\" $FreeBSD: src/sbin/bsdlabel/bsdlabel.5,v 1.17 2004/04/09 19:58:25 markm Exp $
.\"
.Dd June 5, 1993
.Dt DISKLABEL 5
==== //depot/projects/gdb/sbin/bsdlabel/bsdlabel.8#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 acknowledgment:
-.\" 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.
.\"
.\" @(#)disklabel.8 8.2 (Berkeley) 4/19/94
-.\" $FreeBSD: src/sbin/bsdlabel/bsdlabel.8,v 1.56 2004/03/30 23:15:03 luigi Exp $
+.\" $FreeBSD: src/sbin/bsdlabel/bsdlabel.8,v 1.57 2004/04/09 19:58:25 markm Exp $
.\"
.Dd March 15, 2003
.Dt BSDLABEL 8
==== //depot/projects/gdb/sbin/bsdlabel/pathnames.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.
*
* @(#)pathnames.h 8.1 (Berkeley) 6/5/93
- * $FreeBSD: src/sbin/bsdlabel/pathnames.h,v 1.4 2000/01/11 07:28:46 bde Exp $
+ * $FreeBSD: src/sbin/bsdlabel/pathnames.h,v 1.5 2004/04/09 19:58:25 markm Exp $
*/
#include <paths.h>
==== //depot/projects/gdb/sbin/ccdconfig/ccdconfig.8#2 (text+ko) ====
@@ -11,10 +11,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 acknowledgment:
-.\" This product includes software developed for the NetBSD Project
-.\" by Jason R. Thorpe.
.\" 4. The name of the author may not be used to endorse or promote products
.\" derived from this software without specific prior written permission.
.\"
@@ -30,7 +26,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/sbin/ccdconfig/ccdconfig.8,v 1.26 2003/12/08 10:50:36 obrien Exp $
+.\" $FreeBSD: src/sbin/ccdconfig/ccdconfig.8,v 1.27 2004/04/09 19:58:26 markm Exp $
.\"
.Dd July 17, 1995
.Dt CCDCONFIG 8
==== //depot/projects/gdb/sbin/clri/clri.8#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 acknowledgment:
-.\" 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.
.\"
.\" @(#)clri.8 8.2 (Berkeley) 4/19/94
-.\" $FreeBSD: src/sbin/clri/clri.8,v 1.13 2002/10/18 01:05:46 keramida Exp $
+.\" $FreeBSD: src/sbin/clri/clri.8,v 1.14 2004/04/09 19:58:26 markm Exp $
.\"
.Dd April 19, 1994
.Dt CLRI 8
==== //depot/projects/gdb/sbin/clri/clri.c#2 (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/sbin/clri/clri.c,v 1.13 2003/05/03 18:41:56 obrien Exp $");
+__FBSDID("$FreeBSD: src/sbin/clri/clri.c,v 1.14 2004/04/09 19:58:26 markm Exp $");
#include <sys/param.h>
#include <sys/disklabel.h>
==== //depot/projects/gdb/sbin/dmesg/dmesg.8#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 acknowledgment:
-.\" 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.
.\"
.\" @(#)dmesg.8 8.1 (Berkeley) 6/5/93
-.\" $FreeBSD: src/sbin/dmesg/dmesg.8,v 1.18 2004/03/26 09:24:45 ru Exp $
+.\" $FreeBSD: src/sbin/dmesg/dmesg.8,v 1.19 2004/04/09 19:58:26 markm Exp $
.\"
.Dd June 5, 1993
.Dt DMESG 8
==== //depot/projects/gdb/sbin/dmesg/dmesg.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.
@@ -43,7 +39,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/dmesg/dmesg.c,v 1.23 2004/03/26 09:24:45 ru Exp $");
+__FBSDID("$FreeBSD: src/sbin/dmesg/dmesg.c,v 1.24 2004/04/09 19:58:26 markm Exp $");
#include <sys/types.h>
#include <sys/msgbuf.h>
==== //depot/projects/gdb/sbin/dump/dump.8#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 acknowledgment:
-.\" 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.
.\"
.\" @(#)dump.8 8.3 (Berkeley) 5/1/95
-.\" $FreeBSD: src/sbin/dump/dump.8,v 1.62 2004/01/15 12:13:54 alex Exp $
+.\" $FreeBSD: src/sbin/dump/dump.8,v 1.63 2004/04/09 19:58:27 markm Exp $
.\"
.Dd March 1, 2002
.Dt DUMP 8
==== //depot/projects/gdb/sbin/dump/dump.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.
@@ -32,7 +28,7 @@
*
* @(#)dump.h 8.2 (Berkeley) 4/28/95
*
- * $FreeBSD: src/sbin/dump/dump.h,v 1.24 2003/11/04 12:27:18 iedowse Exp $
+ * $FreeBSD: src/sbin/dump/dump.h,v 1.25 2004/04/09 19:58:27 markm Exp $
*/
/*
==== //depot/projects/gdb/sbin/dump/dumprmt.c#2 (text+ko) ====
@@ -10,11 +10,7 @@
* 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
+* 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.
*
@@ -36,7 +32,7 @@
static char sccsid[] = "@(#)dumprmt.c 8.3 (Berkeley) 4/28/95";
#endif
static const char rcsid[] =
- "$FreeBSD: src/sbin/dump/dumprmt.c,v 1.20 2003/11/14 13:07:38 johan Exp $";
+ "$FreeBSD: src/sbin/dump/dumprmt.c,v 1.21 2004/04/09 19:58:27 markm Exp $";
#endif /* not lint */
#include <sys/param.h>
==== //depot/projects/gdb/sbin/dump/itime.c#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.
@@ -36,7 +32,7 @@
static char sccsid[] = "@(#)itime.c 8.1 (Berkeley) 6/5/93";
#endif
static const char rcsid[] =
- "$FreeBSD: src/sbin/dump/itime.c,v 1.14 2002/09/25 04:06:35 mike Exp $";
+ "$FreeBSD: src/sbin/dump/itime.c,v 1.15 2004/04/09 19:58:27 markm Exp $";
#endif /* not lint */
#include <sys/param.h>
==== //depot/projects/gdb/sbin/dump/main.c#2 (text+ko) ====
@@ -10,10 +10,6 @@
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list