PERFORCE change 134256 for review
John Birrell
jb at FreeBSD.org
Sun Jan 27 15:09:34 PST 2008
http://perforce.freebsd.org/chv.cgi?CH=134256
Change 134256 by jb at jb_freebsd1 on 2008/01/27 23:09:06
IF6
Affected files ...
.. //depot/projects/dtrace6/src/COPYRIGHT#2 integrate
.. //depot/projects/dtrace6/src/ObsoleteFiles.inc#2 integrate
.. //depot/projects/dtrace6/src/bin/mv/mv.c#2 integrate
.. //depot/projects/dtrace6/src/contrib/cvs/src/parseinfo.c#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/ChangeLog#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/FREEBSD-upgrade#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/LEGAL.NOTICE#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Localstuff#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/MAINT#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/adventure#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/amigaos#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/animation#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/apple#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/archive#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/audio#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/basis#1 branch
.. //depot/projects/dtrace6/src/contrib/file/Magdir/bflt#1 branch
.. //depot/projects/dtrace6/src/contrib/file/Magdir/bout#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/btsnoop#1 branch
.. //depot/projects/dtrace6/src/contrib/file/Magdir/c-lang#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/c64#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/cad#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/cafebabe#1 branch
.. //depot/projects/dtrace6/src/contrib/file/Magdir/commands#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/compress#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/console#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/cracklib#1 branch
.. //depot/projects/dtrace6/src/contrib/file/Magdir/ctags#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/database#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/diff#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/digital#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/dump#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/editors#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/elf#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/filesystems#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/flash#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/fonts#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/fsav#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/gnu#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/iff#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/images#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/java#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/linux#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/lisp#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/mach#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/macintosh#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/mail.news#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/maple#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/mathematica#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/mime#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/mips#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/misctools#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/msdos#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/mup#1 branch
.. //depot/projects/dtrace6/src/contrib/file/Magdir/ncr#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/os2#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/os400#1 branch
.. //depot/projects/dtrace6/src/contrib/file/Magdir/perl#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/printer#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/psion#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/python#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/revision#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/riff#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/scientific#1 branch
.. //depot/projects/dtrace6/src/contrib/file/Magdir/sgi#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/sgml#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/sharc#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/sql#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/sun#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/sysex#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/tex#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/tgif#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/unicode#1 branch
.. //depot/projects/dtrace6/src/contrib/file/Magdir/varied.out#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/varied.script#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/vmware#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/wordprocessors#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Magdir/xwindows#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Makefile.am#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/Makefile.in#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/README#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/aclocal.m4#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/apprentice.c#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/apptype.c#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/ascmagic.c#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/compress.c#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/config.h.in#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/configure#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/configure.in#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/file.c#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/file.h#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/file.man#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/fsmagic.c#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/funcs.c#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/install-sh#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/is_tar.c#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/libmagic.man#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/magic.c#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/magic.h#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/magic.man#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/magic.mime#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/magic2mime#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/mkinstalldirs#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/names.h#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/patchlevel.h#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/print.c#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/readelf.c#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/readelf.h#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/softmagic.c#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/tar.h#2 integrate
.. //depot/projects/dtrace6/src/contrib/file/test.c#2 integrate
.. //depot/projects/dtrace6/src/etc/defaults/periodic.conf#3 integrate
.. //depot/projects/dtrace6/src/etc/defaults/rc.conf#3 integrate
.. //depot/projects/dtrace6/src/etc/namedb/named.conf#2 integrate
.. //depot/projects/dtrace6/src/etc/periodic/daily/460.status-mail-rejects#2 integrate
.. //depot/projects/dtrace6/src/etc/rc.d/ldconfig#3 integrate
.. //depot/projects/dtrace6/src/etc/rc.firewall#2 integrate
.. //depot/projects/dtrace6/src/etc/rc.firewall6#2 integrate
.. //depot/projects/dtrace6/src/lib/libc/gen/sem_open.3#2 integrate
.. //depot/projects/dtrace6/src/lib/libc/inet/inet_network.c#2 integrate
.. //depot/projects/dtrace6/src/lib/libc/stdlib/grantpt.c#2 integrate
.. //depot/projects/dtrace6/src/lib/libfetch/Makefile#2 integrate
.. //depot/projects/dtrace6/src/lib/libfetch/common.c#2 integrate
.. //depot/projects/dtrace6/src/lib/libfetch/common.h#2 integrate
.. //depot/projects/dtrace6/src/lib/libfetch/fetch.3#2 integrate
.. //depot/projects/dtrace6/src/lib/libfetch/fetch.c#2 integrate
.. //depot/projects/dtrace6/src/lib/libfetch/file.c#2 integrate
.. //depot/projects/dtrace6/src/lib/libfetch/ftp.c#2 integrate
.. //depot/projects/dtrace6/src/lib/libfetch/http.c#2 integrate
.. //depot/projects/dtrace6/src/lib/libmagic/Makefile#2 integrate
.. //depot/projects/dtrace6/src/lib/libmagic/config.h#2 integrate
.. //depot/projects/dtrace6/src/lib/libstand/Makefile#3 integrate
.. //depot/projects/dtrace6/src/lib/libstand/bzipfs.c#2 integrate
.. //depot/projects/dtrace6/src/lib/libstand/gzipfs.c#2 integrate
.. //depot/projects/dtrace6/src/lib/libutil/pty.3#2 integrate
.. //depot/projects/dtrace6/src/lib/libutil/pty.c#3 integrate
.. //depot/projects/dtrace6/src/release/Makefile#3 integrate
.. //depot/projects/dtrace6/src/release/amd64/boot_crunch.conf#2 integrate
.. //depot/projects/dtrace6/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#2 integrate
.. //depot/projects/dtrace6/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#6 integrate
.. //depot/projects/dtrace6/src/release/doc/share/misc/dev.archlist.txt#2 integrate
.. //depot/projects/dtrace6/src/release/doc/share/sgml/release.ent#3 integrate
.. //depot/projects/dtrace6/src/release/fixit.profile#3 integrate
.. //depot/projects/dtrace6/src/release/i386/boot_crunch.conf#2 integrate
.. //depot/projects/dtrace6/src/release/ia64/boot_crunch.conf#2 integrate
.. //depot/projects/dtrace6/src/release/pc98/boot_crunch.conf#2 integrate
.. //depot/projects/dtrace6/src/release/powerpc/boot_crunch.conf#2 integrate
.. //depot/projects/dtrace6/src/release/scripts/package-split.py#3 integrate
.. //depot/projects/dtrace6/src/release/sparc64/boot_crunch.conf#2 integrate
.. //depot/projects/dtrace6/src/sbin/gpt/Makefile#2 integrate
.. //depot/projects/dtrace6/src/sbin/gpt/add.c#2 integrate
.. //depot/projects/dtrace6/src/sbin/gpt/boot.c#1 branch
.. //depot/projects/dtrace6/src/sbin/gpt/gpt.8#2 integrate
.. //depot/projects/dtrace6/src/sbin/gpt/gpt.c#3 integrate
.. //depot/projects/dtrace6/src/sbin/gpt/gpt.h#2 integrate
.. //depot/projects/dtrace6/src/sbin/gpt/show.c#2 integrate
.. //depot/projects/dtrace6/src/sbin/mount_ntfs/mount_ntfs.8#2 integrate
.. //depot/projects/dtrace6/src/share/man/man4/Makefile#2 integrate
.. //depot/projects/dtrace6/src/share/man/man4/coretemp.4#1 branch
.. //depot/projects/dtrace6/src/share/man/man4/edsc.4#2 integrate
.. //depot/projects/dtrace6/src/share/man/man4/hptrr.4#1 branch
.. //depot/projects/dtrace6/src/share/man/man4/ipmi.4#2 integrate
.. //depot/projects/dtrace6/src/share/man/man4/lagg.4#3 integrate
.. //depot/projects/dtrace6/src/share/man/man4/mxge.4#2 integrate
.. //depot/projects/dtrace6/src/share/man/man4/snd_envy24.4#2 integrate
.. //depot/projects/dtrace6/src/share/man/man4/snd_envy24ht.4#2 integrate
.. //depot/projects/dtrace6/src/share/man/man4/snd_hda.4#2 integrate
.. //depot/projects/dtrace6/src/share/man/man4/snd_spicds.4#2 integrate
.. //depot/projects/dtrace6/src/share/man/man5/linsysfs.5#2 integrate
.. //depot/projects/dtrace6/src/share/man/man5/rc.conf.5#2 integrate
.. //depot/projects/dtrace6/src/share/man/man7/ports.7#2 integrate
.. //depot/projects/dtrace6/src/share/man/man9/Makefile#2 integrate
.. //depot/projects/dtrace6/src/share/man/man9/mbuf_tags.9#2 integrate
.. //depot/projects/dtrace6/src/share/man/man9/sleep.9#2 integrate
.. //depot/projects/dtrace6/src/share/misc/bsd-family-tree#2 integrate
.. //depot/projects/dtrace6/src/share/misc/iso3166#2 integrate
.. //depot/projects/dtrace6/src/share/zoneinfo/asia#3 integrate
.. //depot/projects/dtrace6/src/share/zoneinfo/backward#2 integrate
.. //depot/projects/dtrace6/src/share/zoneinfo/europe#2 integrate
.. //depot/projects/dtrace6/src/share/zoneinfo/northamerica#2 integrate
.. //depot/projects/dtrace6/src/share/zoneinfo/southamerica#3 integrate
.. //depot/projects/dtrace6/src/share/zoneinfo/zone.tab#2 integrate
.. //depot/projects/dtrace6/src/sys/amd64/amd64/intr_machdep.c#3 integrate
.. //depot/projects/dtrace6/src/sys/amd64/amd64/machdep.c#3 integrate
.. //depot/projects/dtrace6/src/sys/amd64/conf/GENERIC#2 integrate
.. //depot/projects/dtrace6/src/sys/amd64/conf/NOTES#4 integrate
.. //depot/projects/dtrace6/src/sys/arm/arm/support.S#2 integrate
.. //depot/projects/dtrace6/src/sys/boot/i386/Makefile#2 integrate
.. //depot/projects/dtrace6/src/sys/boot/i386/gptboot/Makefile#1 branch
.. //depot/projects/dtrace6/src/sys/boot/i386/gptboot/gptboot.c#1 branch
.. //depot/projects/dtrace6/src/sys/boot/i386/gptboot/gptldr.S#1 branch
.. //depot/projects/dtrace6/src/sys/boot/i386/libi386/biosdisk.c#3 integrate
.. //depot/projects/dtrace6/src/sys/boot/i386/libi386/devicename.c#2 integrate
.. //depot/projects/dtrace6/src/sys/boot/i386/pmbr/Makefile#1 branch
.. //depot/projects/dtrace6/src/sys/boot/i386/pmbr/pmbr.s#1 branch
.. //depot/projects/dtrace6/src/sys/boot/pc98/libpc98/biosdisk.c#3 integrate
.. //depot/projects/dtrace6/src/sys/compat/freebsd32/freebsd32.h#2 integrate
.. //depot/projects/dtrace6/src/sys/compat/freebsd32/freebsd32_ipc.h#1 branch
.. //depot/projects/dtrace6/src/sys/compat/freebsd32/freebsd32_misc.c#3 integrate
.. //depot/projects/dtrace6/src/sys/compat/freebsd32/freebsd32_proto.h#3 integrate
.. //depot/projects/dtrace6/src/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate
.. //depot/projects/dtrace6/src/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate
.. //depot/projects/dtrace6/src/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate
.. //depot/projects/dtrace6/src/sys/compat/freebsd32/syscalls.master#3 integrate
.. //depot/projects/dtrace6/src/sys/compat/linux/linux_stats.c#3 integrate
.. //depot/projects/dtrace6/src/sys/conf/files.amd64#4 integrate
.. //depot/projects/dtrace6/src/sys/conf/files.i386#4 integrate
.. //depot/projects/dtrace6/src/sys/conf/newvers.sh#3 integrate
.. //depot/projects/dtrace6/src/sys/dev/acpica/acpi_hpet.c#3 integrate
.. //depot/projects/dtrace6/src/sys/dev/acpica/acpi_hpet.h#1 branch
.. //depot/projects/dtrace6/src/sys/dev/acpica/acpi_thermal.c#2 integrate
.. //depot/projects/dtrace6/src/sys/dev/ata/ata-all.h#4 integrate
.. //depot/projects/dtrace6/src/sys/dev/ata/ata-chipset.c#5 integrate
.. //depot/projects/dtrace6/src/sys/dev/ata/ata-dma.c#3 integrate
.. //depot/projects/dtrace6/src/sys/dev/ata/ata-lowlevel.c#2 integrate
.. //depot/projects/dtrace6/src/sys/dev/bge/if_bge.c#2 integrate
.. //depot/projects/dtrace6/src/sys/dev/hptrr/amd64-elf.hptrr_lib.o.uu#1 branch
.. //depot/projects/dtrace6/src/sys/dev/hptrr/array.h#1 branch
.. //depot/projects/dtrace6/src/sys/dev/hptrr/him.h#1 branch
.. //depot/projects/dtrace6/src/sys/dev/hptrr/himfuncs.h#1 branch
.. //depot/projects/dtrace6/src/sys/dev/hptrr/hptintf.h#1 branch
.. //depot/projects/dtrace6/src/sys/dev/hptrr/hptrr_config.c#1 branch
.. //depot/projects/dtrace6/src/sys/dev/hptrr/hptrr_config.h#1 branch
.. //depot/projects/dtrace6/src/sys/dev/hptrr/hptrr_os_bsd.c#1 branch
.. //depot/projects/dtrace6/src/sys/dev/hptrr/hptrr_osm_bsd.c#1 branch
.. //depot/projects/dtrace6/src/sys/dev/hptrr/i386-elf.hptrr_lib.o.uu#1 branch
.. //depot/projects/dtrace6/src/sys/dev/hptrr/ldm.h#1 branch
.. //depot/projects/dtrace6/src/sys/dev/hptrr/list.h#1 branch
.. //depot/projects/dtrace6/src/sys/dev/hptrr/os_bsd.h#1 branch
.. //depot/projects/dtrace6/src/sys/dev/hptrr/osm.h#1 branch
.. //depot/projects/dtrace6/src/sys/dev/isp/isp_sbus.c#2 integrate
.. //depot/projects/dtrace6/src/sys/dev/mii/gentbi.c#2 integrate
.. //depot/projects/dtrace6/src/sys/dev/mxge/eth_z8e.h#2 integrate
.. //depot/projects/dtrace6/src/sys/dev/mxge/ethp_z8e.h#2 integrate
.. //depot/projects/dtrace6/src/sys/dev/ofw/openpromio.c#2 integrate
.. //depot/projects/dtrace6/src/sys/dev/pci/pci.c#2 integrate
.. //depot/projects/dtrace6/src/sys/dev/pci/pci_user.c#2 integrate
.. //depot/projects/dtrace6/src/sys/fs/devfs/devfs_vnops.c#3 integrate
.. //depot/projects/dtrace6/src/sys/fs/ntfs/ntfs_vfsops.c#2 integrate
.. //depot/projects/dtrace6/src/sys/geom/geom_bsd.c#2 integrate
.. //depot/projects/dtrace6/src/sys/geom/geom_gpt.c#2 integrate
.. //depot/projects/dtrace6/src/sys/i386/conf/GENERIC#2 integrate
.. //depot/projects/dtrace6/src/sys/i386/conf/NOTES#4 integrate
.. //depot/projects/dtrace6/src/sys/i386/conf/PAE#2 integrate
.. //depot/projects/dtrace6/src/sys/i386/i386/intr_machdep.c#3 integrate
.. //depot/projects/dtrace6/src/sys/i386/i386/machdep.c#2 integrate
.. //depot/projects/dtrace6/src/sys/i386/pci/pci_pir.c#2 integrate
.. //depot/projects/dtrace6/src/sys/kern/kern_module.c#2 integrate
.. //depot/projects/dtrace6/src/sys/modules/Makefile#4 integrate
.. //depot/projects/dtrace6/src/sys/modules/hptrr/Makefile#1 branch
.. //depot/projects/dtrace6/src/sys/net/if_bridge.c#3 integrate
.. //depot/projects/dtrace6/src/sys/net/if_enc.c#2 integrate
.. //depot/projects/dtrace6/src/sys/net/if_lagg.c#4 integrate
.. //depot/projects/dtrace6/src/sys/net/route.c#3 integrate
.. //depot/projects/dtrace6/src/sys/net/route.h#2 integrate
.. //depot/projects/dtrace6/src/sys/netgraph/ng_l2tp.c#3 integrate
.. //depot/projects/dtrace6/src/sys/netgraph/ng_ppp.c#2 integrate
.. //depot/projects/dtrace6/src/sys/netgraph/ng_pppoe.c#3 integrate
.. //depot/projects/dtrace6/src/sys/netinet/in_pcb.c#2 integrate
.. //depot/projects/dtrace6/src/sys/netinet/ip_input.c#2 integrate
.. //depot/projects/dtrace6/src/sys/netinet/tcp.h#2 integrate
.. //depot/projects/dtrace6/src/sys/netinet/tcp_subr.c#3 integrate
.. //depot/projects/dtrace6/src/sys/netinet/tcp_timer.h#2 integrate
.. //depot/projects/dtrace6/src/sys/netinet/tcp_usrreq.c#2 integrate
.. //depot/projects/dtrace6/src/sys/netinet6/in6_pcb.c#2 integrate
.. //depot/projects/dtrace6/src/sys/netinet6/ip6_output.c#2 integrate
.. //depot/projects/dtrace6/src/sys/nfsclient/nfs_socket.c#3 integrate
.. //depot/projects/dtrace6/src/sys/security/mac/mac_posix_sem.c#2 integrate
.. //depot/projects/dtrace6/src/sys/sys/copyright.h#2 integrate
.. //depot/projects/dtrace6/src/sys/sys/gpt.h#2 integrate
.. //depot/projects/dtrace6/src/sys/ufs/ffs/ffs_alloc.c#2 integrate
.. //depot/projects/dtrace6/src/sys/vm/vm_map.c#3 integrate
.. //depot/projects/dtrace6/src/usr.bin/fetch/fetch.1#2 integrate
.. //depot/projects/dtrace6/src/usr.bin/file/config.h#2 integrate
.. //depot/projects/dtrace6/src/usr.bin/file/file.1#2 integrate
.. //depot/projects/dtrace6/src/usr.bin/file/magic.5#2 integrate
.. //depot/projects/dtrace6/src/usr.bin/netstat/inet.c#3 integrate
.. //depot/projects/dtrace6/src/usr.bin/split/split.1#2 integrate
.. //depot/projects/dtrace6/src/usr.bin/systat/ifstat.c#2 integrate
.. //depot/projects/dtrace6/src/usr.sbin/inetd/inetd.8#2 integrate
.. //depot/projects/dtrace6/src/usr.sbin/iostat/iostat.c#2 integrate
.. //depot/projects/dtrace6/src/usr.sbin/mergemaster/mergemaster.sh#2 integrate
.. //depot/projects/dtrace6/src/usr.sbin/ntp/Makefile#2 integrate
.. //depot/projects/dtrace6/src/usr.sbin/ntp/doc/Makefile#2 integrate
.. //depot/projects/dtrace6/src/usr.sbin/pw/pw.8#2 integrate
.. //depot/projects/dtrace6/src/usr.sbin/sysinstall/dist.c#4 integrate
.. //depot/projects/dtrace6/src/usr.sbin/sysinstall/dist.h#4 integrate
.. //depot/projects/dtrace6/src/usr.sbin/sysinstall/index.c#2 integrate
.. //depot/projects/dtrace6/src/usr.sbin/sysinstall/main.c#2 integrate
.. //depot/projects/dtrace6/src/usr.sbin/sysinstall/menus.c#4 integrate
Differences ...
==== //depot/projects/dtrace6/src/COPYRIGHT#2 (text+ko) ====
@@ -1,10 +1,10 @@
-# $FreeBSD: src/COPYRIGHT,v 1.6.2.2 2006/12/31 16:35:28 delphij Exp $
+# $FreeBSD: src/COPYRIGHT,v 1.6.2.3 2007/12/31 22:12:07 delphij Exp $
# @(#)COPYRIGHT 8.2 (Berkeley) 3/21/94
The compilation of software known as FreeBSD is distributed under the
following terms:
-Copyright (C) 1992-2007 The FreeBSD Project. All rights reserved.
+Copyright (C) 1992-2008 The FreeBSD Project. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
==== //depot/projects/dtrace6/src/ObsoleteFiles.inc#2 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.25.2.20 2007/07/21 00:01:09 truckman Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.25.2.21 2007/12/19 17:08:34 obrien Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -553,7 +553,6 @@
OLD_FILES+=usr/lib/libpam_ssh_p.a
OLD_FILES+=usr/bin/help
OLD_FILES+=usr/bin/sccs
-OLD_FILES+=usr/bin/gdbserver
OLD_FILES+=usr/bin/ssh-keysign
OLD_FILES+=usr/sbin/gifconfig
OLD_FILES+=usr/sbin/prefix
==== //depot/projects/dtrace6/src/bin/mv/mv.c#2 (text+ko) ====
@@ -42,7 +42,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.45.2.1 2005/11/12 21:21:46 csjp Exp $");
+__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.45.2.2 2008/01/27 07:37:01 dds Exp $");
#include <sys/types.h>
#include <sys/acl.h>
@@ -65,6 +65,9 @@
#include <sysexits.h>
#include <unistd.h>
+/* Exit code for a failed exec. */
+#define EXEC_FAILED 127
+
int fflg, iflg, nflg, vflg;
int copy(char *, char *);
@@ -198,6 +201,11 @@
}
}
}
+ /*
+ * Rename on FreeBSD will fail with EISDIR and ENOTDIR, before failing
+ * with EXDEV. Therefore, copy() doesn't have to perform the checks
+ * specified in the Step 3 of the POSIX mv specification.
+ */
if (!rename(from, to)) {
if (vflg)
printf("%s -> %s\n", from, to);
@@ -219,7 +227,7 @@
if (!S_ISLNK(sb.st_mode)) {
/* Can't mv(1) a mount point. */
if (realpath(from, path) == NULL) {
- warnx("cannot resolve %s: %s", from, path);
+ warn("cannot resolve %s: %s", from, path);
return (1);
}
if (!statfs(path, &sfs) &&
@@ -252,9 +260,9 @@
struct timeval tval[2];
static u_int blen;
static char *bp;
+ acl_t acl;
mode_t oldmode;
int nread, from_fd, to_fd;
- acl_t acl;
if ((from_fd = open(from, O_RDONLY, 0)) < 0) {
warn("%s", from);
@@ -305,7 +313,7 @@
}
/*
* POSIX 1003.2c states that if _POSIX_ACL_EXTENDED is in effect
- * for dest_file, then it's ACLs shall reflect the ACLs of the
+ * for dest_file, then its ACLs shall reflect the ACLs of the
* source_file.
*/
if (fpathconf(to_fd, _PC_ACL_EXTENDED) == 1 &&
@@ -355,43 +363,76 @@
int
copy(char *from, char *to)
{
+ struct stat sb;
int pid, status;
- if ((pid = fork()) == 0) {
+ if (lstat(to, &sb) == 0) {
+ /* Destination path exists. */
+ if (S_ISDIR(sb.st_mode)) {
+ if (rmdir(to) != 0) {
+ warn("rmdir %s", to);
+ return (1);
+ }
+ } else {
+ if (unlink(to) != 0) {
+ warn("unlink %s", to);
+ return (1);
+ }
+ }
+ } else if (errno != ENOENT) {
+ warn("%s", to);
+ return (1);
+ }
+
+ /* Copy source to destination. */
+ if (!(pid = vfork())) {
execl(_PATH_CP, "mv", vflg ? "-PRpv" : "-PRp", "--", from, to,
(char *)NULL);
- warn("%s", _PATH_CP);
- _exit(1);
+ _exit(EXEC_FAILED);
}
if (waitpid(pid, &status, 0) == -1) {
- warn("%s: waitpid", _PATH_CP);
+ warn("%s %s %s: waitpid", _PATH_CP, from, to);
return (1);
}
if (!WIFEXITED(status)) {
- warnx("%s: did not terminate normally", _PATH_CP);
+ warnx("%s %s %s: did not terminate normally",
+ _PATH_CP, from, to);
return (1);
}
- if (WEXITSTATUS(status)) {
- warnx("%s: terminated with %d (non-zero) status",
- _PATH_CP, WEXITSTATUS(status));
+ switch (WEXITSTATUS(status)) {
+ case 0:
+ break;
+ case EXEC_FAILED:
+ warnx("%s %s %s: exec failed", _PATH_CP, from, to);
+ return (1);
+ default:
+ warnx("%s %s %s: terminated with %d (non-zero) status",
+ _PATH_CP, from, to, WEXITSTATUS(status));
return (1);
}
+
+ /* Delete the source. */
if (!(pid = vfork())) {
execl(_PATH_RM, "mv", "-rf", "--", from, (char *)NULL);
- warn("%s", _PATH_RM);
- _exit(1);
+ _exit(EXEC_FAILED);
}
if (waitpid(pid, &status, 0) == -1) {
- warn("%s: waitpid", _PATH_RM);
+ warn("%s %s: waitpid", _PATH_RM, from);
return (1);
}
if (!WIFEXITED(status)) {
- warnx("%s: did not terminate normally", _PATH_RM);
+ warnx("%s %s: did not terminate normally", _PATH_RM, from);
return (1);
}
- if (WEXITSTATUS(status)) {
- warnx("%s: terminated with %d (non-zero) status",
- _PATH_RM, WEXITSTATUS(status));
+ switch (WEXITSTATUS(status)) {
+ case 0:
+ break;
+ case EXEC_FAILED:
+ warnx("%s %s: exec failed", _PATH_RM, from);
+ return (1);
+ default:
+ warnx("%s %s: terminated with %d (non-zero) status",
+ _PATH_RM, from, WEXITSTATUS(status));
return (1);
}
return (0);
==== //depot/projects/dtrace6/src/contrib/cvs/src/parseinfo.c#2 (text+ko) ====
@@ -5,7 +5,7 @@
* You may distribute under the terms of the GNU General Public License as
* specified in the README file that comes with the CVS source distribution.
*
- * $FreeBSD: src/contrib/cvs/src/parseinfo.c,v 1.3 2004/04/15 01:17:27 peter Exp $
+ * $FreeBSD: src/contrib/cvs/src/parseinfo.c,v 1.3.8.1 2008/01/07 09:08:04 peter Exp $
*/
#include "cvs.h"
@@ -429,6 +429,16 @@
else if (strcmp (p, "stat") == 0)
RereadLogAfterVerify = LOGMSG_REREAD_STAT;
}
+ else if (strcmp(line, "LocalKeyword") == 0)
+ {
+ /* Recognize cvs-1.12-style keyword control rather than erroring out. */
+ RCS_setlocalid(p);
+ }
+ else if (strcmp(line, "KeywordExpand") == 0)
+ {
+ /* Recognize cvs-1.12-style keyword control rather than erroring out. */
+ RCS_setincexc(p);
+ }
else
{
/* We may be dealing with a keyword which was added in a
==== //depot/projects/dtrace6/src/contrib/file/ChangeLog#2 (text+ko) ====
@@ -1,3 +1,293 @@
+2007-05-24 10:00 Christos Zoulas <christos at zoulas.com>
+
+ * Fix another integer overflow (Colin Percival)
+
+2007-03-26 13:58 Christos Zoulas <christos at zoulas.com>
+
+ * make sure that all of struct magic_set is initialized appropriately
+ (Brett)
+
+2007-03-25 17:44 Christos Zoulas <christos at zoulas.com>
+
+ * reset left bytes in the buffer (Dmitry V. Levin)
+
+ * compilation failed with COMPILE_ONLY and ENABLE_CONDITIONALS
+ (Peter Avalos)
+
+2007-03-15 10:51 Christos Zoulas <christos at zoulas.com>
+
+ * fix fortran and nroff reversed tests (Dmitry V. Levin)
+
+ * fix exclude option (Dmitry V. Levin)
+
+2007-02-08 17:30 Christos Zoulas <christos at zoulas.com>
+
+ * fix integer underflow in file_printf which can lead to
+ to exploitable heap overflow (Jean-Sebastien Guay-Lero)
+
+2007-02-05 11:35 Christos Zoulas <christos at zoulas.com>
+
+ * make socket/pipe reading more robust
+
+2007-01-25 16:01 Christos Zoulas <christos at zoulas.com>
+
+ * Centralize all the tests in file_buffer.
+
+ * Add exclude flag.
+
+2007-01-18 05:29 Anon Ymous <do at not.spam.me>
+
+ * Move the "type" detection code from parse() into its own table
+ driven routine. This avoids maintaining multiple lists in
+ file.h.
+
+ * Add an optional conditional field (ust before the type field).
+ This code is wrapped in "#ifdef ENABLE_CONDITIONALS" as it is
+ likely to go away.
+
+2007-01-16 23:24 Anon Ymous <do at not.spam.me>
+
+ * Fix an initialization bug in check_mem().
+
+2007-01-16 14:58 Anon Ymous <do at not.spam.me>
+
+ * Add a "default" type to print a message if nothing previously
+ matched at that level or since the last default at that
+ level. This is useful for setting up switch-like statements.
+ It can also be used to do if/else constructions without a
+ redundant second test.
+
+ * Fix the "x" special case test so that one can test for that
+ string with "=x".
+
+ * Allow "search" to search the entire buffer if the "/N"
+ search count is missing.
+
+ * Make "regex" work! It now starts its search at the
+ specified offset and takes an (optional) "/N" line count to
+ specify the search range; otherwise it searches to the end
+ of the file. The match is now grabbed correctly for format
+ strings and the offset set to the end of the match.
+
+ * Add a "/s" flag to "regex" and "search" to set the offset to
+ the start of the match. By default the offset is set to the
+ end of the match, as it is with other tests. This is mostly
+ useful for "regex".
+
+ * Make "search", "string" and "pstring" use the same
+ file_strncmp() routine so that they support the same flags;
+ "bestring16" and "lestring16" call the same routine, but
+ with flags = 0. Also add a "/C" flag (in analogy to "/c")
+ to ignore the case on uppercase (lowercase) characters in
+ the test string.
+
+ * Strict adherence to C style string escapes. A warnings are
+ printed when compiling. Note: previously "\a" was
+ incorrectly translated to 'a' instead of an <alert> (i.e.,
+ BELL, typically 0x07).
+
+ * Make this compile with "-Wall -Wextra" and all the warning
+ flags used with WARNS=4 in the NetBSD source. Also make it
+ pass lint.
+
+ * Many "cleanups" and hopefully not too many new bugs!
+
+2007-01-16 14:56 Anon Ymous <do at not.spam.me>
+
+ * make several more files compile with gcc warnings
+ on and also make them pass lint.
+
+2007-01-16 14:54 Anon Ymous <do at not.spam.me>
+
+ * fix a puts()/putc() usage goof in file.c
+
+ * make file.c compile with gcc warnings and pass lint
+
+2006-12-11 16:49 Christos Zoulas <christos at zoulas.com>
+
+ * fix byteswapping issue
+
+ * report the number of bytes we tried to
+ allocate when allocation fails
+
+ * add a few missed cases in the strength routine
+
+2006-12-08 16:32 Christos Zoulas <christos at zoulas.com>
+
+ * store and print the line number of the magic
+ entry for debugging.
+
+ * if the magic entry did not print anything,
+ don't treat it as a match
+
+ * change the magic strength algorithm to take
+ into account the relationship op.
+
+ * fix a bug in search where we could accidentally
+ return a match.
+
+ * propagate the error return from match to
+ file_softmagic.
+
+2006-11-25 13:35 Christos Zoulas <christos at zoulas.com>
+
+ * Don't store the current offset in the magic
+ struct, because it needs to be restored and
+ it was not done properly all the time. Bug
+ found by: Arkadiusz Miskiewicz
+
+ * Fix problem in the '\0' separator; and don't
+ print it as an additional separator; print
+ it as the only separator.
+
+2006-11-17 10:51 Christos Zoulas <christos at zoulas.com>
+
+ * Added a -0 option to print a '\0' separator
+ Etienne Buira <etienne.buira at free.fr>
+
+2006-10-31 15:14 Christos Zoulas <christos at zoulas.com>
+
+ * Check offset before copying (Mike Frysinger)
+
+ * merge duplicated code
+
+ * add quad date support
+
+ * make sure that we nul terminate desc (Ryoji Kanai)
+
+ * don't process elf notes multiple times
+
+ * allow -z to report empty compressed files
+
+ * use calloc to initialize the ascii buffers (Jos van den Oever)
+
+2006-06-08 11:11 Christos Zoulas <christos at zoulas.com>
+
+ * QNX fixes (Mike Gorchak)
+
+ * Add quad support.
+
+ * FIFO checks (Dr. Werner Fink)
+
+ * Linux ELF fixes (Dr. Werner Fink)
+
+ * Magic format checks (Dr. Werner Fink)
+
+ * Magic format function improvent (Karl Chen)
+
+2006-05-03 11:11 Christos Zoulas <christos at zoulas.com>
+
+ * Pick up some elf changes and some constant fixes from SUSE
+
+ * Identify gnu tar vs. posix tar
+
+ * When keep going, don't print spurious newlines (Radek Vokál)
+
+2006-04-01 12:02 Christos Zoulas <christos at zoulas.com>
+
+ * Use calloc instead of malloc (Mike Frysinger)
+
+ * Fix configure script to detect wctypes.h (Mike Frysinger)
+
+2006-03-02 16:06 Christos Zoulas <christos at zoulas.com>
+
+ * Print empty if the file is (Mike Frysinger)
+
+ * Don't try to read past the end of the buffer (Mike Frysinger)
+
+ * Sort magic entries by strength [experimental]
+
+2005-11-29 13:26 Christos Zoulas <christos at zoulas.com>
+
+ * Use iswprint() to convert the output string.
+ (Bastien Nocera)
+
+2005-10-31 8:54 Christos Zoulas <christos at zoulas.com>
+
+ * Fix regression where the core info was not completely processed
+ (Radek Vokál)
+
+2005-10-20 11:15 Christos Zoulas <christos at zoulas.com>
+
+ * Middle Endian magic (Diomidis Spinellis)
+
+2005-10-17 11:15 Christos Zoulas <christos at zoulas.com>
+
+ * Open with O_BINARY for CYGWIN (Corinna Vinschen)
+
+ * Don't close stdin (Arkadiusz Miskiewicz)
+
+ * Look for note sections in non executables.
+
+2005-09-20 13:33 Christos Zoulas <christos at zoulas.com>
+
+ * Don't print SVR4 Style in core files multiple times
+ (Radek Vokál)
+
+2005-08-27 04:09 Christos Zoulas <christos at zoulas.com>
+
+ * Cygwin changes Corinna Vinschen
+
+2005-08-18 09:53 Christos Zoulas <christos at zoulas.com>
+
+ * Remove erroreous mention of /etc/magic in the file man page
+ This is gentoo bug 101639. (Mike Frysinger)
+
+ * Cross-compile support and detection (Mike Frysinger)
+
+2005-08-12 10:17 Christos Zoulas <christos at zoulas.com>
+
+ * Add -h flag and dereference symlinks if POSIXLY_CORRECT
+ is set.
+
+2005-07-29 13:57 Christos Zoulas <christos at zoulas.com>
+
+ * Avoid search and regex buffer overflows (Kelledin)
+
+2005-07-12 11:48 Christos Zoulas <christos at zoulas.com>
+
+ * Provide stub implementations for {v,}nsprintf() for older
+ OS's that don't have them.
+ * Change mbstate_t autoconf detection macro from AC_MBSTATE_T
+ to AC_TYPE_MBSTATE_T.
+
+2005-06-25 11:48 Christos Zoulas <christos at zoulas.com>
+
+ * Dynamically allocate the string buffers and make the
+ default read size 256K.
+
+2005-06-01 00:00 Joerg Sonnenberger <joerg at britannica.bec.de>
+
+ * Dragonfly ELF note support
+
+2005-03-14 00:00 Giuliano Bertoletti <gb at symbolic.it>
+
+ * Avoid NULL pointer dereference in time conversion.
+
+2005-03-06 00:00 Joerg Walter <jwalt at mail.garni.ch>
+
+ * Add indirect magic offset support, and search mode.
+
+2005-01-12 00:00 Stepan Kasal <kasal at ucw.cz>
+
+ * src/ascmagic.c (file_ascmagic): Fix three bugs about text files:
+ If a CRLF text file happens to have CR at offset HOWMANY - 1
+ (currently 0xffff), it should not be counted as CR line
+ terminator.
+ If a line has length exactly MAXLINELEN, it should not yet be
+ treated as a ``very long line'', as MAXLINELEN is ``longest sane
+ line length''.
+ With CRLF, the line length was not computed correctly, and even
+ lines of length MAXLINELEN - 1 were treated as ``very long''.
+
+2004-12-07 14:15 Christos Zoulas <christos at zoulas.com>
+
+ * bzip2 needs a lot of input buffer space on some files
+ before it can begin uncompressing. This makes file -z
+ fail on some bz2 files. Fix it by giving it a copy of
+ the file descriptor to read as much as it wants if we
+ have access to it. <christos at zoulas.com>
+
2004-11-24 12:39 Christos Zoulas <christos at zoulas.com>
* Stack smash fix, and ELF more conservative reading.
==== //depot/projects/dtrace6/src/contrib/file/FREEBSD-upgrade#2 (text+ko) ====
@@ -1,13 +1,24 @@
# ex:ts=8
-$FreeBSD: src/contrib/file/FREEBSD-upgrade,v 1.4 2002/09/16 06:02:55 obrien Exp $
+$FreeBSD: src/contrib/file/FREEBSD-upgrade,v 1.4.14.1 2008/01/24 15:47:29 rafan Exp $
Christos Zoulas `file'
originals can be found at: ftp://ftp.astron.com/pub/file/
Imported by:
- cvs import -m "Virgin import of Christos Zoulas's FILE 3.39." \
- src/contrib/file ZOULAS file_3_39
+ mv magic/* .
+ rmdir magic
+ mv -i src/* .
+ rm -rf src
+ mv -i doc/* .
+ rm -rf doc
+ rm -rf python
+ rm -f lt*
+ rm -f missing depcomp
+ rm -f config.{guess,sub}
+
+ cvs import -m "Virgin import of Christos Zoulas's FILE 4.21." \
+ src/contrib/file ZOULAS file_4_21
Never make local changes to ZOULAS `file'. Christos is very willing to
==== //depot/projects/dtrace6/src/contrib/file/LEGAL.NOTICE#2 (text+ko) ====
@@ -1,7 +1,7 @@
-$Id: LEGAL.NOTICE,v 1.14 2004/09/11 19:15:56 christos Exp $
+$File: LEGAL.NOTICE,v 1.15 2006/05/03 18:48:33 christos Exp $
Copyright (c) Ian F. Darwin 1986, 1987, 1989, 1990, 1991, 1992, 1994, 1995.
Software written by Ian F. Darwin and others;
-maintained 1994-2004 Christos Zoulas.
+maintained 1994- Christos Zoulas.
This software is not subject to any export provision of the United States
Department of Commerce, and may be exported to any country or planet.
==== //depot/projects/dtrace6/src/contrib/file/Localstuff#2 (text+ko) ====
@@ -2,6 +2,6 @@
#------------------------------------------------------------------------------
# Localstuff: file(1) magic for locally observed files
#
-# $Id: Localstuff,v 1.4 2003/03/23 04:17:27 christos Exp $
+# $File: Localstuff,v 1.4 2003/03/23 04:17:27 christos Exp $
# Add any locally observed files here. Remember:
# text if readable, executable if runnable binary, data if unreadable.
==== //depot/projects/dtrace6/src/contrib/file/MAINT#2 (text+ko) ====
@@ -1,33 +1,45 @@
-$Id: MAINT,v 1.5 2003/03/23 04:36:37 christos Exp $
+$File: MAINT,v 1.9 2007/01/19 21:15:27 christos Exp $
Maintenance notes:
I am continuing to maintain the file command. I welcome your help,
but to make my life easier I'd like to request the following:
-- Don't change the version numbers!
+- Do not distribute changed versions.
-If your changes are extensive, I will have to work hard to
-integrate them into my version. If you check it into SCCS locally,
-the version numbers will likely be kept. IF you check it into RCS
-or CVS locally, please use -k to keep the version numbers, and
-please use branch deltas (1.21.1, 1.21.2, ...). If you don't do
-this, I will likely be unable to use your changes; life's just too
-short.
+People trying to be helpful occasionally put up their hacked versions
+of the file command for anonymous FTP, and people all over the
+world get copies of the hacked versions. Within a day or two I am
+getting email from around the world asking me why "my" file command
+won't compile!!! Needless to say this detracts from the limited
+time I have available to work on the actual software. Therefore I
+ask you again to please NOT distribute your changed version. If
+you need to make changes, please add a patch file next to the
+distribution tar, and a README file that clearly explains what you
+are trying to fix.
-- Do not distribute changed versions.
+Thank you for your assistance and cooperation.
-People trying to be helpful occasionally put up their hacked versions
-of the file command for FTP, then the "archie" server finds and publishes
-the hacked version, and people all over the world get copies of it.
-Within a day or two I am getting email from around the world
-asking me why "my" file command won't compile!!! Needless to say this
-detracts from the limited time I have available to work on the actual
-software. Therefore I ask you again to please NOT distribute
-your changed version.
+Code Overview
+This is a rough idea of the control flow from the main program:
-Thank you for your assistance and cooperation.
+file.c main()
+file.c process (called for each file)
+ printf file name
+magic.c magic_file()
+fsmagic.c file_fsmagic()
+ (handles statbuf modes for DEV)
+ (handles statbuf modes for executable &c.
+ reads data from file.
+funcs.c: file_buffer()
+compress.c file_zmagic()
+is_tar.c file_is_tar()
+softmagic.c file_softmagic()
+ match() - looks for match against main magic database
+ascmagic.c file_ascmagic()
+readelf.c file_tryelf()
+ "unknown"
Christos Zoulas
christos at astron.com
==== //depot/projects/dtrace6/src/contrib/file/Magdir/adventure#2 (text+ko) ====
@@ -12,27 +12,38 @@
0 beshort 0x0206 ALAN game data
>2 byte <10 version 2.6%d
-# Conflicts with too much other stuff!
-# Infocom
-# (Note: to avoid false matches Z-machine version 1 and 2 are not
-# recognized since only the oldest Zork I and II used them. Similarly
-# there are 4 Infocom games that use version 4 that are not recognized.)
-#0 byte 3 Infocom game data (Z-machine 3,
-#>2 beshort <0x7fff Release %3d,
-#>26 beshort >0 Size %d*2
-#>18 string >\0 Serial %.6s)
-#0 byte 5 Infocom game data (Z-machine 5,
-#>2 beshort <0x7fff Release %3d,
-#>26 beshort >0 Size %d*4
-#>18 string >\0 Serial %.6s)
-#0 byte 6 Infocom game data (Z-machine 6,
-#>2 beshort <0x7fff Release %3d,
-#>26 beshort >0 Size %d*8
-#>18 string >\0 Serial %.6s)
-#0 byte 8 Infocom game data (Z-machine 8,
-#>2 beshort <0x7fff Release %3d,
-#>26 beshort >0 Size %d*8
-#>18 string >\0 Serial %.6s)
+
+# Infocom (see z-machine)
+#------------------------------------------------------------------------------
+# Z-machine: file(1) magic for Z-machine binaries.
+#
+# This will match ${TEX_BASE}/texmf/omega/ocp/char2uni/inbig5.ocp which
+# appears to be a version-0 Z-machine binary.
+#
+# The (false match) message is to correct that behavior. Perhaps it is
+# not needed.
+#
+16 belong&0xfe00f0f0 0x3030 Infocom game data
+>0 ubyte 0 (false match)
+>0 ubyte >0 (Z-machine %d,
+>>2 ubeshort x Release %d /
+>>18 string >\0 Serial %.6s)
+
+#------------------------------------------------------------------------------
+# Glulx: file(1) magic for Glulx binaries.
+#
+# I haven't checked for false matches yet.
+#
+0 string Glul Glulx game data
+>4 beshort x (Version %d
+>>6 byte x \b.%d
+>>8 byte x \b.%d)
+>36 string Info Compiled by Inform
+
+
+
+# For Quetzal and blorb magic see iff
+
# TADS (Text Adventure Development System)
# All files are machine-independent (games compile to byte-code) and are tagged
@@ -61,3 +72,4 @@
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list