Date: Fri, 5 Nov 2004 17:27:43 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 64338 for review Message-ID: <200411051727.iA5HRhHb020151@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=64338 Change 64338 by peter@peter_daintree on 2004/11/05 17:27:23 IFC @64337 Affected files ... .. //depot/projects/hammer/bin/rcp/Makefile#3 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#41 integrate .. //depot/projects/hammer/etc/mtree/BIND.chroot.dist#3 integrate .. //depot/projects/hammer/etc/namedb/named.conf#7 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#29 integrate .. //depot/projects/hammer/etc/rc.d/initdiskless#14 integrate .. //depot/projects/hammer/etc/rc.d/swap1#7 integrate .. //depot/projects/hammer/etc/rc.d/vinum#4 delete .. //depot/projects/hammer/kerberos5/usr.bin/ksu/Makefile#6 integrate .. //depot/projects/hammer/lib/libarchive/Makefile#14 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_extract.c#18 integrate .. //depot/projects/hammer/lib/libarchive/archive_string.h#4 integrate .. //depot/projects/hammer/lib/libarchive/archive_string_sprintf.c#6 integrate .. //depot/projects/hammer/lib/libarchive/archive_write.3#6 integrate .. //depot/projects/hammer/lib/libarchive/archive_write.c#10 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_compression_bzip2.c#6 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_compression_gzip.c#7 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_compression_none.c#6 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_cpio.c#5 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_pax.c#13 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_shar.c#8 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_ustar.c#9 integrate .. //depot/projects/hammer/lib/libbegemot/Makefile#2 integrate .. //depot/projects/hammer/lib/libc/gen/syslog.c#6 integrate .. //depot/projects/hammer/lib/libc/stdtime/strftime.3#6 integrate .. //depot/projects/hammer/lib/libc/stdtime/strftime.c#4 integrate .. //depot/projects/hammer/libexec/ftpd/ftpd.c#20 integrate .. //depot/projects/hammer/libexec/rtld-aout/Makefile#2 integrate .. //depot/projects/hammer/libexec/rtld-elf/Makefile#14 integrate .. //depot/projects/hammer/release/picobsd/tinyware/login/Makefile#3 integrate .. //depot/projects/hammer/rescue/rescue/Makefile#18 integrate .. //depot/projects/hammer/sbin/Makefile#30 integrate .. //depot/projects/hammer/sbin/geom/class/concat/gconcat.8#7 integrate .. //depot/projects/hammer/sbin/geom/class/label/glabel.8#6 integrate .. //depot/projects/hammer/sbin/geom/class/mirror/gmirror.8#3 integrate .. //depot/projects/hammer/sbin/geom/class/nop/gnop.8#7 integrate .. //depot/projects/hammer/sbin/geom/class/raid3/graid3.8#4 integrate .. //depot/projects/hammer/sbin/geom/class/stripe/gstripe.8#8 integrate .. //depot/projects/hammer/sbin/geom/core/geom.8#7 integrate .. //depot/projects/hammer/sbin/init/Makefile#4 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#32 integrate .. //depot/projects/hammer/sbin/route/route.8#7 integrate .. //depot/projects/hammer/sbin/vinum/Makefile#4 delete .. //depot/projects/hammer/sbin/vinum/commands.c#14 delete .. //depot/projects/hammer/sbin/vinum/list.c#7 delete .. //depot/projects/hammer/sbin/vinum/v.c#7 delete .. //depot/projects/hammer/sbin/vinum/vext.h#5 delete .. //depot/projects/hammer/sbin/vinum/vinum.8#11 delete .. //depot/projects/hammer/share/examples/etc/make.conf#29 integrate .. //depot/projects/hammer/share/man/man4/Makefile#54 integrate .. //depot/projects/hammer/share/man/man4/gdb.4#4 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/acpi_asus.4#4 integrate .. //depot/projects/hammer/share/man/man4/route.4#5 integrate .. //depot/projects/hammer/share/man/man4/vinumdebug.4#2 delete .. //depot/projects/hammer/share/man/man5/make.conf.5#27 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#42 integrate .. //depot/projects/hammer/share/mk/bsd.prog.mk#10 integrate .. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#29 integrate .. //depot/projects/hammer/sys/arm/arm/elf_machdep.c#5 integrate .. //depot/projects/hammer/sys/arm/arm/machdep.c#6 integrate .. //depot/projects/hammer/sys/arm/arm/vm_machdep.c#5 integrate .. //depot/projects/hammer/sys/arm/include/atomic.h#2 integrate .. //depot/projects/hammer/sys/arm/include/cpu.h#3 integrate .. //depot/projects/hammer/sys/arm/include/cpuconf.h#2 integrate .. //depot/projects/hammer/sys/arm/include/cpufunc.h#4 integrate .. //depot/projects/hammer/sys/arm/include/endian.h#6 integrate .. //depot/projects/hammer/sys/arm/include/param.h#5 integrate .. //depot/projects/hammer/sys/arm/include/pcpu.h#2 integrate .. //depot/projects/hammer/sys/arm/include/reg.h#2 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf_if.c#5 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_timer.c#12 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#32 integrate .. //depot/projects/hammer/sys/dev/random/randomdev_soft.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/ehci.c#13 integrate .. //depot/projects/hammer/sys/dev/usb/ehcireg.h#6 integrate .. //depot/projects/hammer/sys/dev/usb/uhub.c#12 integrate .. //depot/projects/hammer/sys/dev/usb/usb_subr.c#18 integrate .. //depot/projects/hammer/sys/dev/usb/usbdivar.h#5 integrate .. //depot/projects/hammer/sys/dev/vinum/COPYRIGHT#2 delete .. //depot/projects/hammer/sys/dev/vinum/makestatetext#2 delete .. //depot/projects/hammer/sys/dev/vinum/request.h#3 delete .. //depot/projects/hammer/sys/dev/vinum/statetexts.h#2 delete .. //depot/projects/hammer/sys/dev/vinum/vinum.c#13 delete .. //depot/projects/hammer/sys/dev/vinum/vinumconfig.c#15 delete .. //depot/projects/hammer/sys/dev/vinum/vinumdaemon.c#7 delete .. //depot/projects/hammer/sys/dev/vinum/vinumext.h#10 delete .. //depot/projects/hammer/sys/dev/vinum/vinumhdr.h#4 delete .. //depot/projects/hammer/sys/dev/vinum/vinuminterrupt.c#8 delete .. //depot/projects/hammer/sys/dev/vinum/vinumio.c#17 delete .. //depot/projects/hammer/sys/dev/vinum/vinumio.h#4 delete .. //depot/projects/hammer/sys/dev/vinum/vinumioctl.c#13 delete .. //depot/projects/hammer/sys/dev/vinum/vinumkw.h#5 delete .. //depot/projects/hammer/sys/dev/vinum/vinumlock.c#6 delete .. //depot/projects/hammer/sys/dev/vinum/vinummemory.c#8 delete .. //depot/projects/hammer/sys/dev/vinum/vinumobj.h#6 delete .. //depot/projects/hammer/sys/dev/vinum/vinumparser.c#7 delete .. //depot/projects/hammer/sys/dev/vinum/vinumraid5.c#4 delete .. //depot/projects/hammer/sys/dev/vinum/vinumrequest.c#13 delete .. //depot/projects/hammer/sys/dev/vinum/vinumrevive.c#9 delete .. //depot/projects/hammer/sys/dev/vinum/vinumstate.c#4 delete .. //depot/projects/hammer/sys/dev/vinum/vinumstate.h#2 delete .. //depot/projects/hammer/sys/dev/vinum/vinumutil.c#6 delete .. //depot/projects/hammer/sys/dev/vinum/vinumutil.h#2 delete .. //depot/projects/hammer/sys/dev/vinum/vinumvar.h#7 delete .. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#17 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs.h#4 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_subr.c#9 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_vfsops.c#14 integrate .. //depot/projects/hammer/sys/geom/geom_mbr.c#18 integrate .. //depot/projects/hammer/sys/geom/geom_slice.c#20 integrate .. //depot/projects/hammer/sys/geom/geom_vfs.c#2 integrate .. //depot/projects/hammer/sys/geom/mirror/g_mirror.c#13 integrate .. //depot/projects/hammer/sys/geom/mirror/g_mirror.h#3 integrate .. //depot/projects/hammer/sys/geom/raid3/g_raid3.c#8 integrate .. //depot/projects/hammer/sys/geom/raid3/g_raid3.h#4 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_asus.c#8 integrate .. //depot/projects/hammer/sys/i386/i386/intr_machdep.c#13 integrate .. //depot/projects/hammer/sys/isa/vga_isa.c#12 integrate .. //depot/projects/hammer/sys/kern/kern_intr.c#32 integrate .. //depot/projects/hammer/sys/kern/kern_physio.c#14 integrate .. //depot/projects/hammer/sys/kern/kern_shutdown.c#30 integrate .. //depot/projects/hammer/sys/kern/kern_subr.c#16 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#70 integrate .. //depot/projects/hammer/sys/kern/subr_bus.c#29 integrate .. //depot/projects/hammer/sys/kern/tty.c#32 integrate .. //depot/projects/hammer/sys/kern/uipc_jumbo.c#7 integrate .. //depot/projects/hammer/sys/kern/uipc_syscalls.c#37 integrate .. //depot/projects/hammer/sys/kern/vfs_aio.c#25 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#44 integrate .. //depot/projects/hammer/sys/kern/vfs_cluster.c#21 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#60 integrate .. //depot/projects/hammer/sys/modules/vinum/Makefile#3 delete .. //depot/projects/hammer/sys/netgraph/atm/sscop/ng_sscop_cust.h#2 integrate .. //depot/projects/hammer/sys/netgraph/atm/uni/ng_uni_cust.h#3 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_main.c#5 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_misc.c#7 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_var.h#5 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#7 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h#5 integrate .. //depot/projects/hammer/sys/netgraph/ng_base.c#21 integrate .. //depot/projects/hammer/sys/netinet/ip_fastfwd.c#15 integrate .. //depot/projects/hammer/sys/netinet/udp_usrreq.c#26 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_bio.c#24 integrate .. //depot/projects/hammer/sys/pc98/conf/GENERIC#27 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/pmap.c#28 integrate .. //depot/projects/hammer/sys/sys/buf.h#18 integrate .. //depot/projects/hammer/sys/sys/param.h#49 integrate .. //depot/projects/hammer/sys/sys/syslog.h#4 integrate .. //depot/projects/hammer/sys/sys/ttydefaults.h#7 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#31 integrate .. //depot/projects/hammer/sys/vm/swap_pager.c#33 integrate .. //depot/projects/hammer/sys/vm/vm_contig.c#22 integrate .. //depot/projects/hammer/sys/vm/vm_glue.c#35 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#43 integrate .. //depot/projects/hammer/sys/vm/vm_page.c#38 integrate .. //depot/projects/hammer/sys/vm/vm_pageout.c#32 integrate .. //depot/projects/hammer/sys/vm/vm_pager.c#15 integrate .. //depot/projects/hammer/tools/debugscripts/dot.gdbinit#4 integrate .. //depot/projects/hammer/tools/debugscripts/gdbinit.vinum#3 delete .. //depot/projects/hammer/tools/tools/nanobsd/make.conf#7 integrate .. //depot/projects/hammer/usr.bin/cut/cut.c#4 integrate .. //depot/projects/hammer/usr.bin/ee/ee.c#3 integrate .. //depot/projects/hammer/usr.bin/login/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/make/config.h#3 integrate .. //depot/projects/hammer/usr.bin/make/job.c#11 integrate .. //depot/projects/hammer/usr.bin/make/job.h#8 integrate .. //depot/projects/hammer/usr.bin/make/main.c#16 integrate .. //depot/projects/hammer/usr.bin/newgrp/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/opieinfo/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/opiepasswd/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/rlogin/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/rsh/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/su/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/tail/extern.h#2 integrate .. //depot/projects/hammer/usr.bin/tail/forward.c#4 integrate .. //depot/projects/hammer/usr.bin/tail/misc.c#2 integrate .. //depot/projects/hammer/usr.bin/tail/read.c#3 integrate .. //depot/projects/hammer/usr.bin/tail/reverse.c#2 integrate .. //depot/projects/hammer/usr.bin/tail/tail.c#2 integrate .. //depot/projects/hammer/usr.bin/tar/Makefile#7 integrate .. //depot/projects/hammer/usr.bin/tar/write.c#12 integrate .. //depot/projects/hammer/usr.sbin/ancontrol/ancontrol.c#7 integrate .. //depot/projects/hammer/usr.sbin/cron/crontab/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/moused/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/sliplogin/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/config.c#18 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/index.c#6 integrate .. //depot/projects/hammer/usr.sbin/syslogd/syslogd.8#7 integrate .. //depot/projects/hammer/usr.sbin/syslogd/syslogd.c#16 integrate Differences ... ==== //depot/projects/hammer/bin/rcp/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 7/19/93 -# $FreeBSD: src/bin/rcp/Makefile,v 1.22 2002/10/16 16:06:46 markm Exp $ +# $FreeBSD: src/bin/rcp/Makefile,v 1.23 2004/11/03 18:01:18 ru Exp $ PROG= rcp SRCS= rcp.c util.c @@ -7,6 +7,6 @@ BINOWN= root BINMODE=4555 -INSTALLFLAGS=-fschg +PRECIOUSPROG= .include <bsd.prog.mk> ==== //depot/projects/hammer/etc/defaults/rc.conf#41 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.228 2004/11/01 18:05:40 mtm Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.229 2004/11/04 13:33:29 ru Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -449,7 +449,6 @@ kern_securelevel="-1" # range: -1..3 ; `-1' is the most insecure lomac_enable="NO" # start lomac(4) security module at boot update_motd="YES" # update version info in /etc/motd (or NO) -start_vinum="NO" # set to YES to start vinum unaligned_print="YES" # print unaligned access warnings on the alpha (or NO). entropy_file="/entropy" # Set to NO to disable caching entropy through reboots. # /var/db/entropy is preferred if / is not available. ==== //depot/projects/hammer/etc/mtree/BIND.chroot.dist#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BIND.chroot.dist,v 1.5 2004/09/29 03:43:10 dougb Exp $ +# $FreeBSD: src/etc/mtree/BIND.chroot.dist,v 1.6 2004/11/04 05:24:29 gshapiro Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -9,6 +9,8 @@ .. etc namedb + dynamic uname=bind + .. master .. slave uname=bind ==== //depot/projects/hammer/etc/namedb/named.conf#7 (text+ko) ==== @@ -1,4 +1,4 @@ -// $FreeBSD: src/etc/namedb/named.conf,v 1.19 2004/09/30 09:57:36 dougb Exp $ +// $FreeBSD: src/etc/namedb/named.conf,v 1.20 2004/11/04 05:24:29 gshapiro Exp $ // // Refer to the named.conf(5) and named(8) man pages, and the documentation // in /usr/share/doc/bind9 for more details. @@ -102,6 +102,20 @@ }; }; +// An example dynamic zone +key "exampleorgkey" { + algorithm hmac-md5; + secret "sf87HJqjkqh8ac87a02lla=="; +}; + +zone "example.org" { + type master; + allow-update { + key "exampleorgkey"; + }; + file "dynamic/example.org"; +}; + zone "0.168.192.in-addr.arpa" { type slave; file "slave/0.168.192.in-addr.arpa"; ==== //depot/projects/hammer/etc/rc.d/Makefile#29 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.45 2004/11/02 12:35:54 pjd Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.46 2004/11/04 12:59:16 phk Exp $ FILES= DAEMON LOGIN NETWORKING SERVERS \ abi accounting addswap adjkerntz amd \ @@ -35,7 +35,7 @@ syscons sysctl syslogd \ timed tmp \ ugidfw usbd \ - var vinum virecover \ + var virecover \ watchdogd \ ypbind yppasswdd ypserv \ ypset ypupdated ypxfrd ==== //depot/projects/hammer/etc/rc.d/initdiskless#14 (text+ko) ==== @@ -24,12 +24,12 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/initdiskless,v 1.39 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/initdiskless,v 1.40 2004/11/05 07:35:31 mtm Exp $ # +# PROVIDE: initdiskless # REQUIRE: preseedrandom -# PROVIDE: initdiskless +# BEFORE: rcconf # KEYWORD: nojail -# BEFORE: ipfw # On entry to this script the entire system consists of a read-only root ==== //depot/projects/hammer/etc/rc.d/swap1#7 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: swap1,v 1.8 2002/03/24 15:52:41 lukem Exp $ -# $FreeBSD: src/etc/rc.d/swap1,v 1.8 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/swap1,v 1.9 2004/11/05 12:38:27 pjd Exp $ # # PROVIDE: localswap @@ -12,7 +12,7 @@ name="swap1" start_cmd='swapon -a' -stop_cmd='swapoff -a' +stop_cmd=':' load_rc_config swap run_rc_command "$1" ==== //depot/projects/hammer/kerberos5/usr.bin/ksu/Makefile#6 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/kerberos5/usr.bin/ksu/Makefile,v 1.13 2004/02/05 18:51:52 ru Exp $ +# $FreeBSD: src/kerberos5/usr.bin/ksu/Makefile,v 1.14 2004/11/03 18:01:18 ru Exp $ PROG= ksu .if defined(ENABLE_SUID_K5SU) BINMODE=4555 -INSTALLFLAGS=-fschg +PRECIOUSPROG= .endif NOMAN= SRCS= su.c ==== //depot/projects/hammer/lib/libarchive/Makefile#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/Makefile,v 1.23 2004/10/11 22:04:05 obrien Exp $ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.26 2004/11/05 05:38:15 kientzle Exp $ # # Use "make distfile" to build a conventional tar.gz archive @@ -7,7 +7,7 @@ LIB= archive -VERSION= 1.01.013 +VERSION= 1.01.015 ARCHIVE_API_FEATURE= 2 ARCHIVE_API_VERSION= 1 SHLIB_MAJOR= ${ARCHIVE_API_VERSION} @@ -146,6 +146,7 @@ MLINKS+= archive_util.3 archive_error_string.3 MLINKS+= archive_util.3 archive_format.3 MLINKS+= archive_util.3 archive_format_name.3 +MLINKS+= archive_util.3 archive_set_error.3 MLINKS+= archive_write.3 archive_write_data.3 MLINKS+= archive_write.3 archive_write_finish.3 MLINKS+= archive_write.3 archive_write_header.3 @@ -194,7 +195,7 @@ mkdir ${DIST_WORK_DIR} for f in ${DIST_FILES}; \ do \ - cat ${.CURDIR}/$$f >${DIST_WORK_DIR}/$$f; \ + cat ${.CURDIR}/$$f >${DIST_WORK_DIR}/$$f || true; \ done cat ${.CURDIR}/configure.ac.in | \ sed 's/@VERSION@/${VERSION}/' | \ ==== //depot/projects/hammer/lib/libarchive/archive_read_extract.c#18 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.35 2004/08/27 03:40:48 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.36 2004/11/05 05:16:40 kientzle Exp $"); #include <sys/types.h> #ifdef HAVE_SYS_ACL_H @@ -488,6 +488,7 @@ if (extract->pst != NULL) { extract->pst = &extract->st; + /* If dir already exists, don't reset permissions. */ if (S_ISDIR(extract->pst->st_mode)) return (ARCHIVE_OK); /* It exists but isn't a dir. */ ==== //depot/projects/hammer/lib/libarchive/archive_string.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive_string.h,v 1.3 2004/05/03 01:40:34 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_string.h,v 1.4 2004/11/05 05:32:04 kientzle Exp $ * */ @@ -104,9 +104,4 @@ va_list); #define archive_string_vsprintf __archive_string_vsprintf -/* Like 'sprintf', but resizes the underlying string as necessary. */ -void __archive_string_sprintf(struct archive_string *, const char *, ...); -#define archive_string_sprintf __archive_string_sprintf - - #endif ==== //depot/projects/hammer/lib/libarchive/archive_string_sprintf.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_string_sprintf.c,v 1.5 2004/08/26 03:33:53 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_string_sprintf.c,v 1.6 2004/11/05 05:32:04 kientzle Exp $"); /* * This uses 'printf' family functions, which can cause issues @@ -64,16 +64,3 @@ as->length = l; va_end(ap1); } - -/* - * Corresponding 'sprintf' interface. - */ -void -__archive_string_sprintf(struct archive_string *as, const char *fmt, ...) -{ - va_list ap; - - va_start(ap, fmt); - __archive_string_vsprintf(as, fmt, ap); - va_end(ap); -} ==== //depot/projects/hammer/lib/libarchive/archive_write.3#6 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libarchive/archive_write.3,v 1.7 2004/08/07 19:22:50 kientzle Exp $ +.\" $FreeBSD: src/lib/libarchive/archive_write.3,v 1.8 2004/11/05 05:26:30 kientzle Exp $ .\" .Dd October 1, 2003 .Dt archive_write 3 @@ -190,6 +190,7 @@ structure. .It Fn archive_write_data Write data corresponding to the header just written. +Returns number of bytes written or -1 on error. .It Fn archive_write_close Complete the archive and invoke the close callback. .It Fn archive_write_finish @@ -321,20 +322,19 @@ .Fn archive_error_string functions will return appropriate values. Note that if the client-provided write callback function -returns -1, that error will be propagated back to the caller +returns a non-zero value, that error will be propagated back to the caller through whatever API function resulted in that call, which may include .Fn archive_write_header , .Fn archive_write_data , or .Fn archive_write_close . -In such a case, the +The client callback can call +.Fn archive_set_error +to provide values that can then be retrieved by .Fn archive_errno -or -.Fn archive_error_string -fields will not return useful information; you should use -client-private data to return error information -back to your mainline code. +and +.Fn archive_error_string . .Sh SEE ALSO .Xr tar 1 , .Xr libarchive 3 , ==== //depot/projects/hammer/lib/libarchive/archive_write.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write.c,v 1.12 2004/08/14 03:43:35 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write.c,v 1.13 2004/11/05 05:26:30 kientzle Exp $"); /* * This file contains the "essential" portions of the write API, that @@ -215,9 +215,12 @@ /* * Note that the compressor is responsible for blocking. */ +/* Should be "ssize_t", but that breaks the ABI. <sigh> */ int archive_write_data(struct archive *a, const void *buff, size_t s) { + int ret; archive_check_magic(a, ARCHIVE_WRITE_MAGIC, ARCHIVE_STATE_DATA); - return (a->format_write_data(a, buff, s)); + ret = (a->format_write_data)(a, buff, s); + return (ret == ARCHIVE_OK ? (ssize_t)s : -1); } ==== //depot/projects/hammer/lib/libarchive/archive_write_set_compression_bzip2.c#6 (text+ko) ==== @@ -29,9 +29,10 @@ /* Don't compile this if we don't have bzlib. */ #if HAVE_BZLIB_H -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_compression_bzip2.c,v 1.5 2004/07/30 04:14:47 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_compression_bzip2.c,v 1.6 2004/11/05 05:26:30 kientzle Exp $"); #include <errno.h> +#include <stdio.h> #include <stdlib.h> #include <string.h> #include <bzlib.h> @@ -153,15 +154,17 @@ /* * Write data to the compressed stream. + * + * Returns ARCHIVE_OK if all data written, error otherwise. */ -static ssize_t +static int archive_compressor_bzip2_write(struct archive *a, const void *buff, size_t length) { struct private_data *state; state = a->compression_data; - if (!a->client_writer) { + if (a->client_writer == NULL) { archive_set_error(a, ARCHIVE_ERRNO_PROGRAMMER, "No write callback is registered? " "This is probably an internal programming error."); @@ -175,9 +178,9 @@ SET_NEXT_IN(state, buff); state->stream.avail_in = length; if (drive_compressor(a, state, 0)) - return (-1); + return (ARCHIVE_FATAL); a->file_position += length; - return (length); + return (ARCHIVE_OK); } @@ -191,6 +194,7 @@ int ret; struct private_data *state; ssize_t target_block_length; + ssize_t bytes_written; unsigned tocopy; state = a->compression_data; @@ -246,12 +250,16 @@ } /* Write the last block */ - ret = (a->client_writer)(a, a->client_data, state->compressed, - block_length); + bytes_written = (a->client_writer)(a, a->client_data, + state->compressed, block_length); - a->raw_position += ret; - if (ret != 0) - goto cleanup; + /* TODO: Handle short write of final block. */ + if (bytes_written <= 0) + ret = ARCHIVE_FATAL; + else { + a->raw_position += ret; + ret = ARCHIVE_OK; + } /* Cleanup: shut down compressor, release memory, etc. */ cleanup: @@ -284,27 +292,28 @@ static int drive_compressor(struct archive *a, struct private_data *state, int finishing) { - size_t ret; + ssize_t bytes_written; + int ret; for (;;) { if (state->stream.avail_out == 0) { - ret = (a->client_writer)(a, a->client_data, + bytes_written = (a->client_writer)(a, a->client_data, state->compressed, state->compressed_buffer_size); - if (ret <= 0) { + if (bytes_written <= 0) { /* TODO: Handle this write failure */ return (ARCHIVE_FATAL); - } else if (ret < state->compressed_buffer_size) { + } else if ((size_t)bytes_written < state->compressed_buffer_size) { /* Short write: Move remainder to * front and keep filling */ memmove(state->compressed, - state->compressed + ret, - state->compressed_buffer_size - ret); + state->compressed + bytes_written, + state->compressed_buffer_size - bytes_written); } - a->raw_position += ret; + a->raw_position += bytes_written; state->stream.next_out = state->compressed + - state->compressed_buffer_size - ret; - state->stream.avail_out = ret; + state->compressed_buffer_size - bytes_written; + state->stream.avail_out = bytes_written; } ret = BZ2_bzCompress(&(state->stream), ==== //depot/projects/hammer/lib/libarchive/archive_write_set_compression_gzip.c#7 (text+ko) ==== @@ -29,7 +29,7 @@ /* Don't compile this if we don't have zlib. */ #if HAVE_ZLIB_H -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_compression_gzip.c,v 1.7 2004/08/07 19:21:18 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_compression_gzip.c,v 1.8 2004/11/05 05:26:30 kientzle Exp $"); #include <errno.h> #include <stdlib.h> @@ -179,7 +179,7 @@ /* * Write data to the compressed stream. */ -static ssize_t +static int archive_compressor_gzip_write(struct archive *a, const void *buff, size_t length) { @@ -187,7 +187,7 @@ int ret; state = a->compression_data; - if (!a->client_writer) { + if (a->client_writer == NULL) { archive_set_error(a, ARCHIVE_ERRNO_PROGRAMMER, "No write callback is registered? " "This is probably an internal programming error."); @@ -205,7 +205,7 @@ return (ret); a->file_position += length; - return (length); + return (ARCHIVE_OK); } @@ -215,7 +215,7 @@ static int archive_compressor_gzip_finish(struct archive *a) { - ssize_t block_length, target_block_length; + ssize_t block_length, target_block_length, bytes_written; int ret; struct private_data *state; unsigned tocopy; @@ -273,9 +273,13 @@ /* If it overflowed, flush and start a new block. */ if (tocopy < 8) { - ret = (a->client_writer)(a, a->client_data, state->compressed, - state->compressed_buffer_size); - a->raw_position += ret; + bytes_written = (a->client_writer)(a, a->client_data, + state->compressed, state->compressed_buffer_size); + if (bytes_written <= 0) { + ret = ARCHIVE_FATAL; + goto cleanup; + } + a->raw_position += bytes_written; state->stream.next_out = state->compressed; state->stream.avail_out = state->compressed_buffer_size; memcpy(state->stream.next_out, trailer + tocopy, 8-tocopy); @@ -306,9 +310,13 @@ } /* Write the last block */ - ret = (a->client_writer)(a, a->client_data, state->compressed, - block_length); - a->raw_position += ret; + bytes_written = (a->client_writer)(a, a->client_data, + state->compressed, block_length); + if (bytes_written <= 0) { + ret = ARCHIVE_FATAL; + goto cleanup; + } + a->raw_position += bytes_written; /* Cleanup: shut down compressor, release memory, etc. */ cleanup: @@ -340,27 +348,28 @@ static int drive_compressor(struct archive *a, struct private_data *state, int finishing) { - size_t ret; + ssize_t bytes_written; + int ret; for (;;) { if (state->stream.avail_out == 0) { - ret = (a->client_writer)(a, a->client_data, + bytes_written = (a->client_writer)(a, a->client_data, state->compressed, state->compressed_buffer_size); - if (ret <= 0) { + if (bytes_written <= 0) { /* TODO: Handle this write failure */ return (ARCHIVE_FATAL); - } else if (ret < state->compressed_buffer_size) { + } else if ((size_t)bytes_written < state->compressed_buffer_size) { /* Short write: Move remaining to * front of block and keep filling */ memmove(state->compressed, - state->compressed + ret, - state->compressed_buffer_size - ret); + state->compressed + bytes_written, + state->compressed_buffer_size - bytes_written); } - a->raw_position += ret; + a->raw_position += bytes_written; state->stream.next_out = state->compressed + - state->compressed_buffer_size - ret; - state->stream.avail_out = ret; + state->compressed_buffer_size - bytes_written; + state->stream.avail_out = bytes_written; } ret = deflate(&(state->stream), ==== //depot/projects/hammer/lib/libarchive/archive_write_set_compression_none.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_compression_none.c,v 1.5 2004/08/07 19:21:18 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_compression_none.c,v 1.6 2004/11/05 05:26:30 kientzle Exp $"); #include <errno.h> #include <stdlib.h> @@ -104,13 +104,13 @@ /* * Write data to the stream. */ -static ssize_t +static int archive_compressor_none_write(struct archive *a, const void *vbuff, size_t length) { const char *buff; ssize_t remaining, to_copy; - int ret; + ssize_t bytes_written; struct archive_none *state; state = a->compression_data; @@ -129,10 +129,12 @@ * output buffer. */ if (state->avail == 0) { - ret = (a->client_writer)(a, a->client_data, + bytes_written = (a->client_writer)(a, a->client_data, state->buffer, state->buffer_size); - /* XXX TODO: if ret < state->buffer_size XXX */ - a->raw_position += ret; + if (bytes_written <= 0) + return (ARCHIVE_FATAL); + /* XXX TODO: if bytes_written < state->buffer_size */ + a->raw_position += bytes_written; state->next = state->buffer; state->avail = state->buffer_size; } @@ -147,7 +149,7 @@ remaining -= to_copy; } a->file_position += length; - return (length); + return (ARCHIVE_OK); } @@ -159,6 +161,7 @@ { ssize_t block_length; ssize_t target_block_length; + ssize_t bytes_written; int ret; int ret2; struct archive_none *state; @@ -193,9 +196,14 @@ target_block_length - block_length); block_length = target_block_length; } - ret = (a->client_writer)(a, a->client_data, state->buffer, - block_length); - a->raw_position += ret; + bytes_written = (a->client_writer)(a, a->client_data, + state->buffer, block_length); + if (bytes_written <= 0) + ret = ARCHIVE_FATAL; + else { + a->raw_position += bytes_written; + ret = ARCHIVE_OK; + } } /* Close the output */ ==== //depot/projects/hammer/lib/libarchive/archive_write_set_format_cpio.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_cpio.c,v 1.4 2004/04/13 23:45:37 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_cpio.c,v 1.5 2004/11/05 05:26:30 kientzle Exp $"); #include <sys/stat.h> #include <errno.h> @@ -99,7 +99,7 @@ { struct cpio *cpio; const char *p, *path; - int pathlength, ret, written; + int pathlength, ret; const struct stat *st; struct cpio_header h; @@ -142,19 +142,19 @@ else format_octal(st->st_size, &h.c_filesize, sizeof(h.c_filesize)); - written = (a->compression_write)(a, &h, sizeof(h)); - if (written < (int)sizeof(h)) + ret = (a->compression_write)(a, &h, sizeof(h)); + if (ret != ARCHIVE_OK) return (ARCHIVE_FATAL); - written = (a->compression_write)(a, path, pathlength); - if (written < (int)pathlength) + ret = (a->compression_write)(a, path, pathlength); + if (ret != ARCHIVE_OK) return (ARCHIVE_FATAL); cpio->entry_bytes_remaining = st->st_size; /* Write the symlink now. */ if (p != NULL && *p != '\0') - (a->compression_write)(a, p, strlen(p)); + ret = (a->compression_write)(a, p, strlen(p)); return (ret); } @@ -233,13 +233,13 @@ int to_write, ret; cpio = a->format_data; - ret = 0; + ret = ARCHIVE_OK; while (cpio->entry_bytes_remaining > 0) { to_write = cpio->entry_bytes_remaining < a->null_length ? cpio->entry_bytes_remaining : a->null_length; ret = (a->compression_write)(a, a->nulls, to_write); - if (ret < to_write) - return (-1); + if (ret != ARCHIVE_OK) + return (ret); cpio->entry_bytes_remaining -= to_write; } return (ret); ==== //depot/projects/hammer/lib/libarchive/archive_write_set_format_pax.c#13 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_pax.c,v 1.18 2004/09/17 04:39:07 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_pax.c,v 1.19 2004/11/05 05:26:30 kientzle Exp $"); #include <sys/stat.h> #include <errno.h> @@ -622,7 +622,7 @@ __archive_write_format_header_ustar(a, ustarbuff, entry_main, -1, 0); /* If we built any extended attributes, write that entry first. */ - ret = 0; + ret = ARCHIVE_OK; if (archive_strlen(&(pax->pax_header)) > 0) { struct stat st; struct archive_entry *pax_attr_entry; @@ -663,7 +663,7 @@ exit(1); } r = (a->compression_write)(a, paxbuff, 512); - if (r < 512) { + if (r != ARCHIVE_OK) { pax->entry_bytes_remaining = 0; pax->entry_padding = 0; return (ARCHIVE_FATAL); @@ -677,7 +677,7 @@ r = archive_write_data(a, pax->pax_header.s, archive_strlen(&(pax->pax_header))); a->state = oldstate; - if (r < (int)archive_strlen(&(pax->pax_header))) { + if (r != ARCHIVE_OK) { /* If a write fails, we're pretty much toast. */ return (ARCHIVE_FATAL); } @@ -687,8 +687,8 @@ /* Write the header for main entry. */ r = (a->compression_write)(a, ustarbuff, 512); - if (ret != ARCHIVE_OK) - ret = (r < 512) ? ARCHIVE_FATAL : ARCHIVE_OK; + if (r != ARCHIVE_OK) + return (r); /* * Inform the client of the on-disk size we're using, so @@ -839,9 +839,9 @@ while (padding > 0) { to_write = padding < a->null_length ? padding : a->null_length; ret = (a->compression_write)(a, a->nulls, to_write); - if (ret <= 0) - return (ARCHIVE_FATAL); - padding -= ret; + if (ret != ARCHIVE_OK) + return (ret); + padding -= to_write; } return (ARCHIVE_OK); } ==== //depot/projects/hammer/lib/libarchive/archive_write_set_format_shar.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_shar.c,v 1.10 2004/06/27 18:38:13 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_shar.c,v 1.11 2004/11/05 05:26:30 kientzle Exp $"); #include <sys/stat.h> #include <errno.h> @@ -50,8 +50,7 @@ int uuavail; char uubuffer[3]; int wrote_header; - char *work; - size_t work_len; + struct archive_string work; }; static int archive_write_shar_finish(struct archive *); @@ -70,23 +69,13 @@ { >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200411051727.iA5HRhHb020151>