PERFORCE change 59236 for review
David Xu
davidxu at FreeBSD.org
Mon Aug 9 04:18:15 PDT 2004
http://perforce.freebsd.org/chv.cgi?CH=59236
Change 59236 by davidxu at davidxu_alona on 2004/08/09 11:17:13
IFC @59230
Affected files ...
.. //depot/projects/davidxu_ksedbg/src/UPDATING#7 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/.cvsignore#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/ChangeLog#1 branch
.. //depot/projects/davidxu_ksedbg/src/contrib/file/LEGAL.NOTICE#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Localstuff#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/MAINT#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/adventure#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/amigaos#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/animation#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/apple#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/archive#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/audio#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/bFLT#1 branch
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/bout#1 branch
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/c-lang#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/c64#1 branch
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/cad#1 branch
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/chord#1 branch
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/claris#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/commands#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/communications#1 branch
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/compress#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/console#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/dact#1 branch
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/database#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/diff#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/elf#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/fcs#1 branch
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/filesystems#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/flash#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/fonts#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/games#1 branch
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/gcc#1 branch
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/geos#1 branch
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/gnu#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/human68k#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/ibm6000#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/iff#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/images#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/intel#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/jpeg#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/linux#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/mach#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/macintosh#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/mail.news#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/maple#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/mathematica#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/matroska#1 branch
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/misctools#1 branch
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/motorola#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/msdos#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/netbsd#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/netscape#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/ocaml#1 branch
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/os2#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/palm#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/perl#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/plan9#1 branch
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/printer#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/psion#1 branch
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/python#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/revision#1 branch
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/riff#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/rpm#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/sgi#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/sgml#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/sinclair#1 branch
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/sniffer#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/spec#1 branch
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/spectrum#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/sun#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/sysex#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/ti-8x#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/unknown#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/varied.out#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/varied.script#1 branch
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/vmware#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/vorbis#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/wordprocessors#1 branch
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/xwindows#1 branch
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Makefile.am#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/Makefile.in#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/README#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/acinclude.m4#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/aclocal.m4#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/apprentice.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/apptype.c#1 branch
.. //depot/projects/davidxu_ksedbg/src/contrib/file/ascmagic.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/compress.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/config.h.in#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/configure#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/configure.in#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/file.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/file.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/file.man#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/fsmagic.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/funcs.c#1 branch
.. //depot/projects/davidxu_ksedbg/src/contrib/file/is_tar.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/libmagic.man#1 branch
.. //depot/projects/davidxu_ksedbg/src/contrib/file/magic.c#1 branch
.. //depot/projects/davidxu_ksedbg/src/contrib/file/magic.h#1 branch
.. //depot/projects/davidxu_ksedbg/src/contrib/file/magic.man#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/magic.mime#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/magic2mime#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/names.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/patchlevel.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/print.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/readelf.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/readelf.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/softmagic.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/tar.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/file/test.c#1 branch
.. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/arch/i386/init.c#4 integrate
.. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/Makefile#6 integrate
.. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#18 integrate
.. //depot/projects/davidxu_ksedbg/src/include/Makefile#7 integrate
.. //depot/projects/davidxu_ksedbg/src/include/tgmath.h#1 branch
.. //depot/projects/davidxu_ksedbg/src/lib/libarchive/COPYING#1 branch
.. //depot/projects/davidxu_ksedbg/src/lib/libarchive/INSTALL#1 branch
.. //depot/projects/davidxu_ksedbg/src/lib/libarchive/Makefile#4 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libarchive/Makefile.am#1 branch
.. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive.h.in#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_entry.3#5 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_entry.c#5 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_entry.h#4 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_platform.h#3 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_read.3#4 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_read.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_read_extract.c#8 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_read_support_format_tar.c#4 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_write.3#4 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_write.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_write_set_compression_gzip.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_write_set_compression_none.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_write_set_format_pax.c#4 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libarchive/configure.ac.in#1 branch
.. //depot/projects/davidxu_ksedbg/src/lib/libarchive/tar.5#3 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libfetch/http.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libmagic/Makefile#1 branch
.. //depot/projects/davidxu_ksedbg/src/lib/libmagic/config.h#1 branch
.. //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_create.c#4 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_exit.c#4 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_init.c#4 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_kern.c#10 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_private.h#10 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libthread_db/Makefile#5 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libthread_db/libpthread_db.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libthread_db/thread_db.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libthread_db/thread_db.h#3 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libthread_db/thread_db_int.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/msun/Makefile#5 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/msun/man/cimag.3#1 branch
.. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#4 integrate
.. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/errata/article.sgml#2 integrate
.. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/hardware/alpha/article.sgml#3 integrate
.. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/hardware/amd64/article.sgml#3 integrate
.. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#3 integrate
.. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/hardware/i386/article.sgml#3 integrate
.. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/hardware/ia64/article.sgml#3 integrate
.. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/hardware/pc98/article.sgml#3 integrate
.. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/hardware/sparc64/article.sgml#3 integrate
.. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/installation/alpha/article.sgml#2 integrate
.. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/installation/amd64/article.sgml#2 integrate
.. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/installation/i386/article.sgml#2 integrate
.. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/installation/ia64/article.sgml#2 integrate
.. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/installation/pc98/article.sgml#2 integrate
.. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/installation/sparc64/article.sgml#2 integrate
.. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/readme/article.sgml#2 integrate
.. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml#3 integrate
.. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml#3 integrate
.. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/relnotes/i386/Makefile#2 integrate
.. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml#3 integrate
.. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml#3 integrate
.. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml#3 integrate
.. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/relnotes/sparc64/article.sgml#3 integrate
.. //depot/projects/davidxu_ksedbg/src/release/doc/share/misc/dev.archlist.txt#2 integrate
.. //depot/projects/davidxu_ksedbg/src/release/doc/share/misc/man2hwnotes.pl#2 integrate
.. //depot/projects/davidxu_ksedbg/src/release/doc/share/mk/doc.relnotes.mk#3 integrate
.. //depot/projects/davidxu_ksedbg/src/release/doc/share/sgml/Makefile#2 integrate
.. //depot/projects/davidxu_ksedbg/src/release/scripts/doFS.sh#3 integrate
.. //depot/projects/davidxu_ksedbg/src/release/scripts/print-cdrom-packages.sh#4 integrate
.. //depot/projects/davidxu_ksedbg/src/sbin/Makefile#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sbin/bsdlabel/bsdlabel.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sbin/gpt/Makefile#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sbin/gpt/add.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sbin/gpt/create.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sbin/gpt/destroy.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sbin/gpt/gpt.8#4 integrate
.. //depot/projects/davidxu_ksedbg/src/sbin/gpt/gpt.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sbin/gpt/gpt.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sbin/gpt/map.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sbin/gpt/map.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sbin/gpt/migrate.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sbin/gpt/recover.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sbin/gpt/remove.c#1 branch
.. //depot/projects/davidxu_ksedbg/src/sbin/gpt/show.c#4 integrate
.. //depot/projects/davidxu_ksedbg/src/sbin/ifconfig/ifconfig.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sbin/mdconfig/mdconfig.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/share/man/man4/adv.4#2 integrate
.. //depot/projects/davidxu_ksedbg/src/share/man/man4/amd.4#2 integrate
.. //depot/projects/davidxu_ksedbg/src/share/man/man4/bt.4#2 integrate
.. //depot/projects/davidxu_ksedbg/src/share/man/man4/ida.4#3 integrate
.. //depot/projects/davidxu_ksedbg/src/share/man/man4/iir.4#3 integrate
.. //depot/projects/davidxu_ksedbg/src/share/man/man4/ips.4#3 integrate
.. //depot/projects/davidxu_ksedbg/src/share/man/man4/nsp.4#3 integrate
.. //depot/projects/davidxu_ksedbg/src/share/man/man4/ohci.4#2 integrate
.. //depot/projects/davidxu_ksedbg/src/share/man/man4/stg.4#4 integrate
.. //depot/projects/davidxu_ksedbg/src/share/man/man4/umct.4#4 integrate
.. //depot/projects/davidxu_ksedbg/src/share/man/man4/uplcom.4#2 integrate
.. //depot/projects/davidxu_ksedbg/src/share/man/man7/development.7#5 integrate
.. //depot/projects/davidxu_ksedbg/src/share/man/man7/firewall.7#3 integrate
.. //depot/projects/davidxu_ksedbg/src/share/man/man7/security.7#3 integrate
.. //depot/projects/davidxu_ksedbg/src/share/man/man7/tuning.7#5 integrate
.. //depot/projects/davidxu_ksedbg/src/share/man/man9/Makefile#3 integrate
.. //depot/projects/davidxu_ksedbg/src/share/man/man9/altq.9#1 branch
.. //depot/projects/davidxu_ksedbg/src/share/man/man9/taskqueue.9#3 integrate
.. //depot/projects/davidxu_ksedbg/src/share/mk/bsd.libnames.mk#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/amd64/amd64/amd64_mem.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/amd64/amd64/mem.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/amd64/amd64/pmap.c#6 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/cam/scsi/scsi_da.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/ata/ata-all.c#4 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/ata/ata-lowlevel.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/ata/atapi-cd.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/ath/if_ath.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/bfe/if_bfe.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/bfe/if_bfereg.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/bktr/bktr_card.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/bktr/bktr_card.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/md/md.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/umass.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/umct.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/uplcom.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/usbdevs#8 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/fs/hpfs/hpfs_vnops.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/fs/msdosfs/msdosfs_vfsops.c#5 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/fs/specfs/spec_vnops.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/geom/bde/g_bde.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/geom/concat/g_concat.c#4 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/geom/gate/g_gate.c#5 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/geom/geom.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/geom/geom_aes.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/geom/geom_apple.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/geom/geom_bsd.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/geom/geom_ccd.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/geom/geom_dev.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/geom/geom_disk.c#4 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/geom/geom_fox.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/geom/geom_gpt.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/geom/geom_mbr.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/geom/geom_pc98.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/geom/geom_subr.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/geom/geom_sunlabel.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/geom/geom_vol_ffs.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/geom/label/g_label.c#4 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/geom/mirror/g_mirror.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/geom/nop/g_nop.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/geom/stripe/g_stripe.c#5 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/geom/vinum/geom_vinum.c#4 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/geom/vinum/geom_vinum_drive.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/geom/vinum/geom_vinum_plex.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/geom/vinum/geom_vinum_volume.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/i386/i386/pmap.c#7 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/ia64/ia64/gdb_machdep.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/ia64/ia64/locore.S#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/ia64/ia64/machdep.c#5 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/ia64/ia64/syscall.S#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/ia64/ia64/trap.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/ia64/include/gdb_machdep.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/isa/psm.c#4 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/imgact_elf.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_descrip.c#4 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_kse.c#15 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_sig.c#14 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/subr_taskqueue.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/subr_trap.c#7 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/sys_process.c#16 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/modules/geom/Makefile#4 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/modules/md/Makefile#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/net/if_var.h#4 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/pci/if_vr.c#7 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/sys/kse.h#10 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/sys/mdioctl.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/sys/param.h#6 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/sys/ptrace.h#10 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/sys/taskqueue.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/ufs/ffs/ffs_softdep.c#4 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/vm/swap_pager.c#4 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/vm/vm_fault.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/vm/vm_init.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/tools/tools/nanobsd/Makefile#2 integrate
.. //depot/projects/davidxu_ksedbg/src/tools/tools/nanobsd/make.conf#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/calendar/calendars/calendar.freebsd#3 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/file/Makefile#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/file/config.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/last/last.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/quota/quota.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/tar/COPYING#1 branch
.. //depot/projects/davidxu_ksedbg/src/usr.bin/tar/Makefile#4 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/tar/Makefile.am#1 branch
.. //depot/projects/davidxu_ksedbg/src/usr.bin/tar/bsdtar.1#6 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/tar/bsdtar.c#9 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/tar/bsdtar.h#6 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/tar/bsdtar_platform.h#4 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/tar/configure.ac.in#1 branch
.. //depot/projects/davidxu_ksedbg/src/usr.bin/tar/read.c#6 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/tar/util.c#4 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/tar/write.c#4 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/truss/i386-fbsd.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/truss/syscalls.c#5 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/IPXrouted/af.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/accton/accton.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/arp/arp.4#3 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/arp/arp.8#3 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/arp/arp.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/chown/chgrp.1#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/chown/chown.8#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/chown/chown.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/chroot/chroot.8#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/chroot/chroot.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/config/config.8#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/config/config.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/config/lang.l#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/config/main.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/config/mkheaders.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/config/mkmakefile.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/config/mkoptions.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/edquota/edquota.8#3 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/edquota/edquota.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/edquota/pathnames.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/inetd/inetd.8#3 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/inetd/inetd.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/inetd/inetd.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/inetd/pathnames.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/kbdcontrol/kbdcontrol.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/kernbb/kernbb.8#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/kgmon/kgmon.8#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/kgmon/kgmon.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/mount_portalfs/activate.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/mount_portalfs/conf.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/mount_portalfs/mount_portalfs.8#3 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/mount_portalfs/mount_portalfs.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/mount_portalfs/pathnames.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/mount_portalfs/portald.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/mount_portalfs/pt_conf.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/mount_portalfs/pt_exec.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/mount_portalfs/pt_file.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/mount_portalfs/pt_tcp.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/mount_portalfs/pt_tcplisten.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/mountd/exports.5#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/mountd/mountd.8#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/mountd/mountd.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/mountd/netgroup.5#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/mountd/pathnames.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/mtree/mtree.8#4 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/mtree/specspec.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/named.reload/named.reload.8#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/named.restart/named.restart.8#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/ndp/ndp.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/nfsd/nfsd.8#3 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/nfsd/nfsd.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/nologin/nologin.5#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/nologin/nologin.8#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/pciconf/pciconf.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/pstat/pstat.8#4 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/pstat/pstat.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/pwd_mkdb/pwd_mkdb.8#4 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/pwd_mkdb/pwd_mkdb.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/quotaon/quotaon.8#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/quotaon/quotaon.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/rarpd/rarpd.8#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/rarpd/rarpd.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/repquota/repquota.8#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/repquota/repquota.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/rmt/rmt.8#3 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/rmt/rmt.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/rtadvd/advcap.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/rwhod/rwhod.8#3 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/rwhod/rwhod.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/sicontrol/sicontrol.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/sliplogin/pathnames.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/sliplogin/sliplogin.8#4 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/sliplogin/sliplogin.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/slstat/slstat.8#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/sysinstall/label.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/syslogd/pathnames.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/syslogd/syslog.conf.5#4 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/syslogd/syslogd.8#3 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/syslogd/syslogd.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/trpt/trpt.8#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/trpt/trpt.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/vipw/vipw.8#3 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/vipw/vipw.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/ypbind/ypbind.8#3 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/yppush/yppush.8#3 integrate
Differences ...
==== //depot/projects/davidxu_ksedbg/src/UPDATING#7 (text+ko) ====
@@ -21,6 +21,11 @@
developers choose to disable these features on build machines
to maximize performance.
+20040807:
+ The size of 'struct ifnet' has changed due to the addition of the
+ if_carp placeholder. All kernel modules implementing network
+ interfaces must be recompiled as a result.
+
20040802:
making /dev/(null|zero) into a module proved to be too unpopular,
so this bit has been revoked from the previous (20040801) entry.
@@ -41,6 +46,11 @@
breakages with non-default CFLAGS where optimization level is set
to -O2 or higher.
+ With the upgrade of the system compiler, the kernel has been upgraded
+ to match the new system compiler. This makes it impossible to build
+ a new kernel with the old compiler. Upgrade your system via
+ make buildworld and make kernel (see below) to fix this problem.
+
20040727:
The size of 'struct ifnet' has changed due to the addition of
the IFF_NEEDSGIANT flag (and what it implies). All kernel
@@ -1749,4 +1759,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.336 2004/08/03 19:29:48 markm Exp $
+$FreeBSD: src/UPDATING,v 1.338 2004/08/07 09:41:30 mlaier Exp $
==== //depot/projects/davidxu_ksedbg/src/contrib/file/.cvsignore#2 (text+ko) ====
@@ -1,12 +1,1 @@
-Makefile
-config.cache
-config.h
-config.log
-config.status
-stamp-h
-file
-file.1
-magic.4
-magic
-magic.mgc
-magic.mime.mgc
+autom4te.cache
==== //depot/projects/davidxu_ksedbg/src/contrib/file/LEGAL.NOTICE#2 (text+ko) ====
@@ -1,7 +1,7 @@
-$Id: LEGAL.NOTICE,v 1.11 1999/01/14 16:30:12 christos Exp $
+$Id: LEGAL.NOTICE,v 1.13 2003/03/23 22:23:30 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-1999 Christos Zoulas.
+maintained 1994-2003 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/davidxu_ksedbg/src/contrib/file/Localstuff#2 (text+ko) ====
@@ -2,6 +2,6 @@
#------------------------------------------------------------------------------
# Localstuff: file(1) magic for locally observed files
#
-# $Id: Localstuff,v 1.3 1995/01/21 21:09:00 christos Exp $
+# $Id: 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/davidxu_ksedbg/src/contrib/file/MAINT#2 (text+ko) ====
@@ -1,4 +1,4 @@
-$Id: MAINT,v 1.4 2000/04/11 02:43:51 christos Exp $
+$Id: MAINT,v 1.5 2003/03/23 04:36:37 christos Exp $
Maintenance notes:
==== //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/adventure#2 (text+ko) ====
@@ -16,7 +16,7 @@
# 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 verion 4 that are not recognized.)
+# 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
==== //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/amigaos#2 (text+ko) ====
@@ -3,9 +3,8 @@
#
# From ignatios at cs.uni-bonn.de (Ignatios Souvatzis)
-# Some formats are still missing: AmigaOS special IFF's, e.g.: FORM....CTLG
-# (the others should be separate, anyway)
#
+0 belong 0x000003fa AmigaOS shared library
0 belong 0x000003f3 AmigaOS loadseg()ble executable/binary
0 belong 0x000003e7 AmigaOS object/library data
#
@@ -33,7 +32,25 @@
0 string ARP. The Holy Noise Module sound file
0 string BeEp\0 JamCracker Module sound file
0 string COSO\0 Hippel-COSO Module sound file
-26 string V.3 Brian Postma's Soundmon Module sound file v3
-26 string BPSM Brian Postma's Soundmon Module sound file v3
-26 string V.2 Brian Postma's Soundmon Module sound file v2
+# Too simple (short, pure ASCII, deep), MPi
+#26 string V.3 Brian Postma's Soundmon Module sound file v3
+#26 string BPSM Brian Postma's Soundmon Module sound file v3
+#26 string V.2 Brian Postma's Soundmon Module sound file v2
+
+# The following are from: "Stefan A. Haubenthal" <polluks at web.de>
+0 beshort 0x0f00 AmigaOS bitmap font
+0 beshort 0x0f03 AmigaOS outline font
+0 belong 0x80001001 AmigaOS outline tag
+0 string ##\ version catalog translation
+# Amiga disk types
+#
+0 string RDSK Rigid Disk Block
+>160 string x on %.24s
+0 string DOS\0 Amiga DOS disk
+0 string DOS\1 Amiga FFS disk
+0 string DOS\2 Amiga Inter DOS disk
+0 string DOS\3 Amiga Inter FFS disk
+0 string DOS\4 Amiga Fastdir DOS disk
+0 string DOS\5 Amiga Fastdir FFS disk
+0 string KICK Kickstart disk
==== //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/animation#2 (text+ko) ====
@@ -118,6 +118,12 @@
#>3 byte&0x03 1 \b, Emphasis 5
#>3 byte&0x03 3 \b, Emphasis c
+#From: Johan Gade <jgade at diku.dk>
+
+# MPEG-4 Advanced Audio Coding (AAC) file (perhaps also MPEG-2 ACC?)
+16 string M4A MPEG-4 Advanced Audio Coding file (AAC)
+
+
# FLI animation format
4 leshort 0xAF11 FLI file
>6 leshort x - %d frames,
@@ -157,10 +163,19 @@
# \003. Most of them start with non-null values at hex offset 0x34 or so.
#0 string \3\0\0\0\0\0\0\0\0\0\0\0 DL version 3
-# SGI and Apple formats
+# SGI formats
0 string MOVI Silicon Graphics movie file
+
+# Apple Quicktime: Scan for all known top-level QT atom markers
4 string moov Apple QuickTime movie file (moov)
4 string mdat Apple QuickTime movie file (mdat)
+4 string ftyp Apple QuickTime movie file (ftyp)
+4 string free Apple QuickTime movie file (free)
+4 string junk Apple QuickTime movie file (junk)
+4 string pnot Apple QuickTime movie file (pnot)
+4 string skip Apple QuickTime movie file (skip)
+4 string wide Apple QuickTime movie file (wide)
+4 string pict Apple QuickTime movie file (pict)
# iso 13818 transport stream
#
@@ -194,3 +209,32 @@
0 string \x8aMNG MNG video data,
>4 belong !0x0d0a1a0a CORRUPTED,
>4 belong 0x0d0a1a0a
+>>16 belong x %ld x
+>>20 belong x %ld
+
+# JNG Video Format, <URL:http://www.libpng.org/pub/mng/spec/>
+0 string \x8bJNG JNG video data,
+>4 belong !0x0d0a1a0a CORRUPTED,
+>4 belong 0x0d0a1a0a
+>>16 belong x %ld x
+>>20 belong x %ld
+
+# Vivo video (Wolfram Kleff)
+3 string \x0D\x0AVersion:Vivo Vivo video data
+
+# VRML (Virtual Reality Modelling Language)
+0 string/b #VRML\ V1.0\ ascii VRML 1 file
+0 string/b #VRML\ V2.0\ utf8 ISO/IEC 14772 VRML 97 file
+
+#---------------------------------------------------------------------------
+# HVQM4: compressed movie format designed by Hudson for Nintendo GameCube
+# From Mark Sheppard <msheppard at climax.co.uk>, 2002-10-03
+#
+0 string HVQM4 %s
+>6 string >\0 v%s
+>0 byte x GameCube movie,
+>0x34 ubeshort x %d x
+>0x36 ubeshort x %d,
+>0x26 ubeshort x %dµs,
+>0x42 ubeshort 0 no audio
+>0x42 ubeshort >0 %dHz audio
==== //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/apple#2 (text+ko) ====
@@ -28,6 +28,13 @@
>12 belong &0x02000000 UseFasterCompression,
>16 belong x version %d
+0 string package4 Newton package,
+>8 byte 8 NOS 1.x,
+>8 byte 9 NOS 2.x,
+>12 belong &0x80000000 AutoRemove,
+>12 belong &0x40000000 CopyProtect,
+>12 belong &0x10000000 NoCompression,
+
# The following entries for the Apple II are for files that have
# been transferred as raw binary data from an Apple, without having
# been encapsulated by any of the above archivers.
@@ -120,3 +127,24 @@
# Beagle Bros. Apple Mechanic fonts
0 belong&0xFF00FFFF 0x6400D000 Apple Mechanic font
+
+# Apple Universal Disk Image Format (UDIF) - dmg files.
+# From Johan Gade.
+# These entries are disabled for now until we fix the following issues.
+#
+# Note there might be some problems with the "VAX COFF executable"
+# entry. Note this entry should be placed before the mac filesystem section,
+# particularly the "Apple Partition data" entry.
+#
+# The intended meaning of these tests is, that the file is only of the
+# specified type if both of the lines are correct - i.e. if the first
+# line matches and the second doesn't then it is not of that type.
+#
+#0 long 0x7801730d
+#>4 long 0x62626060 UDIF read-only zlib-compressed image (UDZO)
+#
+# Note that this entry is recognized correctly by the "Apple Partition
+# data" entry - however since this entry is more specific - this
+# information seems to be more useful.
+#0 long 0x45520200
+#>0x410 string disk\ image UDIF read/write image (UDRW)
==== //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/archive#2 (text+ko) ====
@@ -32,8 +32,10 @@
0 string !<arch>\ndebian
>8 string debian-split part of multipart Debian package
>8 string debian-binary Debian binary package
->68 string >\n (format %s)
->136 ledate x created: %s
+>68 string >\0 (format %s)
+>81 string bz2 \b, uses bzip2 compression
+>84 string gz \b, uses gzip compression
+#>136 ledate x created: %s
# other archives
0 long 0177555 very old archive
@@ -187,7 +189,12 @@
>20 byte x - header level %d
# RAR archiver (Greg Roelofs, newt at uchicago.edu)
-0 string Rar! RAR archive data
+0 string Rar! RAR archive data,
+>44 byte x v%0x,
+>35 byte 0 os: MS-DOS
+>35 byte 1 os: OS/2
+>35 byte 2 os: Win32
+>35 byte 3 os: Unix
# SQUISH archiver (Greg Roelofs, newt at uchicago.edu)
0 string SQSH squished archive data (Acorn RISCOS)
@@ -239,9 +246,11 @@
# Microsoft cabinets
# by David Necas (Yeti) <yeti at physics.muni.cz>
-0 string MSCF\0\0\0\0 Microsoft cabinet file data,
->25 byte x v%d
->24 byte x \b.%d
+#0 string MSCF\0\0\0\0 Microsoft cabinet file data,
+#>25 byte x v%d
+#>24 byte x \b.%d
+# MPi: All CABs have version 1.3, so this is pointless.
+# Better magic in debian-additions.
# GTKtalog catalogs
# by David Necas (Yeti) <yeti at physics.muni.cz>
@@ -256,3 +265,56 @@
0 string PAR\0 PARity archive data
>48 leshort =0 - Index file
>48 leshort >0 - file number %d
+
+# Felix von Leitner <felix-file at fefe.de>
+0 string d8:announce BitTorrent file
+
+# Atari MSA archive - Teemu Hukkanen <tjhukkan at iki.fi>
+0 beshort 0x0e0f Atari MSA archive data
+>2 beshort x \b, %d sectors per track
+>4 beshort 0 \b, 1 sided
+>4 beshort 1 \b, 2 sided
+>6 beshort x \b, starting track: %d
+>8 beshort x \b, ending track: %d
+
+# Alternate ZIP string (amc at arwen.cs.berkeley.edu)
+0 string PK00PK\003\004 Zip archive data
+
+# ACE archive (from http://www.wotsit.org/download.asp?f=ace)
+# by Stefan `Sec` Zehl <sec at 42.org>
+7 string **ACE** ACE compressed archive
+>15 byte >0 version %d
+>16 byte =0x00 \b, from MS-DOS
+>16 byte =0x01 \b, from OS/2
+>16 byte =0x02 \b, from Win/32
+>16 byte =0x03 \b, from Unix
+>16 byte =0x04 \b, from MacOS
+>16 byte =0x05 \b, from WinNT
+>16 byte =0x06 \b, from Primos
+>16 byte =0x07 \b, from AppleGS
+>16 byte =0x08 \b, from Atari
+>16 byte =0x09 \b, from Vax/VMS
+>16 byte =0x0A \b, from Amiga
+>16 byte =0x0B \b, from Next
+>14 byte x \b, version %d to extract
+>5 leshort &0x0080 \b, multiple volumes,
+>>17 byte x \b (part %d),
+>5 leshort &0x0002 \b, contains comment
+>5 leshort &0x0200 \b, sfx
+>5 leshort &0x0400 \b, small dictionary
+>5 leshort &0x0800 \b, multi-volume
+>5 leshort &0x1000 \b, contains AV-String
+>>30 string\x16*UNREGISTERED\x20VERSION* (unregistered)
+>5 leshort &0x2000 \b, with recovery record
+>5 leshort &0x4000 \b, locked
+>5 leshort &0x8000 \b, solid
+# Date in MS-DOS format (whatever that is)
+#>18 lelong x Created on
+
+# sfArk : compression program for Soundfonts (sf2) by Dirk Jagdmann
+# <doj at cubic.org>
+0x1A string sfArk sfArk compressed Soundfont
+>0x15 string 2
+>>0x1 string >\0 Version %s
+>>0x2A string >\0 : %s
+
==== //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/audio#2 (text+ko) ====
@@ -8,18 +8,28 @@
# Sun/NeXT audio data
0 string .snd Sun/NeXT audio data:
->12 belong 1 8-bit ISDN u-law,
+>12 belong 1 8-bit ISDN mu-law,
>12 belong 2 8-bit linear PCM [REF-PCM],
>12 belong 3 16-bit linear PCM,
>12 belong 4 24-bit linear PCM,
>12 belong 5 32-bit linear PCM,
>12 belong 6 32-bit IEEE floating point,
>12 belong 7 64-bit IEEE floating point,
->12 belong 23 8-bit ISDN u-law compressed (CCITT G.721 ADPCM voice data encoding),
->12 belong 24 compressed (8-bit G.722 ADPCM)
->12 belong 25 compressed (3-bit G.723 ADPCM),
->12 belong 26 compressed (5-bit G.723 ADPCM),
->12 belong 27 8-bit A-law,
+>12 belong 8 Fragmented sample data,
+>12 belong 10 DSP program,
+>12 belong 11 8-bit fixed point,
+>12 belong 12 16-bit fixed point,
+>12 belong 13 24-bit fixed point,
+>12 belong 14 32-bit fixed point,
+>12 belong 18 16-bit linear with emphasis,
+>12 belong 19 16-bit linear compressed,
+>12 belong 20 16-bit linear with emphasis and compression,
+>12 belong 21 Music kit DSP commands,
+>12 belong 23 8-bit ISDN mu-law compressed (CCITT G.721 ADPCM voice data encoding),
+>12 belong 24 compressed (8-bit CCITT G.722 ADPCM)
+>12 belong 25 compressed (3-bit CCITT G.723.3 ADPCM),
+>12 belong 26 compressed (5-bit CCITT G.723.5 ADPCM),
+>12 belong 27 8-bit A-law (CCITT G.711),
>20 belong 1 mono,
>20 belong 2 stereo,
>20 belong 4 quad,
@@ -28,14 +38,28 @@
# DEC systems (e.g. DECstation 5000) use a variant of the Sun/NeXT format
# that uses little-endian encoding and has a different magic number
0 lelong 0x0064732E DEC audio data:
->12 lelong 1 8-bit ISDN u-law,
+>12 lelong 1 8-bit ISDN mu-law,
>12 lelong 2 8-bit linear PCM [REF-PCM],
>12 lelong 3 16-bit linear PCM,
>12 lelong 4 24-bit linear PCM,
>12 lelong 5 32-bit linear PCM,
>12 lelong 6 32-bit IEEE floating point,
>12 lelong 7 64-bit IEEE floating point,
->12 lelong 23 8-bit ISDN u-law compressed (CCITT G.721 ADPCM voice data encoding),
+>12 belong 8 Fragmented sample data,
+>12 belong 10 DSP program,
+>12 belong 11 8-bit fixed point,
+>12 belong 12 16-bit fixed point,
+>12 belong 13 24-bit fixed point,
+>12 belong 14 32-bit fixed point,
+>12 belong 18 16-bit linear with emphasis,
+>12 belong 19 16-bit linear compressed,
+>12 belong 20 16-bit linear with emphasis and compression,
+>12 belong 21 Music kit DSP commands,
+>12 lelong 23 8-bit ISDN mu-law compressed (CCITT G.721 ADPCM voice data encoding),
+>12 belong 24 compressed (8-bit CCITT G.722 ADPCM)
+>12 belong 25 compressed (3-bit CCITT G.723.3 ADPCM),
+>12 belong 26 compressed (5-bit CCITT G.723.5 ADPCM),
+>12 belong 27 8-bit A-law (CCITT G.711),
>20 lelong 1 mono,
>20 lelong 2 stereo,
>20 lelong 4 quad,
@@ -43,8 +67,12 @@
# Creative Labs AUDIO stuff
0 string MThd Standard MIDI data
->9 byte >0 (format %d)
->11 byte >1 using %d tracks
+>8 beshort x (format %d)
+>10 beshort x using %d track
+>10 beshort >1 \bs
+>12 beshort&0x7fff x at 1/%d
+>12 beshort&0x8000 >0 SMPTE
+
0 string CTMF Creative Music (CMF) data
0 string SBI SoundBlaster instrument data
0 string Creative\ Voice\ File Creative Labs voice data
@@ -72,12 +100,18 @@
# MTM/669/FAR/S3M/ULT/XM format checking [Aaron Eppert, aeppert at dialin.ind.net]
# Oct 31, 1995
-0 string MTM MultiTracker Module sound file
+# fixed by <doj at cubic.org> 2003-06-24
+# Too short...
+#0 string MTM MultiTracker Module sound file
#0 string if Composer 669 Module sound data
-0 string FAR Module sound data
+#0 string JN Composer 669 Module sound data (extended format)
0 string MAS_U ULT(imate) Module sound data
+
+#0 string FAR Module sound data
+#>4 string >\15 Title: "%s"
+
0x2c string SCRM ScreamTracker III Module sound data
-0 string Extended Module Extended Module sound data
+>0 string >\0 Title: "%s"
# Gravis UltraSound patches
# From <ache at nagual.ru>
@@ -88,37 +122,68 @@
#
# Taken from loader code from mikmod version 2.14
# by Steve McIntyre (stevem at chiark.greenend.org.uk)
-0 string JN extended 669 module data
+# <doj at cubic.org> added title printing on 2003-06-24
0 string MAS_UTrack_V00
>14 string >/0 ultratracker V1.%.1s module sound data
+
0 string UN05 MikMod UNI format module sound data
+
0 string Extended\ Module: Fasttracker II module sound data
-21 string !SCREAM! Screamtracker 2 module sound data
+>17 string >\0 Title: "%s"
+
+21 string/c !SCREAM! Screamtracker 2 module sound data
+21 string BMOD2STM Screamtracker 2 module sound data
1080 string M.K. 4-channel Protracker module sound data
+>0 string >\0 Title: "%s"
1080 string M!K! 4-channel Protracker module sound data
+>0 string >\0 Title: "%s"
1080 string FLT4 4-channel Startracker module sound data
+>0 string >\0 Title: "%s"
+1080 string FLT8 8-channel Startracker module sound data
+>0 string >\0 Title: "%s"
1080 string 4CHN 4-channel Fasttracker module sound data
+>0 string >\0 Title: "%s"
1080 string 6CHN 6-channel Fasttracker module sound data
+>0 string >\0 Title: "%s"
1080 string 8CHN 8-channel Fasttracker module sound data
-1080 string CD81 8-channel Oktalyzer module sound data
+>0 string >\0 Title: "%s"
+1080 string CD81 8-channel Octalyser module sound data
+>0 string >\0 Title: "%s"
1080 string OKTA 8-channel Oktalyzer module sound data
+>0 string >\0 Title: "%s"
# Not good enough.
#1082 string CH
#>1080 string >/0 %.2s-channel Fasttracker "oktalyzer" module sound data
1080 string 16CN 16-channel Taketracker module sound data
+>0 string >\0 Title: "%s"
1080 string 32CN 32-channel Taketracker module sound data
+>0 string >\0 Title: "%s"
# TOC sound files -Trevor Johnson <trevor at jpj.net>
#
0 string TOC TOC sound file
# sidfiles <pooka at iki.fi>
+# added name,author,(c) and new RSID type by <doj at cubic.org> 2003-06-24
0 string SIDPLAY\ INFOFILE Sidplay info file
+
0 string PSID PlaySID v2.2+ (AMIGA) sidtune
>4 beshort >0 w/ header v%d,
>14 beshort =1 single song,
>14 beshort >1 %d songs,
>16 beshort >0 default song: %d
+>0x16 string >\0 name: "%s"
+>0x36 string >\0 author: "%s"
+>0x56 string >\0 copyright: "%s"
+
+0 string RSID RSID sidtune PlaySID compatible
+>4 beshort >0 w/ header v%d,
+>14 beshort =1 single song,
+>14 beshort >1 %d songs,
+>16 beshort >0 default song: %d
+>0x16 string >\0 name: "%s"
+>0x36 string >\0 author: "%s"
+>0x56 string >\0 copyright: "%s"
# IRCAM <mpruett at sgi.com>
# VAX and MIPS files are little-endian; Sun and NeXT are big-endian
@@ -133,8 +198,25 @@
# Sample Vision <mpruett at sgi.com>
0 string SOUND\ SAMPLE\ DATA\ Sample Vision file
-# Audio Visual Research <mpruett at sgi.com>
-0 string 2BIT Audio Visual Research file
+# Audio Visual Research <tonigonenstein at users.sourceforge.net>
+0 string 2BIT Audio Visual Research file,
+>12 beshort =0 mono,
+>12 beshort =-1 stereo,
+>14 beshort x %d bits
+>16 beshort =0 unsigned,
+>16 beshort =-1 signed,
+>22 belong&0x00ffffff x %d Hz,
+>18 beshort =0 no loop,
+>18 beshort =-1 loop,
+>21 ubyte <=127 note %d,
+>22 byte =0 replay 5.485 KHz
+>22 byte =1 replay 8.084 KHz
+>22 byte =2 replay 10.971 Khz
+>22 byte =3 replay 16.168 Khz
+>22 byte =4 replay 21.942 KHz
+>22 byte =5 replay 32.336 KHz
+>22 byte =6 replay 43.885 KHz
+>22 byte =7 replay 47.261 KHz
# SGI SoundTrack <mpruett at sgi.com>
0 string _SGI_SoundTrack SGI SoundTrack project file
@@ -230,6 +312,29 @@
0 string FTMN FaceTheMusic module
>16 string >\0d \b, "%s"
+# From: <doj at cubic.org> 2003-06-24
+0 string AMShdr\32 Velvet Studio AMS Module v2.2
+0 string Extreme Extreme Tracker AMS Module v1.3
+0 string DDMF Xtracker DMF Module
+>4 byte x v%i
+>0xD string >\0 Title: "%s"
+>0x2B string >\0 Composer: "%s"
+0 string DSM\32 Dynamic Studio Module DSM
+0 string SONG DigiTrekker DTM Module
+0 string DMDL DigiTrakker MDL Module
+0 string PSM\32 Protracker Studio PSM Module
+44 string PTMF Poly Tracker PTM Module
+>0 string >\32 Title: "%s"
+0 string MT20 MadTracker 2.0 Module MT2
+0 string RAD\40by\40REALiTY!! RAD Adlib Tracker Module RAD
+0 string RTMM RTM Module
+0x426 string MaDoKaN96 XMS Adlib Module
+>0 string >\0 Composer: "%s"
+0 string AMF AMF Module
+>4 string >\0 Title: "%s"
+0 string MODINFO1 Open Cubic Player Module Inforation MDZ
+0 string Extended\40Instrument: Fast Tracker II Instrument
+
# From: Takeshi Hamasaki <hma at syd.odn.ne.jp>
# NOA Nancy Codec file
0 string \210NOA\015\012\032 NOA Nancy Codec Movie file
@@ -240,7 +345,56 @@
>20 string Ver01.00 Ver. 1.00
>>32 byte x , %d tracks
-# FLAC audio stream <URL:http://flac.sourceforge.net/>
-# From: Dan Fandrich <dan at coneharvesters.com>
-0 string fLaC FLAC audio stream data
+# Free lossless audio codec <http://flac.sourceforge.net>
+# From: Przemyslaw Augustyniak <silvathraec at rpg.pl>
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list