svn commit: r247330 - in user/attilio/vmc-playground: . bin/test cddl/contrib/opensolaris/cmd/zinject cddl/contrib/opensolaris/lib/libzpool/common cddl/contrib/opensolaris/lib/libzpool/common/sys c...
Attilio Rao
attilio at FreeBSD.org
Tue Feb 26 18:18:42 UTC 2013
Author: attilio
Date: Tue Feb 26 18:18:39 2013
New Revision: 247330
URL: http://svnweb.freebsd.org/changeset/base/247330
Log:
Merge from vmcontention
Added:
user/attilio/vmc-playground/contrib/expat/FREEBSD-Xlist
- copied unchanged from r247328, user/attilio/vmcontention/contrib/expat/FREEBSD-Xlist
user/attilio/vmc-playground/sys/dev/cxgbe/firmware/t4fw-1.8.4.0.bin.uu
- copied unchanged from r247328, user/attilio/vmcontention/sys/dev/cxgbe/firmware/t4fw-1.8.4.0.bin.uu
user/attilio/vmc-playground/usr.sbin/bsdconfig/include/media.hlp
- copied unchanged from r247328, user/attilio/vmcontention/usr.sbin/bsdconfig/include/media.hlp
user/attilio/vmc-playground/usr.sbin/bsdconfig/include/network_device.hlp
- copied unchanged from r247328, user/attilio/vmcontention/usr.sbin/bsdconfig/include/network_device.hlp
user/attilio/vmc-playground/usr.sbin/bsdconfig/include/options.hlp
- copied unchanged from r247328, user/attilio/vmcontention/usr.sbin/bsdconfig/include/options.hlp
user/attilio/vmc-playground/usr.sbin/bsdconfig/include/tcp.hlp
- copied unchanged from r247328, user/attilio/vmcontention/usr.sbin/bsdconfig/include/tcp.hlp
user/attilio/vmc-playground/usr.sbin/bsdconfig/share/device.subr
- copied unchanged from r247328, user/attilio/vmcontention/usr.sbin/bsdconfig/share/device.subr
user/attilio/vmc-playground/usr.sbin/bsdconfig/share/media/
- copied from r247328, user/attilio/vmcontention/usr.sbin/bsdconfig/share/media/
user/attilio/vmc-playground/usr.sbin/bsdconfig/share/struct.subr
- copied unchanged from r247328, user/attilio/vmcontention/usr.sbin/bsdconfig/share/struct.subr
Deleted:
user/attilio/vmc-playground/contrib/expat/FREEBSD-upgrade
user/attilio/vmc-playground/contrib/expat/configure
user/attilio/vmc-playground/contrib/expat/doc/valid-xhtml10.png
user/attilio/vmc-playground/contrib/expat/lib/winconfig.h
user/attilio/vmc-playground/contrib/expat/tests/benchmark/benchmark.dsp
user/attilio/vmc-playground/contrib/expat/tests/benchmark/benchmark.dsw
user/attilio/vmc-playground/sys/dev/cxgbe/firmware/t4fw-1.6.2.0.bin.uu
user/attilio/vmc-playground/usr.sbin/bsdconfig/networking/include/tcp.hlp
Modified:
user/attilio/vmc-playground/Makefile.inc1
user/attilio/vmc-playground/bin/test/test.1
user/attilio/vmc-playground/bin/test/test.c
user/attilio/vmc-playground/cddl/contrib/opensolaris/cmd/zinject/translate.c
user/attilio/vmc-playground/cddl/contrib/opensolaris/cmd/zinject/zinject.c
user/attilio/vmc-playground/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
user/attilio/vmc-playground/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
user/attilio/vmc-playground/contrib/expat/Changes (contents, props changed)
user/attilio/vmc-playground/contrib/expat/MANIFEST (contents, props changed)
user/attilio/vmc-playground/contrib/expat/Makefile.in (contents, props changed)
user/attilio/vmc-playground/contrib/expat/README (contents, props changed)
user/attilio/vmc-playground/contrib/expat/configure.in (contents, props changed)
user/attilio/vmc-playground/contrib/expat/doc/reference.html (contents, props changed)
user/attilio/vmc-playground/contrib/expat/doc/xmlwf.sgml (contents, props changed)
user/attilio/vmc-playground/contrib/expat/expat_config.h.in (contents, props changed)
user/attilio/vmc-playground/contrib/expat/lib/expat.h (contents, props changed)
user/attilio/vmc-playground/contrib/expat/lib/xmlparse.c (contents, props changed)
user/attilio/vmc-playground/contrib/expat/lib/xmlrole.c (contents, props changed)
user/attilio/vmc-playground/contrib/expat/lib/xmltok.c (contents, props changed)
user/attilio/vmc-playground/contrib/expat/lib/xmltok_impl.c (contents, props changed)
user/attilio/vmc-playground/contrib/expat/tests/README.txt (contents, props changed)
user/attilio/vmc-playground/contrib/expat/tests/minicheck.h
user/attilio/vmc-playground/contrib/expat/tests/runtests.c (contents, props changed)
user/attilio/vmc-playground/contrib/expat/tests/xmltest.sh (contents, props changed)
user/attilio/vmc-playground/contrib/expat/xmlwf/readfilemap.c (contents, props changed)
user/attilio/vmc-playground/contrib/expat/xmlwf/xmlwf.c (contents, props changed)
user/attilio/vmc-playground/etc/rc.d/rtadvd
user/attilio/vmc-playground/lib/libc/gen/opendir.c
user/attilio/vmc-playground/lib/libexpat/expat_config.h
user/attilio/vmc-playground/lib/libexpat/libbsdxml.3
user/attilio/vmc-playground/sbin/fsck_ffs/fsutil.c
user/attilio/vmc-playground/sbin/fsdb/fsdbutil.c
user/attilio/vmc-playground/sbin/hastctl/hastctl.c
user/attilio/vmc-playground/sbin/hastd/control.c
user/attilio/vmc-playground/sbin/hastd/hast.h
user/attilio/vmc-playground/sbin/hastd/primary.c
user/attilio/vmc-playground/sbin/hastd/secondary.c
user/attilio/vmc-playground/sys/arm/at91/at91_machdep.c
user/attilio/vmc-playground/sys/arm/conf/RPI-B
user/attilio/vmc-playground/sys/arm/include/vmparam.h
user/attilio/vmc-playground/sys/arm/sa11x0/assabet_machdep.c
user/attilio/vmc-playground/sys/arm/ti/ti_gpio.c
user/attilio/vmc-playground/sys/boot/common/bootstrap.h
user/attilio/vmc-playground/sys/boot/common/load_elf.c
user/attilio/vmc-playground/sys/boot/common/module.c
user/attilio/vmc-playground/sys/boot/fdt/fdt_loader_cmd.c
user/attilio/vmc-playground/sys/cddl/compat/opensolaris/sys/time.h
user/attilio/vmc-playground/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
user/attilio/vmc-playground/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
user/attilio/vmc-playground/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h
user/attilio/vmc-playground/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_boot.h
user/attilio/vmc-playground/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h
user/attilio/vmc-playground/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h
user/attilio/vmc-playground/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h
user/attilio/vmc-playground/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h
user/attilio/vmc-playground/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h
user/attilio/vmc-playground/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h
user/attilio/vmc-playground/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
user/attilio/vmc-playground/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c
user/attilio/vmc-playground/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c
user/attilio/vmc-playground/sys/conf/files
user/attilio/vmc-playground/sys/dev/ath/ath_hal/ah.h
user/attilio/vmc-playground/sys/dev/ath/ath_hal/ar5210/ar5210.h
user/attilio/vmc-playground/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c
user/attilio/vmc-playground/sys/dev/ath/ath_hal/ar5210/ar5210_misc.c
user/attilio/vmc-playground/sys/dev/ath/ath_hal/ar5211/ar5211.h
user/attilio/vmc-playground/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c
user/attilio/vmc-playground/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c
user/attilio/vmc-playground/sys/dev/ath/ath_hal/ar5212/ar5212.h
user/attilio/vmc-playground/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c
user/attilio/vmc-playground/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c
user/attilio/vmc-playground/sys/dev/ath/ath_hal/ar5416/ar5416.h
user/attilio/vmc-playground/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
user/attilio/vmc-playground/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c
user/attilio/vmc-playground/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c
user/attilio/vmc-playground/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c
user/attilio/vmc-playground/sys/dev/ath/ath_rate/sample/sample.c
user/attilio/vmc-playground/sys/dev/ath/if_ath.c
user/attilio/vmc-playground/sys/dev/ath/if_ath_tx_ht.c
user/attilio/vmc-playground/sys/dev/ath/if_athvar.h
user/attilio/vmc-playground/sys/dev/ciss/ciss.c
user/attilio/vmc-playground/sys/dev/cxgbe/adapter.h
user/attilio/vmc-playground/sys/dev/cxgbe/common/common.h
user/attilio/vmc-playground/sys/dev/cxgbe/common/t4_hw.c
user/attilio/vmc-playground/sys/dev/cxgbe/common/t4_msg.h
user/attilio/vmc-playground/sys/dev/cxgbe/firmware/t4fw_interface.h
user/attilio/vmc-playground/sys/dev/cxgbe/t4_main.c
user/attilio/vmc-playground/sys/dev/cxgbe/t4_sge.c
user/attilio/vmc-playground/sys/dev/hwpmc/hwpmc_soft.c
user/attilio/vmc-playground/sys/dev/isp/isp.c
user/attilio/vmc-playground/sys/dev/mxge/if_mxge.c
user/attilio/vmc-playground/sys/dev/sym/sym_hipd.c
user/attilio/vmc-playground/sys/dev/usb/usb_pf.c
user/attilio/vmc-playground/sys/dev/usb/usbdevs
user/attilio/vmc-playground/sys/fs/fuse/fuse_io.c
user/attilio/vmc-playground/sys/ia64/ia64/pmap.c
user/attilio/vmc-playground/sys/ia64/include/vmparam.h
user/attilio/vmc-playground/sys/kern/kern_descrip.c
user/attilio/vmc-playground/sys/kern/sys_process.c
user/attilio/vmc-playground/sys/mips/adm5120/adm5120_machdep.c
user/attilio/vmc-playground/sys/mips/alchemy/alchemy_machdep.c
user/attilio/vmc-playground/sys/mips/beri/beri_machdep.c
user/attilio/vmc-playground/sys/mips/cavium/octeon_machdep.c
user/attilio/vmc-playground/sys/mips/gxemul/gxemul_machdep.c
user/attilio/vmc-playground/sys/mips/idt/idt_machdep.c
user/attilio/vmc-playground/sys/mips/malta/malta_machdep.c
user/attilio/vmc-playground/sys/mips/rt305x/rt305x_machdep.c
user/attilio/vmc-playground/sys/mips/sentry5/s5_machdep.c
user/attilio/vmc-playground/sys/mips/sibyte/sb_machdep.c
user/attilio/vmc-playground/sys/modules/cxgbe/firmware/Makefile
user/attilio/vmc-playground/sys/powerpc/aim/mmu_oea.c
user/attilio/vmc-playground/sys/powerpc/aim/mmu_oea64.c
user/attilio/vmc-playground/sys/powerpc/aim/moea64_native.c
user/attilio/vmc-playground/sys/powerpc/ps3/mmu_ps3.c
user/attilio/vmc-playground/sys/sparc64/sparc64/tsb.c
user/attilio/vmc-playground/sys/sys/time.h
user/attilio/vmc-playground/sys/vm/swap_pager.c
user/attilio/vmc-playground/sys/vm/vm_object.c
user/attilio/vmc-playground/sys/vm/vm_object.h
user/attilio/vmc-playground/sys/vm/vm_page.c
user/attilio/vmc-playground/sys/vm/vnode_pager.c
user/attilio/vmc-playground/tools/regression/bin/test/regress.sh
user/attilio/vmc-playground/usr.bin/systat/systat.1
user/attilio/vmc-playground/usr.bin/truss/main.c
user/attilio/vmc-playground/usr.bin/truss/syscalls.c
user/attilio/vmc-playground/usr.bin/truss/truss.h
user/attilio/vmc-playground/usr.sbin/bhyve/pci_emul.h
user/attilio/vmc-playground/usr.sbin/bsdconfig/include/Makefile
user/attilio/vmc-playground/usr.sbin/bsdconfig/include/messages.subr
user/attilio/vmc-playground/usr.sbin/bsdconfig/networking/devices
user/attilio/vmc-playground/usr.sbin/bsdconfig/networking/include/Makefile
user/attilio/vmc-playground/usr.sbin/bsdconfig/networking/share/common.subr
user/attilio/vmc-playground/usr.sbin/bsdconfig/networking/share/device.subr
user/attilio/vmc-playground/usr.sbin/bsdconfig/networking/share/hostname.subr
user/attilio/vmc-playground/usr.sbin/bsdconfig/networking/share/ipaddr.subr
user/attilio/vmc-playground/usr.sbin/bsdconfig/networking/share/netmask.subr
user/attilio/vmc-playground/usr.sbin/bsdconfig/networking/share/resolv.subr
user/attilio/vmc-playground/usr.sbin/bsdconfig/networking/share/routing.subr
user/attilio/vmc-playground/usr.sbin/bsdconfig/share/Makefile
user/attilio/vmc-playground/usr.sbin/bsdconfig/share/common.subr
user/attilio/vmc-playground/usr.sbin/bsdconfig/share/script.subr
user/attilio/vmc-playground/usr.sbin/bsdconfig/share/strings.subr
user/attilio/vmc-playground/usr.sbin/bsdconfig/share/variable.subr
user/attilio/vmc-playground/usr.sbin/bsdconfig/startup/rcvar
user/attilio/vmc-playground/usr.sbin/rtadvd/rtadvd.8
user/attilio/vmc-playground/usr.sbin/rtadvd/rtadvd.c
Directory Properties:
user/attilio/vmc-playground/ (props changed)
user/attilio/vmc-playground/cddl/contrib/opensolaris/ (props changed)
user/attilio/vmc-playground/contrib/expat/ (props changed)
user/attilio/vmc-playground/contrib/expat/COPYING (props changed)
user/attilio/vmc-playground/contrib/expat/doc/style.css (props changed)
user/attilio/vmc-playground/contrib/expat/doc/xmlwf.1 (props changed)
user/attilio/vmc-playground/contrib/expat/examples/elements.c (props changed)
user/attilio/vmc-playground/contrib/expat/examples/outline.c (props changed)
user/attilio/vmc-playground/contrib/expat/lib/ascii.h (props changed)
user/attilio/vmc-playground/contrib/expat/lib/asciitab.h (props changed)
user/attilio/vmc-playground/contrib/expat/lib/iasciitab.h (props changed)
user/attilio/vmc-playground/contrib/expat/lib/internal.h (props changed)
user/attilio/vmc-playground/contrib/expat/lib/latin1tab.h (props changed)
user/attilio/vmc-playground/contrib/expat/lib/nametab.h (props changed)
user/attilio/vmc-playground/contrib/expat/lib/utf8tab.h (props changed)
user/attilio/vmc-playground/contrib/expat/lib/xmlrole.h (props changed)
user/attilio/vmc-playground/contrib/expat/lib/xmltok.h (props changed)
user/attilio/vmc-playground/contrib/expat/lib/xmltok_impl.h (props changed)
user/attilio/vmc-playground/contrib/expat/lib/xmltok_ns.c (props changed)
user/attilio/vmc-playground/contrib/expat/tests/chardata.c (props changed)
user/attilio/vmc-playground/contrib/expat/tests/chardata.h (props changed)
user/attilio/vmc-playground/contrib/expat/xmlwf/codepage.c (props changed)
user/attilio/vmc-playground/contrib/expat/xmlwf/codepage.h (props changed)
user/attilio/vmc-playground/contrib/expat/xmlwf/ct.c (props changed)
user/attilio/vmc-playground/contrib/expat/xmlwf/filemap.h (props changed)
user/attilio/vmc-playground/contrib/expat/xmlwf/unixfilemap.c (props changed)
user/attilio/vmc-playground/contrib/expat/xmlwf/win32filemap.c (props changed)
user/attilio/vmc-playground/contrib/expat/xmlwf/xmlfile.c (props changed)
user/attilio/vmc-playground/contrib/expat/xmlwf/xmlfile.h (props changed)
user/attilio/vmc-playground/contrib/expat/xmlwf/xmlmime.c (props changed)
user/attilio/vmc-playground/contrib/expat/xmlwf/xmlmime.h (props changed)
user/attilio/vmc-playground/contrib/expat/xmlwf/xmltchar.h (props changed)
user/attilio/vmc-playground/contrib/expat/xmlwf/xmlurl.h (props changed)
user/attilio/vmc-playground/contrib/expat/xmlwf/xmlwin32url.cxx (props changed)
user/attilio/vmc-playground/lib/libc/ (props changed)
user/attilio/vmc-playground/sbin/ (props changed)
user/attilio/vmc-playground/sys/ (props changed)
user/attilio/vmc-playground/sys/boot/ (props changed)
user/attilio/vmc-playground/sys/cddl/contrib/opensolaris/ (props changed)
user/attilio/vmc-playground/sys/conf/ (props changed)
user/attilio/vmc-playground/usr.sbin/bhyve/ (props changed)
user/attilio/vmc-playground/usr.sbin/rtadvd/ (props changed)
Modified: user/attilio/vmc-playground/Makefile.inc1
==============================================================================
--- user/attilio/vmc-playground/Makefile.inc1 Tue Feb 26 18:13:42 2013 (r247329)
+++ user/attilio/vmc-playground/Makefile.inc1 Tue Feb 26 18:18:39 2013 (r247330)
@@ -1132,7 +1132,8 @@ _lex= usr.bin/lex
.endif
.if ${BOOTSTRAPPING} < 1000013
-_yacc= usr.bin/yacc
+_yacc= lib/liby \
+ usr.bin/yacc
.endif
.if ${BOOTSTRAPPING} < 1000026
Modified: user/attilio/vmc-playground/bin/test/test.1
==============================================================================
--- user/attilio/vmc-playground/bin/test/test.1 Tue Feb 26 18:13:42 2013 (r247329)
+++ user/attilio/vmc-playground/bin/test/test.1 Tue Feb 26 18:18:39 2013 (r247330)
@@ -169,15 +169,65 @@ True if
.Ar file
exists and is a socket.
.It Ar file1 Fl nt Ar file2
-True if
+True if both
+.Ar file1
+and
+.Ar file2
+exist and
+.Ar file1
+is newer than
+.Ar file2 .
+.It Ar file1 Fl nt Ns Ar X Ns Ar Y Ar file2
+True if both
+.Ar file1
+and
+.Ar file2
+exist and
.Ar file1
-exists and is newer than
+has a more recent last access time
+.Pq Ar X Ns = Ns Cm a ,
+inode creation time
+.Pq Ar X Ns = Ns Cm b ,
+change time
+.Pq Ar X Ns = Ns Cm c ,
+or modification time
+.Pq Ar X Ns = Ns Cm m
+than the last access time
+.Pq Ar Y Ns = Ns Cm a ,
+inode creation time
+.Pq Ar Y Ns = Ns Cm b ,
+change time
+.Pq Ar Y Ns = Ns Cm c ,
+or modification time
+.Pq Ar Y Ns = Ns Cm m
+of
.Ar file2 .
+Note that
+.Ic -ntmm
+is equivalent to
+.Ic -nt .
.It Ar file1 Fl ot Ar file2
-True if
+True if both
+.Ar file1
+and
+.Ar file2
+exist and
.Ar file1
-exists and is older than
+is older than
.Ar file2 .
+Note that
+.Ar file1
+.Ic -ot
+.Ar file2
+is equivalent to
+.Ar file2
+.Ic -nt
+.Ar file1
+.It Ar file1 Fl ot Ns Ar X Ns Ar Y Ar file2
+Equivalent to
+.Ar file2
+.Ic -nt Ns Ar Y Ns Ar X
+.Ar file1 .
.It Ar file1 Fl ef Ar file2
True if
.Ar file1
Modified: user/attilio/vmc-playground/bin/test/test.c
==============================================================================
--- user/attilio/vmc-playground/bin/test/test.c Tue Feb 26 18:13:42 2013 (r247329)
+++ user/attilio/vmc-playground/bin/test/test.c Tue Feb 26 18:18:39 2013 (r247330)
@@ -63,7 +63,7 @@ error(const char *msg, ...)
"-u"|"-g"|"-k"|"-s"|"-t"|"-z"|"-n"|"-o"|"-O"|"-G"|"-L"|"-S";
binary-operator ::= "="|"!="|"-eq"|"-ne"|"-ge"|"-gt"|"-le"|"-lt"|
- "-nt"|"-ot"|"-ef";
+ "-nt"|"-nt[abcm][abcm]"|"-ot"|"-ot[abcm][abcm])"|"-ef";
operand ::= <any legal UNIX file name>
*/
@@ -85,8 +85,38 @@ enum token {
FILSUID,
FILSGID,
FILSTCK,
- FILNT,
- FILOT,
+ FILNTAA,
+ FILNTAB,
+ FILNTAC,
+ FILNTAM,
+ FILNTBA,
+ FILNTBB,
+ FILNTBC,
+ FILNTBM,
+ FILNTCA,
+ FILNTCB,
+ FILNTCC,
+ FILNTCM,
+ FILNTMA,
+ FILNTMB,
+ FILNTMC,
+ FILNTMM,
+ FILOTAA,
+ FILOTAB,
+ FILOTAC,
+ FILOTAM,
+ FILOTBA,
+ FILOTBB,
+ FILOTBC,
+ FILOTBM,
+ FILOTCA,
+ FILOTCB,
+ FILOTCC,
+ FILOTCM,
+ FILOTMA,
+ FILOTMB,
+ FILOTMC,
+ FILOTMM,
FILEQ,
FILUID,
FILGID,
@@ -118,9 +148,16 @@ enum token_types {
PAREN
};
+enum time_types {
+ ATIME,
+ BTIME,
+ CTIME,
+ MTIME
+};
+
static struct t_op {
- char op_text[4];
- short op_num, op_type;
+ char op_text[6];
+ char op_num, op_type;
} const ops [] = {
{"-r", FILRD, UNOP},
{"-w", FILWR, UNOP},
@@ -154,8 +191,40 @@ static struct t_op {
{"-gt", INTGT, BINOP},
{"-le", INTLE, BINOP},
{"-lt", INTLT, BINOP},
- {"-nt", FILNT, BINOP},
- {"-ot", FILOT, BINOP},
+ {"-nt", FILNTMM, BINOP},
+ {"-ntaa", FILNTAA, BINOP},
+ {"-ntab", FILNTAB, BINOP},
+ {"-ntac", FILNTAC, BINOP},
+ {"-ntam", FILNTAM, BINOP},
+ {"-ntba", FILNTBA, BINOP},
+ {"-ntbb", FILNTBB, BINOP},
+ {"-ntbc", FILNTBC, BINOP},
+ {"-ntbm", FILNTBM, BINOP},
+ {"-ntca", FILNTCA, BINOP},
+ {"-ntcb", FILNTCB, BINOP},
+ {"-ntcc", FILNTCC, BINOP},
+ {"-ntcm", FILNTCM, BINOP},
+ {"-ntma", FILNTMA, BINOP},
+ {"-ntmb", FILNTMB, BINOP},
+ {"-ntmc", FILNTMC, BINOP},
+ {"-ntmm", FILNTMM, BINOP},
+ {"-ot", FILOTMM, BINOP},
+ {"-otaa", FILOTAA, BINOP},
+ {"-otab", FILOTBB, BINOP},
+ {"-otac", FILOTAC, BINOP},
+ {"-otam", FILOTAM, BINOP},
+ {"-otba", FILOTBA, BINOP},
+ {"-otbb", FILOTBB, BINOP},
+ {"-otbc", FILOTBC, BINOP},
+ {"-otbm", FILOTBM, BINOP},
+ {"-otca", FILOTCA, BINOP},
+ {"-otcb", FILOTCB, BINOP},
+ {"-otcc", FILOTCC, BINOP},
+ {"-otcm", FILOTCM, BINOP},
+ {"-otma", FILOTMA, BINOP},
+ {"-otmb", FILOTMB, BINOP},
+ {"-otmc", FILOTMC, BINOP},
+ {"-otmm", FILOTMM, BINOP},
{"-ef", FILEQ, BINOP},
{"!", UNOT, BUNOP},
{"-a", BAND, BBINOP},
@@ -180,10 +249,10 @@ static int intcmp(const char *, const ch
static int isunopoperand(void);
static int islparenoperand(void);
static int isrparenoperand(void);
-static int newerf(const char *, const char *);
+static int newerf(const char *, const char *, enum time_types,
+ enum time_types);
static int nexpr(enum token);
static int oexpr(enum token);
-static int olderf(const char *, const char *);
static int primary(enum token);
static void syntax(const char *, const char *);
static enum token t_lex(char *);
@@ -353,10 +422,70 @@ binop(void)
return intcmp(opnd1, opnd2) <= 0;
case INTLT:
return intcmp(opnd1, opnd2) < 0;
- case FILNT:
- return newerf (opnd1, opnd2);
- case FILOT:
- return olderf (opnd1, opnd2);
+ case FILNTAA:
+ return newerf(opnd1, opnd2, ATIME, ATIME);
+ case FILNTAB:
+ return newerf(opnd1, opnd2, ATIME, BTIME);
+ case FILNTAC:
+ return newerf(opnd1, opnd2, ATIME, CTIME);
+ case FILNTAM:
+ return newerf(opnd1, opnd2, ATIME, MTIME);
+ case FILNTBA:
+ return newerf(opnd1, opnd2, BTIME, ATIME);
+ case FILNTBB:
+ return newerf(opnd1, opnd2, BTIME, BTIME);
+ case FILNTBC:
+ return newerf(opnd1, opnd2, BTIME, CTIME);
+ case FILNTBM:
+ return newerf(opnd1, opnd2, BTIME, MTIME);
+ case FILNTCA:
+ return newerf(opnd1, opnd2, CTIME, ATIME);
+ case FILNTCB:
+ return newerf(opnd1, opnd2, CTIME, BTIME);
+ case FILNTCC:
+ return newerf(opnd1, opnd2, CTIME, CTIME);
+ case FILNTCM:
+ return newerf(opnd1, opnd2, CTIME, MTIME);
+ case FILNTMA:
+ return newerf(opnd1, opnd2, MTIME, ATIME);
+ case FILNTMB:
+ return newerf(opnd1, opnd2, MTIME, BTIME);
+ case FILNTMC:
+ return newerf(opnd1, opnd2, MTIME, CTIME);
+ case FILNTMM:
+ return newerf(opnd1, opnd2, MTIME, MTIME);
+ case FILOTAA:
+ return newerf(opnd2, opnd1, ATIME, ATIME);
+ case FILOTAB:
+ return newerf(opnd2, opnd1, BTIME, ATIME);
+ case FILOTAC:
+ return newerf(opnd2, opnd1, CTIME, ATIME);
+ case FILOTAM:
+ return newerf(opnd2, opnd1, MTIME, ATIME);
+ case FILOTBA:
+ return newerf(opnd2, opnd1, ATIME, BTIME);
+ case FILOTBB:
+ return newerf(opnd2, opnd1, BTIME, BTIME);
+ case FILOTBC:
+ return newerf(opnd2, opnd1, CTIME, BTIME);
+ case FILOTBM:
+ return newerf(opnd2, opnd1, MTIME, BTIME);
+ case FILOTCA:
+ return newerf(opnd2, opnd1, ATIME, CTIME);
+ case FILOTCB:
+ return newerf(opnd2, opnd1, BTIME, CTIME);
+ case FILOTCC:
+ return newerf(opnd2, opnd1, CTIME, CTIME);
+ case FILOTCM:
+ return newerf(opnd2, opnd1, MTIME, CTIME);
+ case FILOTMA:
+ return newerf(opnd2, opnd1, ATIME, MTIME);
+ case FILOTMB:
+ return newerf(opnd2, opnd1, BTIME, MTIME);
+ case FILOTMC:
+ return newerf(opnd2, opnd1, CTIME, MTIME);
+ case FILOTMM:
+ return newerf(opnd2, opnd1, MTIME, MTIME);
case FILEQ:
return equalf (opnd1, opnd2);
default:
@@ -570,25 +699,34 @@ intcmp (const char *s1, const char *s2)
}
static int
-newerf (const char *f1, const char *f2)
+newerf (const char *f1, const char *f2, enum time_types t1, enum time_types t2)
{
struct stat b1, b2;
+ struct timespec *ts1, *ts2;
if (stat(f1, &b1) != 0 || stat(f2, &b2) != 0)
return 0;
- if (b1.st_mtim.tv_sec > b2.st_mtim.tv_sec)
+ switch (t1) {
+ case ATIME: ts1 = &b1.st_atim; break;
+ case BTIME: ts1 = &b1.st_birthtim; break;
+ case CTIME: ts1 = &b1.st_ctim; break;
+ default: ts1 = &b1.st_mtim; break;
+ }
+
+ switch (t2) {
+ case ATIME: ts2 = &b2.st_atim; break;
+ case BTIME: ts2 = &b2.st_birthtim; break;
+ case CTIME: ts2 = &b2.st_ctim; break;
+ default: ts2 = &b2.st_mtim; break;
+ }
+
+ if (ts1->tv_sec > ts2->tv_sec)
return 1;
- if (b1.st_mtim.tv_sec < b2.st_mtim.tv_sec)
+ if (ts1->tv_sec < ts2->tv_sec)
return 0;
- return (b1.st_mtim.tv_nsec > b2.st_mtim.tv_nsec);
-}
-
-static int
-olderf (const char *f1, const char *f2)
-{
- return (newerf(f2, f1));
+ return (ts1->tv_nsec > ts2->tv_nsec);
}
static int
Modified: user/attilio/vmc-playground/cddl/contrib/opensolaris/cmd/zinject/translate.c
==============================================================================
--- user/attilio/vmc-playground/cddl/contrib/opensolaris/cmd/zinject/translate.c Tue Feb 26 18:13:42 2013 (r247329)
+++ user/attilio/vmc-playground/cddl/contrib/opensolaris/cmd/zinject/translate.c Tue Feb 26 18:18:39 2013 (r247330)
@@ -20,6 +20,7 @@
*/
/*
* Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012 by Delphix. All rights reserved.
*/
#include <libzfs.h>
@@ -455,6 +456,20 @@ translate_device(const char *pool, const
&record->zi_guid) == 0);
}
+ /*
+ * Device faults can take on three different forms:
+ * 1). delayed or hanging I/O
+ * 2). zfs label faults
+ * 3). generic disk faults
+ */
+ if (record->zi_timer != 0) {
+ record->zi_cmd = ZINJECT_DELAY_IO;
+ } else if (label_type != TYPE_INVAL) {
+ record->zi_cmd = ZINJECT_LABEL_FAULT;
+ } else {
+ record->zi_cmd = ZINJECT_DEVICE_FAULT;
+ }
+
switch (label_type) {
case TYPE_LABEL_UBERBLOCK:
record->zi_start = offsetof(vdev_label_t, vl_uberblock[0]);
Modified: user/attilio/vmc-playground/cddl/contrib/opensolaris/cmd/zinject/zinject.c
==============================================================================
--- user/attilio/vmc-playground/cddl/contrib/opensolaris/cmd/zinject/zinject.c Tue Feb 26 18:13:42 2013 (r247329)
+++ user/attilio/vmc-playground/cddl/contrib/opensolaris/cmd/zinject/zinject.c Tue Feb 26 18:18:39 2013 (r247330)
@@ -20,6 +20,7 @@
*/
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012 by Delphix. All rights reserved.
*/
/*
@@ -603,7 +604,7 @@ main(int argc, char **argv)
}
while ((c = getopt(argc, argv,
- ":aA:b:d:f:Fg:qhIc:t:T:l:mr:s:e:uL:p:")) != -1) {
+ ":aA:b:d:D:f:Fg:qhIc:t:T:l:mr:s:e:uL:p:")) != -1) {
switch (c) {
case 'a':
flags |= ZINJECT_FLUSH_ARC;
@@ -629,6 +630,15 @@ main(int argc, char **argv)
case 'd':
device = optarg;
break;
+ case 'D':
+ record.zi_timer = strtoull(optarg, &end, 10);
+ if (errno != 0 || *end != '\0') {
+ (void) fprintf(stderr, "invalid i/o delay "
+ "value: '%s'\n", optarg);
+ usage();
+ return (1);
+ }
+ break;
case 'e':
if (strcasecmp(optarg, "io") == 0) {
error = EIO;
@@ -693,6 +703,7 @@ main(int argc, char **argv)
case 'p':
(void) strlcpy(record.zi_func, optarg,
sizeof (record.zi_func));
+ record.zi_cmd = ZINJECT_PANIC;
break;
case 'q':
quiet = 1;
@@ -766,13 +777,15 @@ main(int argc, char **argv)
argc -= optind;
argv += optind;
+ if (record.zi_duration != 0)
+ record.zi_cmd = ZINJECT_IGNORED_WRITES;
+
if (cancel != NULL) {
/*
* '-c' is invalid with any other options.
*/
if (raw != NULL || range != NULL || type != TYPE_INVAL ||
- level != 0 || record.zi_func[0] != '\0' ||
- record.zi_duration != 0) {
+ level != 0 || record.zi_cmd != ZINJECT_UNINITIALIZED) {
(void) fprintf(stderr, "cancel (-c) incompatible with "
"any other options\n");
usage();
@@ -804,8 +817,7 @@ main(int argc, char **argv)
* for doing injection, so handle it separately here.
*/
if (raw != NULL || range != NULL || type != TYPE_INVAL ||
- level != 0 || record.zi_func[0] != '\0' ||
- record.zi_duration != 0) {
+ level != 0 || record.zi_cmd != ZINJECT_UNINITIALIZED) {
(void) fprintf(stderr, "device (-d) incompatible with "
"data error injection\n");
usage();
@@ -839,7 +851,7 @@ main(int argc, char **argv)
} else if (raw != NULL) {
if (range != NULL || type != TYPE_INVAL || level != 0 ||
- record.zi_func[0] != '\0' || record.zi_duration != 0) {
+ record.zi_cmd != ZINJECT_UNINITIALIZED) {
(void) fprintf(stderr, "raw (-b) format with "
"any other options\n");
usage();
@@ -862,13 +874,14 @@ main(int argc, char **argv)
return (1);
}
+ record.zi_cmd = ZINJECT_DATA_FAULT;
if (translate_raw(raw, &record) != 0)
return (1);
if (!error)
error = EIO;
- } else if (record.zi_func[0] != '\0') {
+ } else if (record.zi_cmd == ZINJECT_PANIC) {
if (raw != NULL || range != NULL || type != TYPE_INVAL ||
- level != 0 || device != NULL || record.zi_duration != 0) {
+ level != 0 || device != NULL) {
(void) fprintf(stderr, "panic (-p) incompatible with "
"other options\n");
usage();
@@ -886,7 +899,7 @@ main(int argc, char **argv)
if (argv[1] != NULL)
record.zi_type = atoi(argv[1]);
dataset[0] = '\0';
- } else if (record.zi_duration != 0) {
+ } else if (record.zi_cmd == ZINJECT_IGNORED_WRITES) {
if (nowrites == 0) {
(void) fprintf(stderr, "-s or -g meaningless "
"without -I (ignore writes)\n");
@@ -940,6 +953,7 @@ main(int argc, char **argv)
return (1);
}
+ record.zi_cmd = ZINJECT_DATA_FAULT;
if (translate_record(type, argv[0], range, level, &record, pool,
dataset) != 0)
return (1);
Modified: user/attilio/vmc-playground/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
==============================================================================
--- user/attilio/vmc-playground/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c Tue Feb 26 18:13:42 2013 (r247329)
+++ user/attilio/vmc-playground/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c Tue Feb 26 18:18:39 2013 (r247330)
@@ -45,6 +45,9 @@ int aok;
uint64_t physmem;
vnode_t *rootdir = (vnode_t *)0xabcd1234;
char hw_serial[HW_HOSTID_LEN];
+#ifdef illumos
+kmutex_t cpu_lock;
+#endif
struct utsname utsname = {
"userland", "libzpool", "1", "1", "na"
@@ -842,6 +845,28 @@ ddi_strtoull(const char *str, char **npt
return (0);
}
+#ifdef illumos
+/* ARGSUSED */
+cyclic_id_t
+cyclic_add(cyc_handler_t *hdlr, cyc_time_t *when)
+{
+ return (1);
+}
+
+/* ARGSUSED */
+void
+cyclic_remove(cyclic_id_t id)
+{
+}
+
+/* ARGSUSED */
+int
+cyclic_reprogram(cyclic_id_t id, hrtime_t expiration)
+{
+ return (1);
+}
+#endif
+
/*
* =========================================================================
* kernel emulation setup & teardown
@@ -875,6 +900,10 @@ kernel_init(int mode)
system_taskq_init();
+#ifdef illumos
+ mutex_init(&cpu_lock, NULL, MUTEX_DEFAULT, NULL);
+#endif
+
spa_init(mode);
}
Modified: user/attilio/vmc-playground/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
==============================================================================
--- user/attilio/vmc-playground/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h Tue Feb 26 18:13:42 2013 (r247329)
+++ user/attilio/vmc-playground/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h Tue Feb 26 18:18:39 2013 (r247330)
@@ -457,6 +457,9 @@ extern vnode_t *rootdir;
extern void delay(clock_t ticks);
+#define SEC_TO_TICK(sec) ((sec) * hz)
+#define NSEC_TO_TICK(usec) ((usec) / (NANOSEC / hz))
+
#define gethrestime_sec() time(NULL)
#define gethrestime(t) \
do {\
@@ -624,6 +627,36 @@ typedef uint32_t idmap_rid_t;
#define ERESTART (-1)
#endif
+#ifdef illumos
+/*
+ * Cyclic information
+ */
+extern kmutex_t cpu_lock;
+
+typedef uintptr_t cyclic_id_t;
+typedef uint16_t cyc_level_t;
+typedef void (*cyc_func_t)(void *);
+
+#define CY_LOW_LEVEL 0
+#define CY_INFINITY INT64_MAX
+#define CYCLIC_NONE ((cyclic_id_t)0)
+
+typedef struct cyc_time {
+ hrtime_t cyt_when;
+ hrtime_t cyt_interval;
+} cyc_time_t;
+
+typedef struct cyc_handler {
+ cyc_func_t cyh_func;
+ void *cyh_arg;
+ cyc_level_t cyh_level;
+} cyc_handler_t;
+
+extern cyclic_id_t cyclic_add(cyc_handler_t *, cyc_time_t *);
+extern void cyclic_remove(cyclic_id_t);
+extern int cyclic_reprogram(cyclic_id_t, hrtime_t);
+#endif /* illumos */
+
#ifdef __cplusplus
}
#endif
Modified: user/attilio/vmc-playground/contrib/expat/Changes
==============================================================================
--- user/attilio/vmc-playground/contrib/expat/Changes Tue Feb 26 18:13:42 2013 (r247329)
+++ user/attilio/vmc-playground/contrib/expat/Changes Tue Feb 26 18:18:39 2013 (r247330)
@@ -1,5 +1,41 @@
+Release 2.1.0 Sat March 24 2012
+ - Bug Fixes:
+ #1742315: Harmful XML_ParserCreateNS suggestion.
+ #2895533: CVE-2012-1147 - Resource leak in readfilemap.c.
+ #1785430: Expat build fails on linux-amd64 with gcc version>=4.1 -O3.
+ #1983953, 2517952, 2517962, 2649838:
+ Build modifications using autoreconf instead of buildconf.sh.
+ #2815947, #2884086: OBJEXT and EXEEXT support while building.
+ #1990430: CVE-2009-3720 - Parser crash with special UTF-8 sequences.
+ #2517938: xmlwf should return non-zero exit status if not well-formed.
+ #2517946: Wrong statement about XMLDecl in xmlwf.1 and xmlwf.sgml.
+ #2855609: Dangling positionPtr after error.
+ #2894085: CVE-2009-3560 - Buffer over-read and crash in big2_toUtf8().
+ #2958794: CVE-2012-1148 - Memory leak in poolGrow.
+ #2990652: CMake support.
+ #3010819: UNEXPECTED_STATE with a trailing "%" in entity value.
+ #3206497: Unitialized memory returned from XML_Parse.
+ #3287849: make check fails on mingw-w64.
+ #3496608: CVE-2012-0876 - Hash DOS attack.
+ - Patches:
+ #1749198: pkg-config support.
+ #3010222: Fix for bug #3010819.
+ #3312568: CMake support.
+ #3446384: Report byte offsets for attr names and values.
+ - New Features / API changes:
+ Added new API member XML_SetHashSalt() that allows setting an intial
+ value (salt) for hash calculations. This is part of the fix for
+ bug #3496608 to randomize hash parameters.
+ When compiled with XML_ATTR_INFO defined, adds new API member
+ XML_GetAttributeInfo() that allows retrieving the byte
+ offsets for attribute names and values (patch #3446384).
+ Added CMake build system.
+ See bug #2990652 and patch #3312568.
+ Added run-benchmark target to Makefile.in - relies on testdata module
+ present in the same relative location as in the repository.
+
Release 2.0.1 Tue June 5 2007
- - Fixed bugs #1515266, 1515600: The character data handler's calling
+ - Fixed bugs #1515266, #1515600: The character data handler's calling
of XML_StopParser() was not handled properly; if the parser was
stopped and the handler set to NULL, the parser would segfault.
- Fixed bug #1690883: Expat failed on EBCDIC systems as it assumed
@@ -8,7 +44,7 @@ Release 2.0.1 Tue June 5 2007
- Fixed xmlwf bug #1513566: "out of memory" error on file size zero.
- Fixed outline.c bug #1543233: missing a final XML_ParserFree() call.
- Fixes and improvements for Windows platform:
- bugs #1409451, #1476160, 1548182, 1602769, 1717322.
+ bugs #1409451, #1476160, #1548182, #1602769, #1717322.
- Build fixes for various platforms:
HP-UX, Tru64, Solaris 9: patch #1437840, bug #1196180.
All Unix: #1554618 (refreshed config.sub/config.guess).
@@ -30,8 +66,8 @@ Release 2.0.0 Wed Jan 11 2006
byte indexes and line/column numbers.
- Updated to use libtool 1.5.22 (the most recent).
- Added support for AmigaOS.
- - Some mostly minor bug fixes. SF issues include: 1006708,
- 1021776, 1023646, 1114960, 1156398, 1221160, 1271642.
+ - Some mostly minor bug fixes. SF issues include: #1006708,
+ #1021776, #1023646, #1114960, #1156398, #1221160, #1271642.
Release 1.95.8 Fri Jul 23 2004
- Major new feature: suspend/resume. Handlers can now request
@@ -40,8 +76,8 @@ Release 1.95.8 Fri Jul 23 2004
documentation for more details.
- Some mostly minor bug fixes, but compilation should no
longer generate warnings on most platforms. SF issues
- include: 827319, 840173, 846309, 888329, 896188, 923913,
- 928113, 961698, 985192.
+ include: #827319, #840173, #846309, #888329, #896188, #923913,
+ #928113, #961698, #985192.
Release 1.95.7 Mon Oct 20 2003
- Fixed enum XML_Status issue (reported on SourceForge many
@@ -54,19 +90,19 @@ Release 1.95.7 Mon Oct 20 2003
- Improved ability to build without the configure-generated
expat_config.h header. This is useful for applications
which embed Expat rather than linking in the library.
- - Fixed a variety of bugs: see SF issues 458907, 609603,
- 676844, 679754, 692878, 692964, 695401, 699323, 699487,
- 820946.
+ - Fixed a variety of bugs: see SF issues #458907, #609603,
+ #676844, #679754, #692878, #692964, #695401, #699323, #699487,
+ #820946.
- Improved hash table lookups.
- Added more regression tests and improved documentation.
Release 1.95.6 Tue Jan 28 2003
- Added XML_FreeContentModel().
- Added XML_MemMalloc(), XML_MemRealloc(), XML_MemFree().
- - Fixed a variety of bugs: see SF issues 615606, 616863,
- 618199, 653180, 673791.
+ - Fixed a variety of bugs: see SF issues #615606, #616863,
+ #618199, #653180, #673791.
- Enhanced the regression test suite.
- - Man page improvements: includes SF issue 632146.
+ - Man page improvements: includes SF issue #632146.
Release 1.95.5 Fri Sep 6 2002
- Added XML_UseForeignDTD() for improved SAX2 support.
@@ -84,9 +120,9 @@ Release 1.95.5 Fri Sep 6 2002
- Reduced line-length for all source code and headers to be
no longer than 80 characters, to help with AS/400 support.
- Reduced memory copying during parsing (SF patch #600964).
- - Fixed a variety of bugs: see SF issues 580793, 434664,
- 483514, 580503, 581069, 584041, 584183, 584832, 585537,
- 596555, 596678, 598352, 598944, 599715, 600479, 600971.
+ - Fixed a variety of bugs: see SF issues #580793, #434664,
+ #483514, #580503, #581069, #584041, #584183, #584832, #585537,
+ #596555, #596678, #598352, #598944, #599715, #600479, #600971.
Release 1.95.4 Fri Jul 12 2002
- Added support for VMS, contributed by Craig Berry. See
@@ -95,14 +131,14 @@ Release 1.95.4 Fri Jul 12 2002
contributed by Thomas Wegner and Daryle Walker.
- Added Borland C++ Builder 5 / BCC 5.5 support, contributed
by Patrick McConnell (SF patch #538032).
- - Fixed a variety of bugs: see SF issues 441449, 563184,
- 564342, 566334, 566901, 569461, 570263, 575168, 579196.
+ - Fixed a variety of bugs: see SF issues #441449, #563184,
+ #564342, #566334, #566901, #569461, #570263, #575168, #579196.
- Made skippedEntityHandler conform to SAX2 (see source comment)
- Re-implemented WFC: Entity Declared from XML 1.0 spec and
added a new error "entity declared in parameter entity":
- see SF bug report 569461 and SF patch 578161
+ see SF bug report #569461 and SF patch #578161
- Re-implemented section 5.1 from XML 1.0 spec:
- see SF bug report 570263 and SF patch 578161
+ see SF bug report #570263 and SF patch #578161
Release 1.95.3 Mon Jun 3 2002
- Added a project to the MSVC workspace to create a wchar_t
@@ -114,9 +150,9 @@ Release 1.95.3 Mon Jun 3 2002
- Made the XML_UNICODE builds usable (thanks, Karl!).
- Allow xmlwf to read from standard input.
- Install a man page for xmlwf on Unix systems.
- - Fixed many bugs; see SF bug reports 231864, 461380, 464837,
- 466885, 469226, 477667, 484419, 487840, 494749, 496505,
- 547350. Other bugs which we can't test as easily may also
+ - Fixed many bugs; see SF bug reports #231864, #461380, #464837,
+ #466885, #469226, #477667, #484419, #487840, #494749, #496505,
+ #547350. Other bugs which we can't test as easily may also
have been fixed, especially in the area of build support.
Release 1.95.2 Fri Jul 27 2001
Copied: user/attilio/vmc-playground/contrib/expat/FREEBSD-Xlist (from r247328, user/attilio/vmcontention/contrib/expat/FREEBSD-Xlist)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/attilio/vmc-playground/contrib/expat/FREEBSD-Xlist Tue Feb 26 18:18:39 2013 (r247330, copy of r247328, user/attilio/vmcontention/contrib/expat/FREEBSD-Xlist)
@@ -0,0 +1,19 @@
+# $FreeBSD$
+*.MPW
+*.cmake
+*.def
+*.dsp
+*.dsw
+*.m4
+*.pc.in
+*config.h
+CMake*
+Configure*
+amiga
+bcb5
+configure
+conftools
+doc/valid-xhtml10.png
+m4
+vms
+win32
Modified: user/attilio/vmc-playground/contrib/expat/MANIFEST
==============================================================================
--- user/attilio/vmc-playground/contrib/expat/MANIFEST Tue Feb 26 18:13:42 2013 (r247329)
+++ user/attilio/vmc-playground/contrib/expat/MANIFEST Tue Feb 26 18:18:39 2013 (r247330)
@@ -1,5 +1,8 @@
-amiga/stdlib.c
amiga/launch.c
+amiga/expat_68k.c
+amiga/expat_68k.h
+amiga/expat_68k_handler_stubs.c
+amiga/expat_base.h
amiga/expat_vectors.c
amiga/expat_lib.c
amiga/expat.xml
@@ -42,25 +45,35 @@ doc/style.css
doc/valid-xhtml10.png
doc/xmlwf.1
doc/xmlwf.sgml
+CMakeLists.txt
+CMake.README
COPYING
Changes
+ConfigureChecks.cmake
MANIFEST
Makefile.in
README
configure
configure.in
expat_config.h.in
+expat_config.h.cmake
+expat.pc.in
expat.dsw
+aclocal.m4
conftools/PrintPath
conftools/ac_c_bigendian_cross.m4
-conftools/config.guess
-conftools/config.sub
conftools/expat.m4
conftools/get-version.sh
+conftools/mkinstalldirs
+conftools/config.guess
+conftools/config.sub
conftools/install-sh
-conftools/libtool.m4
conftools/ltmain.sh
-conftools/mkinstalldirs
+m4/libtool.m4
+m4/ltversion.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/lt~obsolete.m4
examples/elements.c
examples/elements.dsp
examples/outline.c
Modified: user/attilio/vmc-playground/contrib/expat/Makefile.in
==============================================================================
--- user/attilio/vmc-playground/contrib/expat/Makefile.in Tue Feb 26 18:13:42 2013 (r247329)
+++ user/attilio/vmc-playground/contrib/expat/Makefile.in Tue Feb 26 18:18:39 2013 (r247330)
@@ -31,6 +31,7 @@ bindir = @bindir@
libdir = @libdir@
includedir = @includedir@
man1dir = @mandir@/man1
+pkgconfigdir = $(libdir)/pkgconfig
top_builddir = .
@@ -46,18 +47,18 @@ LIBRARY = libexpat.la
DESTDIR = $(INSTALL_ROOT)
-default: buildlib xmlwf/xmlwf
+default: buildlib xmlwf/xmlwf at EXEEXT@
-buildlib: $(LIBRARY)
+buildlib: $(LIBRARY) expat.pc
-all: $(LIBRARY) xmlwf/xmlwf examples/elements examples/outline
+all: $(LIBRARY) expat.pc xmlwf/xmlwf at EXEEXT@ examples/elements examples/outline
clean:
- cd lib && rm -f $(LIBRARY) *.o *.lo && rm -rf .libs _libs
- cd xmlwf && rm -f xmlwf *.o *.lo && rm -rf .libs _libs
- cd examples && rm -f elements outline *.o *.lo && rm -rf .libs _libs
- cd tests && rm -rf .libs runtests runtests.o runtestspp runtestspp.o
- cd tests && rm -f chardata.o minicheck.o
+ cd lib && rm -f $(LIBRARY) *. at OBJEXT@ *.lo && rm -rf .libs _libs
+ cd xmlwf && rm -f xmlwf *. at OBJEXT@ *.lo && rm -rf .libs _libs
+ cd examples && rm -f elements outline *. at OBJEXT@ *.lo && rm -rf .libs _libs
+ cd tests && rm -rf .libs runtests runtests. at OBJEXT@ runtestspp runtestspp. at OBJEXT@
+ cd tests && rm -f chardata. at OBJEXT@ minicheck. at OBJEXT@
rm -rf .libs libexpat.la
rm -f examples/core tests/core xmlwf/core
@@ -65,34 +66,37 @@ clobber: clean
distclean: clean
rm -f expat_config.h config.status config.log config.cache libtool
- rm -f Makefile
+ rm -f Makefile expat.pc
extraclean: distclean
rm -f expat_config.h.in configure
- rm -f conftools/ltconfig conftools/ltmain.sh conftools/libtool.m4
+ rm -f aclocal.m4 m4/*
+ rm -f conftools/ltmain.sh conftools/install-sh conftools/config.guess conftools/config.sub
check: tests/runtests tests/runtestspp
tests/runtests
tests/runtestspp
-install: xmlwf/xmlwf installlib
+install: xmlwf/xmlwf at EXEEXT@ installlib
$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir)
- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf $(DESTDIR)$(bindir)/xmlwf
+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf at EXEEXT@ $(DESTDIR)$(bindir)/xmlwf
$(INSTALL_DATA) $(MANFILE) $(DESTDIR)$(man1dir)
-installlib: $(LIBRARY) $(APIHEADER)
- $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
+installlib: $(LIBRARY) $(APIHEADER) expat.pc
+ $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) $(DESTDIR)$(pkgconfigdir)
$(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)/$(LIBRARY)
for FN in $(APIHEADER) ; do $(INSTALL_DATA) $$FN $(DESTDIR)$(includedir) ; done
+ $(INSTALL_DATA) expat.pc $(DESTDIR)$(pkgconfigdir)/expat.pc
uninstall: uninstalllib
- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(bindir)/xmlwf
+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(bindir)/xmlwf at EXEEXT@
rm -f $(DESTDIR)$(man1dir)/xmlwf.1
uninstalllib:
$(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$(LIBRARY)
rm -f $(DESTDIR)$(includedir)/expat.h
rm -f $(DESTDIR)$(includedir)/expat_external.h
+ rm -f $(DESTDIR)$(pkgconfigdir)/expat.pc
# for VPATH builds (invoked by configure)
mkdir-init:
@@ -125,6 +129,9 @@ LIB_OBJS = lib/xmlparse.lo lib/xmltok.lo
$(LIBRARY): $(LIB_OBJS)
$(LINK_LIB) $(LIB_OBJS)
+expat.pc: $(top_builddir)/config.status
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+
lib/xmlparse.lo: lib/xmlparse.c lib/expat.h lib/xmlrole.h lib/xmltok.h \
$(top_builddir)/expat_config.h lib/expat_external.h lib/internal.h
@@ -137,46 +144,53 @@ lib/xmltok.lo: lib/xmltok.c lib/xmltok_i
$(top_builddir)/expat_config.h lib/expat_external.h lib/internal.h
-XMLWF_OBJS = xmlwf/xmlwf.o xmlwf/xmlfile.o xmlwf/codepage.o xmlwf/@FILEMAP at .o
-xmlwf/xmlwf.o: xmlwf/xmlwf.c
-xmlwf/xmlfile.o: xmlwf/xmlfile.c
-xmlwf/codepage.o: xmlwf/codepage.c
-xmlwf/@FILEMAP at .o: xmlwf/@FILEMAP at .c
-xmlwf/xmlwf: $(XMLWF_OBJS) $(LIBRARY)
+XMLWF_OBJS = xmlwf/xmlwf. at OBJEXT@ xmlwf/xmlfile. at OBJEXT@ xmlwf/codepage. at OBJEXT@ xmlwf/@FILEMAP at .@OBJEXT@
+xmlwf/xmlwf. at OBJEXT@: xmlwf/xmlwf.c
+xmlwf/xmlfile. at OBJEXT@: xmlwf/xmlfile.c
+xmlwf/codepage. at OBJEXT@: xmlwf/codepage.c
+xmlwf/@FILEMAP at .@OBJEXT@: xmlwf/@FILEMAP at .c
+xmlwf/xmlwf at EXEEXT@: $(XMLWF_OBJS) $(LIBRARY)
$(LINK_EXE) $(XMLWF_OBJS) $(LIBRARY)
-examples/elements.o: examples/elements.c
-examples/elements: examples/elements.o $(LIBRARY)
+examples/elements. at OBJEXT@: examples/elements.c
+examples/elements: examples/elements. at OBJEXT@ $(LIBRARY)
$(LINK_EXE) $< $(LIBRARY)
-examples/outline.o: examples/outline.c
-examples/outline: examples/outline.o $(LIBRARY)
+examples/outline. at OBJEXT@: examples/outline.c
+examples/outline: examples/outline. at OBJEXT@ $(LIBRARY)
$(LINK_EXE) $< $(LIBRARY)
-tests/chardata.o: tests/chardata.c tests/chardata.h
-tests/minicheck.o: tests/minicheck.c tests/minicheck.h
-tests/runtests.o: tests/runtests.c tests/chardata.h
-tests/runtests: tests/runtests.o tests/chardata.o tests/minicheck.o $(LIBRARY)
- $(LINK_EXE) tests/runtests.o tests/chardata.o tests/minicheck.o $(LIBRARY)
-tests/runtestspp.o: tests/runtestspp.cpp tests/runtests.c tests/chardata.h
-tests/runtestspp: tests/runtestspp.o tests/chardata.o tests/minicheck.o $(LIBRARY)
- $(LINK_CXX_EXE) tests/runtestspp.o tests/chardata.o tests/minicheck.o $(LIBRARY)
+tests/chardata. at OBJEXT@: tests/chardata.c tests/chardata.h
+tests/minicheck. at OBJEXT@: tests/minicheck.c tests/minicheck.h
+tests/runtests. at OBJEXT@: tests/runtests.c tests/chardata.h
+tests/runtests: tests/runtests. at OBJEXT@ tests/chardata. at OBJEXT@ tests/minicheck. at OBJEXT@ $(LIBRARY)
+ $(LINK_EXE) tests/runtests. at OBJEXT@ tests/chardata. at OBJEXT@ tests/minicheck. at OBJEXT@ $(LIBRARY)
+tests/runtestspp. at OBJEXT@: tests/runtestspp.cpp tests/runtests.c tests/chardata.h
+tests/runtestspp: tests/runtestspp. at OBJEXT@ tests/chardata. at OBJEXT@ tests/minicheck. at OBJEXT@ $(LIBRARY)
+ $(LINK_CXX_EXE) tests/runtestspp. at OBJEXT@ tests/chardata. at OBJEXT@ tests/minicheck. at OBJEXT@ $(LIBRARY)
+
+tests/benchmark/benchmark. at OBJEXT@: tests/benchmark/benchmark.c
+tests/benchmark/benchmark: tests/benchmark/benchmark. at OBJEXT@ $(LIBRARY)
+ $(LINK_EXE) tests/benchmark/benchmark. at OBJEXT@ $(LIBRARY)
+
+run-benchmark: tests/benchmark/benchmark
+ tests/benchmark/benchmark at EXEEXT@ -n $(top_srcdir)/../testdata/largefiles/recset.xml 65535 3
tests/xmlts.zip:
wget --output-document=tests/xmlts.zip \
- http://www.w3.org/XML/Test/xmlts20020606.zip
+ http://www.w3.org/XML/Test/xmlts20080827.zip
tests/XML-Test-Suite: tests/xmlts.zip
cd tests && unzip -q xmlts.zip
-run-xmltest: xmlwf/xmlwf tests/XML-Test-Suite
+run-xmltest: xmlwf/xmlwf at EXEEXT@ tests/XML-Test-Suite
tests/xmltest.sh
-.SUFFIXES: .c .cpp .lo .o
+.SUFFIXES: .c .cpp .lo . at OBJEXT@
-.cpp.o:
+.cpp. at OBJEXT@:
$(CXXCOMPILE) -o $@ -c $<
-.c.o:
+.c. at OBJEXT@:
$(COMPILE) -o $@ -c $<
.c.lo:
$(LTCOMPILE) -o $@ -c $<
Modified: user/attilio/vmc-playground/contrib/expat/README
==============================================================================
--- user/attilio/vmc-playground/contrib/expat/README Tue Feb 26 18:13:42 2013 (r247329)
+++ user/attilio/vmc-playground/contrib/expat/README Tue Feb 26 18:18:39 2013 (r247330)
@@ -1,5 +1,5 @@
- Expat, Release 2.0.1
+ Expat, Release 2.1.0
This is Expat, a C library for parsing XML, written by James Clark.
Expat is a stream-oriented XML parser. This means that you register
@@ -25,8 +25,7 @@ intended to be production grade software
If you are building Expat from a check-out from the CVS repository,
you need to run a script that generates the configure script using the
GNU autoconf and libtool tools. To do this, you need to have
-autoconf 2.52 or newer and libtool 1.4 or newer (1.5 or newer preferred).
-Run the script like this:
+autoconf 2.58 or newer. Run the script like this:
./buildconf.sh
@@ -65,8 +64,8 @@ location. Have a look at the "Makefile"
the directories into which things will be installed.
If you are interested in building Expat to provide document
-information in UTF-16 rather than the default UTF-8, follow these
-instructions (after having run "make distclean"):
+information in UTF-16 encoding rather than the default UTF-8, follow
+these instructions (after having run "make distclean"):
1. For UTF-16 output as unsigned short (and version/error
strings as char), run:
@@ -106,7 +105,10 @@ use DESTDIR=$(INSTALL_ROOT), even if DES
environment, because variable-setting priority is
1) commandline
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-user
mailing list