Date: Fri, 3 Oct 2008 04:31:49 GMT From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 150830 for review Message-ID: <200810030431.m934Vnbm028921@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=150830 Change 150830 by sam@sam_ebb on 2008/10/03 04:30:51 IFC @ 150825 Affected files ... .. //depot/projects/vap/ObsoleteFiles.inc#20 integrate .. //depot/projects/vap/bin/pkill/pkill.1#2 integrate .. //depot/projects/vap/bin/pkill/pkill.c#2 integrate .. //depot/projects/vap/crypto/openssh/moduli.5#2 integrate .. //depot/projects/vap/crypto/openssh/scp.1#4 integrate .. //depot/projects/vap/crypto/openssh/sftp-server.8#4 integrate .. //depot/projects/vap/crypto/openssh/sftp.1#4 integrate .. //depot/projects/vap/crypto/openssh/ssh-add.1#4 integrate .. //depot/projects/vap/crypto/openssh/ssh-agent.1#4 integrate .. //depot/projects/vap/crypto/openssh/ssh-keygen.1#4 integrate .. //depot/projects/vap/crypto/openssh/ssh-keyscan.1#4 integrate .. //depot/projects/vap/crypto/openssh/ssh-keysign.8#4 integrate .. //depot/projects/vap/crypto/openssh/ssh.1#4 integrate .. //depot/projects/vap/crypto/openssh/ssh_config.5#4 integrate .. //depot/projects/vap/crypto/openssh/sshd.8#4 integrate .. //depot/projects/vap/crypto/openssh/sshd_config.5#4 integrate .. //depot/projects/vap/etc/network.subr#14 integrate .. //depot/projects/vap/gnu/lib/csu/Makefile#6 integrate .. //depot/projects/vap/gnu/usr.bin/gdb/kgdb/kld.c#6 integrate .. //depot/projects/vap/lib/libarchive/archive_entry.c#8 integrate .. //depot/projects/vap/lib/libarchive/archive_entry.h#8 integrate .. //depot/projects/vap/lib/libarchive/archive_entry_copy_stat.c#3 integrate .. //depot/projects/vap/lib/libarchive/archive_entry_private.h#7 integrate .. //depot/projects/vap/lib/libarchive/archive_entry_stat.c#3 integrate .. //depot/projects/vap/lib/libarchive/archive_read_support_format_tar.c#8 integrate .. //depot/projects/vap/lib/libarchive/archive_write_disk.c#16 integrate .. //depot/projects/vap/lib/libarchive/archive_write_set_format_pax.c#7 integrate .. //depot/projects/vap/lib/libarchive/config_freebsd.h#9 integrate .. //depot/projects/vap/lib/libarchive/test/Makefile#13 integrate .. //depot/projects/vap/lib/libarchive/test/test_entry.c#7 integrate .. //depot/projects/vap/lib/libarchive/test/test_write_disk.c#7 integrate .. //depot/projects/vap/lib/libarchive/test/test_write_disk_times.c#1 branch .. //depot/projects/vap/lib/libarchive/test/test_write_format_pax.c#1 branch .. //depot/projects/vap/lib/libc/gen/getosreldate.3#4 integrate .. //depot/projects/vap/lib/libc/sys/cpuset.2#3 integrate .. //depot/projects/vap/lib/libc/sys/cpuset_getaffinity.2#3 integrate .. //depot/projects/vap/lib/libpmc/pmc.k7.3#2 integrate .. //depot/projects/vap/lib/libpmc/pmc.k8.3#2 integrate .. //depot/projects/vap/lib/libpmc/pmc.p5.3#2 integrate .. //depot/projects/vap/lib/libpmc/pmc.p6.3#2 integrate .. //depot/projects/vap/sbin/bsdlabel/bsdlabel.c#6 integrate .. //depot/projects/vap/sbin/fdisk/fdisk.c#5 integrate .. //depot/projects/vap/sbin/ifconfig/ifconfig.c#12 integrate .. //depot/projects/vap/sbin/ifconfig/ifvlan.c#8 integrate .. //depot/projects/vap/sbin/setkey/setkey.8#3 integrate .. //depot/projects/vap/share/examples/FreeBSD_version/FreeBSD_version.c#3 integrate .. //depot/projects/vap/share/man/man3/Makefile#6 integrate .. //depot/projects/vap/share/man/man3/makedev.3#1 branch .. //depot/projects/vap/share/man/man4/nfe.4#4 integrate .. //depot/projects/vap/share/man/man4/wpi.4#5 integrate .. //depot/projects/vap/share/man/man9/Makefile#15 integrate .. //depot/projects/vap/share/man/man9/device_ids.9#3 delete .. //depot/projects/vap/share/man/man9/make_dev.9#5 integrate .. //depot/projects/vap/share/man/man9/spl.9#3 integrate .. //depot/projects/vap/share/zoneinfo/southamerica#8 integrate .. //depot/projects/vap/sys/amd64/amd64/dump_machdep.c#8 integrate .. //depot/projects/vap/sys/amd64/amd64/minidump_machdep.c#8 integrate .. //depot/projects/vap/sys/amd64/amd64/mp_machdep.c#11 integrate .. //depot/projects/vap/sys/amd64/include/param.h#9 integrate .. //depot/projects/vap/sys/amd64/include/smp.h#7 integrate .. //depot/projects/vap/sys/arm/arm/dump_machdep.c#7 integrate .. //depot/projects/vap/sys/arm/arm/pmap.c#12 integrate .. //depot/projects/vap/sys/arm/at91/at91_mci.c#4 integrate .. //depot/projects/vap/sys/arm/xscale/ixp425/avila_machdep.c#6 integrate .. //depot/projects/vap/sys/compat/linprocfs/linprocfs.c#11 integrate .. //depot/projects/vap/sys/compat/linux/linux_ioctl.c#8 integrate .. //depot/projects/vap/sys/compat/linux/linux_misc.c#18 integrate .. //depot/projects/vap/sys/compat/linux/linux_socket.c#8 integrate .. //depot/projects/vap/sys/compat/svr4/svr4_sockio.c#6 integrate .. //depot/projects/vap/sys/conf/files.sparc64#12 integrate .. //depot/projects/vap/sys/conf/kmod.mk#7 integrate .. //depot/projects/vap/sys/conf/newvers.sh#8 integrate .. //depot/projects/vap/sys/conf/options.sparc64#7 integrate .. //depot/projects/vap/sys/contrib/ipfilter/netinet/ip_auth.c#6 integrate .. //depot/projects/vap/sys/contrib/pf/net/pf.c#11 integrate .. //depot/projects/vap/sys/contrib/pf/net/pf_if.c#8 integrate .. //depot/projects/vap/sys/contrib/pf/net/pf_ioctl.c#12 integrate .. //depot/projects/vap/sys/contrib/pf/net/pf_subr.c#6 integrate .. //depot/projects/vap/sys/contrib/pf/net/pfvar.h#6 integrate .. //depot/projects/vap/sys/contrib/rdma/rdma_cma.c#3 integrate .. //depot/projects/vap/sys/ddb/db_textdump.c#4 integrate .. //depot/projects/vap/sys/dev/agp/agp_i810.c#6 integrate .. //depot/projects/vap/sys/dev/agp/agpreg.h#3 integrate .. //depot/projects/vap/sys/dev/ata/ata-chipset.c#17 integrate .. //depot/projects/vap/sys/dev/ata/ata-pci.h#12 integrate .. //depot/projects/vap/sys/dev/cfe/cfe_console.c#2 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_main.c#15 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_sge.c#13 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#4 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#12 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#11 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#7 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_vm.c#3 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_vm.h#2 integrate .. //depot/projects/vap/sys/dev/dc/dcphy.c#3 integrate .. //depot/projects/vap/sys/dev/dc/pnphy.c#3 integrate .. //depot/projects/vap/sys/dev/fatm/if_fatm.c#7 integrate .. //depot/projects/vap/sys/dev/firewire/firewire.c#7 integrate .. //depot/projects/vap/sys/dev/hwpmc/pmc_events.h#4 integrate .. //depot/projects/vap/sys/dev/mii/ciphy.c#7 integrate .. //depot/projects/vap/sys/dev/mii/e1000phy.c#6 integrate .. //depot/projects/vap/sys/dev/mii/miidevs#14 integrate .. //depot/projects/vap/sys/dev/mmc/mmc.c#3 integrate .. //depot/projects/vap/sys/dev/mmc/mmcbrvar.h#3 integrate .. //depot/projects/vap/sys/dev/mmc/mmcreg.h#3 integrate .. //depot/projects/vap/sys/dev/mmc/mmcsd.c#3 integrate .. //depot/projects/vap/sys/dev/mmc/mmcvar.h#3 integrate .. //depot/projects/vap/sys/dev/msk/if_msk.c#10 integrate .. //depot/projects/vap/sys/dev/mxge/eth_z8e.h#4 integrate .. //depot/projects/vap/sys/dev/mxge/ethp_z8e.h#4 integrate .. //depot/projects/vap/sys/dev/mxge/mxge_mcp.h#4 integrate .. //depot/projects/vap/sys/dev/mxge/rss_eth_z8e.h#3 integrate .. //depot/projects/vap/sys/dev/mxge/rss_ethp_z8e.h#3 integrate .. //depot/projects/vap/sys/dev/nfe/if_nfe.c#7 integrate .. //depot/projects/vap/sys/dev/nfe/if_nfereg.h#5 integrate .. //depot/projects/vap/sys/dev/nfe/if_nfevar.h#4 integrate .. //depot/projects/vap/sys/dev/pccbb/pccbb_pci.c#6 integrate .. //depot/projects/vap/sys/fs/cd9660/cd9660_rrip.c#5 integrate .. //depot/projects/vap/sys/geom/part/g_part.c#11 integrate .. //depot/projects/vap/sys/geom/part/g_part_bsd.c#6 integrate .. //depot/projects/vap/sys/geom/vinum/geom_vinum.h#5 integrate .. //depot/projects/vap/sys/geom/vinum/geom_vinum_drive.c#9 integrate .. //depot/projects/vap/sys/geom/vinum/geom_vinum_rm.c#5 integrate .. //depot/projects/vap/sys/geom/vinum/geom_vinum_var.h#6 integrate .. //depot/projects/vap/sys/i386/i386/dump_machdep.c#8 integrate .. //depot/projects/vap/sys/i386/i386/minidump_machdep.c#6 integrate .. //depot/projects/vap/sys/i386/i386/mp_machdep.c#12 integrate .. //depot/projects/vap/sys/i386/include/param.h#7 integrate .. //depot/projects/vap/sys/i386/include/smp.h#8 integrate .. //depot/projects/vap/sys/i386/xen/mp_machdep.c#3 integrate .. //depot/projects/vap/sys/ia64/ia64/dump_machdep.c#7 integrate .. //depot/projects/vap/sys/ia64/ia64/interrupt.c#11 integrate .. //depot/projects/vap/sys/ia64/ia64/mp_machdep.c#8 integrate .. //depot/projects/vap/sys/ia64/ia64/sal.c#6 integrate .. //depot/projects/vap/sys/ia64/include/smp.h#5 integrate .. //depot/projects/vap/sys/kern/kern_jail.c#14 integrate .. //depot/projects/vap/sys/kern/kern_mib.c#12 integrate .. //depot/projects/vap/sys/kern/kern_shutdown.c#12 integrate .. //depot/projects/vap/sys/kern/kern_uuid.c#6 integrate .. //depot/projects/vap/sys/kern/kern_xxx.c#7 integrate .. //depot/projects/vap/sys/kern/uipc_socket.c#15 integrate .. //depot/projects/vap/sys/kern/vfs_lookup.c#12 integrate .. //depot/projects/vap/sys/mips/adm5120/if_admsw.c#3 integrate .. //depot/projects/vap/sys/mips/include/param.h#2 integrate .. //depot/projects/vap/sys/mips/include/smp.h#2 integrate .. //depot/projects/vap/sys/mips/mips/mp_machdep.c#3 integrate .. //depot/projects/vap/sys/mips/mips/pmap.c#6 integrate .. //depot/projects/vap/sys/mips/mips/trap.c#3 integrate .. //depot/projects/vap/sys/net/bridgestp.c#5 integrate .. //depot/projects/vap/sys/net/if.c#17 integrate .. //depot/projects/vap/sys/net/if_bridge.c#9 integrate .. //depot/projects/vap/sys/net/if_ef.c#8 integrate .. //depot/projects/vap/sys/net/if_ethersubr.c#12 integrate .. //depot/projects/vap/sys/net/if_faith.c#10 integrate .. //depot/projects/vap/sys/net/if_gif.c#11 integrate .. //depot/projects/vap/sys/net/if_gif.h#6 integrate .. //depot/projects/vap/sys/net/if_gre.c#13 integrate .. //depot/projects/vap/sys/net/if_lagg.c#9 integrate .. //depot/projects/vap/sys/net/if_loop.c#14 integrate .. //depot/projects/vap/sys/net/if_mib.c#7 integrate .. //depot/projects/vap/sys/net/if_spppsubr.c#6 integrate .. //depot/projects/vap/sys/net/if_stf.c#12 integrate .. //depot/projects/vap/sys/net/if_tun.c#9 integrate .. //depot/projects/vap/sys/net/if_var.h#12 integrate .. //depot/projects/vap/sys/net/if_vlan.c#12 integrate .. //depot/projects/vap/sys/net/raw_cb.c#10 integrate .. //depot/projects/vap/sys/net/raw_usrreq.c#8 integrate .. //depot/projects/vap/sys/net/route.c#14 integrate .. //depot/projects/vap/sys/net/rtsock.c#12 integrate .. //depot/projects/vap/sys/net/vnet.h#1 branch .. //depot/projects/vap/sys/net80211/ieee80211_ddb.c#29 integrate .. //depot/projects/vap/sys/netgraph/atm/ng_atm.c#7 integrate .. //depot/projects/vap/sys/netgraph/netgraph.h#11 integrate .. //depot/projects/vap/sys/netgraph/ng_base.c#23 integrate .. //depot/projects/vap/sys/netgraph/ng_eiface.c#7 integrate .. //depot/projects/vap/sys/netgraph/ng_gif.c#7 integrate .. //depot/projects/vap/sys/netgraph/ng_iface.c#9 integrate .. //depot/projects/vap/sys/netinet/if_ether.c#13 integrate .. //depot/projects/vap/sys/netinet/igmp.c#7 integrate .. //depot/projects/vap/sys/netinet/in.c#9 integrate .. //depot/projects/vap/sys/netinet/in.h#8 integrate .. //depot/projects/vap/sys/netinet/in_gif.c#7 integrate .. //depot/projects/vap/sys/netinet/in_mcast.c#6 integrate .. //depot/projects/vap/sys/netinet/in_pcb.c#19 integrate .. //depot/projects/vap/sys/netinet/in_pcb.h#13 integrate .. //depot/projects/vap/sys/netinet/in_rmx.c#9 integrate .. //depot/projects/vap/sys/netinet/ip6.h#6 integrate .. //depot/projects/vap/sys/netinet/ip_carp.c#9 integrate .. //depot/projects/vap/sys/netinet/ip_divert.c#9 integrate .. //depot/projects/vap/sys/netinet/ip_fastfwd.c#8 integrate .. //depot/projects/vap/sys/netinet/ip_fw.h#13 integrate .. //depot/projects/vap/sys/netinet/ip_fw2.c#19 integrate .. //depot/projects/vap/sys/netinet/ip_fw_nat.c#4 integrate .. //depot/projects/vap/sys/netinet/ip_icmp.c#10 integrate .. //depot/projects/vap/sys/netinet/ip_input.c#12 integrate .. //depot/projects/vap/sys/netinet/ip_ipsec.c#6 integrate .. //depot/projects/vap/sys/netinet/ip_mroute.c#8 integrate .. //depot/projects/vap/sys/netinet/ip_options.c#8 integrate .. //depot/projects/vap/sys/netinet/raw_ip.c#13 integrate .. //depot/projects/vap/sys/netinet/tcp_hostcache.c#7 integrate .. //depot/projects/vap/sys/netinet/tcp_input.c#14 integrate .. //depot/projects/vap/sys/netinet/tcp_offload.c#5 integrate .. //depot/projects/vap/sys/netinet/tcp_output.c#15 integrate .. //depot/projects/vap/sys/netinet/tcp_reass.c#5 integrate .. //depot/projects/vap/sys/netinet/tcp_sack.c#8 integrate .. //depot/projects/vap/sys/netinet/tcp_subr.c#14 integrate .. //depot/projects/vap/sys/netinet/tcp_syncache.c#16 integrate .. //depot/projects/vap/sys/netinet/tcp_timer.c#9 integrate .. //depot/projects/vap/sys/netinet/tcp_timewait.c#6 integrate .. //depot/projects/vap/sys/netinet/tcp_usrreq.c#12 integrate .. //depot/projects/vap/sys/netinet/udp_usrreq.c#14 integrate .. //depot/projects/vap/sys/netinet/vinet.h#1 branch .. //depot/projects/vap/sys/netinet6/dest6.c#7 integrate .. //depot/projects/vap/sys/netinet6/frag6.c#8 integrate .. //depot/projects/vap/sys/netinet6/icmp6.c#14 integrate .. //depot/projects/vap/sys/netinet6/in6.c#11 integrate .. //depot/projects/vap/sys/netinet6/in6.h#6 integrate .. //depot/projects/vap/sys/netinet6/in6_gif.c#7 integrate .. //depot/projects/vap/sys/netinet6/in6_ifattach.c#10 integrate .. //depot/projects/vap/sys/netinet6/in6_pcb.c#11 integrate .. //depot/projects/vap/sys/netinet6/in6_proto.c#9 integrate .. //depot/projects/vap/sys/netinet6/in6_rmx.c#9 integrate .. //depot/projects/vap/sys/netinet6/in6_src.c#11 integrate .. //depot/projects/vap/sys/netinet6/ip6_forward.c#8 integrate .. //depot/projects/vap/sys/netinet6/ip6_input.c#11 integrate .. //depot/projects/vap/sys/netinet6/ip6_ipsec.c#7 integrate .. //depot/projects/vap/sys/netinet6/ip6_mroute.c#7 integrate .. //depot/projects/vap/sys/netinet6/ip6_output.c#13 integrate .. //depot/projects/vap/sys/netinet6/mld6.c#10 integrate .. //depot/projects/vap/sys/netinet6/nd6.c#8 integrate .. //depot/projects/vap/sys/netinet6/nd6.h#7 integrate .. //depot/projects/vap/sys/netinet6/nd6_nbr.c#9 integrate .. //depot/projects/vap/sys/netinet6/nd6_rtr.c#8 integrate .. //depot/projects/vap/sys/netinet6/raw_ip6.c#15 integrate .. //depot/projects/vap/sys/netinet6/route6.c#7 integrate .. //depot/projects/vap/sys/netinet6/scope6.c#7 integrate .. //depot/projects/vap/sys/netinet6/udp6_usrreq.c#15 integrate .. //depot/projects/vap/sys/netinet6/vinet6.h#1 branch .. //depot/projects/vap/sys/netipsec/ipsec.c#11 integrate .. //depot/projects/vap/sys/netipsec/ipsec.h#9 integrate .. //depot/projects/vap/sys/netipsec/ipsec_input.c#8 integrate .. //depot/projects/vap/sys/netipsec/ipsec_mbuf.c#6 integrate .. //depot/projects/vap/sys/netipsec/ipsec_output.c#9 integrate .. //depot/projects/vap/sys/netipsec/key.c#11 integrate .. //depot/projects/vap/sys/netipsec/keysock.c#7 integrate .. //depot/projects/vap/sys/netipsec/vipsec.h#1 branch .. //depot/projects/vap/sys/netipsec/xform_ah.c#7 integrate .. //depot/projects/vap/sys/netipsec/xform_esp.c#7 integrate .. //depot/projects/vap/sys/netipsec/xform_ipcomp.c#7 integrate .. //depot/projects/vap/sys/netipsec/xform_ipip.c#7 integrate .. //depot/projects/vap/sys/nfsclient/nfs_diskless.c#9 integrate .. //depot/projects/vap/sys/nfsclient/nfs_vfsops.c#18 integrate .. //depot/projects/vap/sys/nfsclient/nfs_vnops.c#17 integrate .. //depot/projects/vap/sys/powerpc/include/smp.h#5 integrate .. //depot/projects/vap/sys/powerpc/powerpc/cpu.c#10 integrate .. //depot/projects/vap/sys/powerpc/powerpc/intr_machdep.c#12 integrate .. //depot/projects/vap/sys/powerpc/powerpc/mp_machdep.c#9 integrate .. //depot/projects/vap/sys/rpc/authunix_prot.c#4 integrate .. //depot/projects/vap/sys/sparc64/pci/schizo.c#1 branch .. //depot/projects/vap/sys/sparc64/pci/schizoreg.h#1 branch .. //depot/projects/vap/sys/sparc64/pci/schizovar.h#1 branch .. //depot/projects/vap/sys/sparc64/sparc64/dump_machdep.c#5 integrate .. //depot/projects/vap/sys/sun4v/include/smp.h#3 integrate .. //depot/projects/vap/sys/sun4v/sun4v/dump_machdep.c#5 integrate .. //depot/projects/vap/sys/sys/conf.h#13 integrate .. //depot/projects/vap/sys/sys/kerneldump.h#6 integrate .. //depot/projects/vap/sys/sys/pmc.h#6 integrate .. //depot/projects/vap/sys/sys/protosw.h#6 integrate .. //depot/projects/vap/sys/sys/sysctl.h#11 integrate .. //depot/projects/vap/sys/sys/vimage.h#2 integrate .. //depot/projects/vap/sys/vm/swap_pager.c#11 integrate .. //depot/projects/vap/sys/vm/vm_pageout.c#9 integrate .. //depot/projects/vap/sys/vm/vm_pageout.h#5 integrate .. //depot/projects/vap/usr.bin/cpuset/cpuset.1#4 integrate .. //depot/projects/vap/usr.bin/make/job.c#5 integrate .. //depot/projects/vap/usr.bin/top/machine.c#8 integrate .. //depot/projects/vap/usr.sbin/Makefile#15 integrate .. //depot/projects/vap/usr.sbin/boot0cfg/boot0cfg.c#4 integrate .. //depot/projects/vap/usr.sbin/bsnmpd/modules/Makefile#3 integrate Differences ... ==== //depot/projects/vap/ObsoleteFiles.inc#20 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.162 2008/09/21 16:11:11 antoine Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.163 2008/09/28 20:15:45 ed Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,12 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20080928: removal of inaccurate device_ids(9) manual page +OLD_FILES+=usr/share/man/man9/device_ids.9.gz +OLD_FILES+=usr/share/man/man9/major.9.gz +OLD_FILES+=usr/share/man/man9/minor.9.gz +OLD_FILES+=usr/share/man/man9/umajor.9.gz +OLD_FILES+=usr/share/man/man9/uminor.9.gz # 20080917: removal of manpage for axed kernel primitive suser(9) OLD_FILES+=usr/share/man/man9/suser.9.gz OLD_FILES+=usr/share/man/man9/suser_cred.9.gz ==== //depot/projects/vap/bin/pkill/pkill.1#2 (text+ko) ==== @@ -1,6 +1,6 @@ .\" $NetBSD: pkill.1,v 1.8 2003/02/14 15:59:18 grant Exp $ .\" -.\" $FreeBSD: src/bin/pkill/pkill.1,v 1.1 2008/08/31 14:27:59 yar Exp $ +.\" $FreeBSD: src/bin/pkill/pkill.1,v 1.3 2008/09/30 17:30:39 ed Exp $ .\" .\" Copyright (c) 2002 The NetBSD Foundation, Inc. .\" All rights reserved. ==== //depot/projects/vap/bin/pkill/pkill.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.1 2008/08/31 14:27:59 yar Exp $"); +__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.3 2008/09/30 17:30:39 ed Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -607,12 +607,11 @@ struct passwd *pw; struct group *gr; struct stat st; - const char *cp, *prefix; + const char *cp; char *sp, *ep, buf[MAXPATHLEN]; int empty; empty = 1; - prefix = _PATH_DEV; while ((sp = strsep(&src, ",")) != NULL) { if (*sp == '\0') @@ -673,21 +672,21 @@ cp = "console"; } else { cp = sp; - if (strncmp(sp, "tty", 3) != 0) - prefix = _PATH_TTY; } - snprintf(buf, sizeof(buf), "%s%s", prefix, cp); + snprintf(buf, sizeof(buf), _PATH_DEV "%s", cp); + if (stat(buf, &st) != -1) + goto foundtty; + + snprintf(buf, sizeof(buf), _PATH_DEV "tty%s", cp); + if (stat(buf, &st) != -1) + goto foundtty; - if (stat(buf, &st) == -1) { - if (errno == ENOENT) { - errx(STATUS_BADUSAGE, - "No such tty: `%s'", sp); - } - err(STATUS_ERROR, "Cannot access `%s'", sp); - } + if (errno == ENOENT) + errx(STATUS_BADUSAGE, "No such tty: `%s'", sp); + err(STATUS_ERROR, "Cannot access `%s'", sp); - if ((st.st_mode & S_IFCHR) == 0) +foundtty: if ((st.st_mode & S_IFCHR) == 0) errx(STATUS_BADUSAGE, "Not a tty: `%s'", sp); li->li_number = st.st_rdev; ==== //depot/projects/vap/crypto/openssh/moduli.5#2 (text+ko) ==== @@ -13,7 +13,7 @@ .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -.Dd $Mdocdate: June 26 2008 $ +.Dd June 26 2008 .Dt MODULI 5 .Os .Sh NAME ==== //depot/projects/vap/crypto/openssh/scp.1#4 (text+ko) ==== @@ -11,7 +11,7 @@ .\" .\" $OpenBSD: scp.1,v 1.46 2008/07/12 05:33:41 djm Exp $ .\" -.Dd $Mdocdate: July 12 2008 $ +.Dd July 12 2008 .Dt SCP 1 .Os .Sh NAME ==== //depot/projects/vap/crypto/openssh/sftp-server.8#4 (text+ko) ==== @@ -22,7 +22,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. .\" -.Dd $Mdocdate: July 18 2008 $ +.Dd July 18 2008 .Dt SFTP-SERVER 8 .Os .Sh NAME ==== //depot/projects/vap/crypto/openssh/sftp.1#4 (text+ko) ==== @@ -22,7 +22,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. .\" -.Dd $Mdocdate: July 15 2008 $ +.Dd July 15 2008 .Dt SFTP 1 .Os .Sh NAME ==== //depot/projects/vap/crypto/openssh/ssh-add.1#4 (text+ko) ==== @@ -37,7 +37,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. .\" -.Dd $Mdocdate: June 12 2007 $ +.Dd June 12 2007 .Dt SSH-ADD 1 .Os .Sh NAME ==== //depot/projects/vap/crypto/openssh/ssh-agent.1#4 (text+ko) ==== @@ -34,7 +34,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. .\" -.Dd $Mdocdate: June 5 2007 $ +.Dd June 5 2007 .Dt SSH-AGENT 1 .Os .Sh NAME ==== //depot/projects/vap/crypto/openssh/ssh-keygen.1#4 (text+ko) ==== @@ -37,7 +37,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. .\" -.Dd $Mdocdate: June 12 2008 $ +.Dd June 12 2008 .Dt SSH-KEYGEN 1 .Os .Sh NAME ==== //depot/projects/vap/crypto/openssh/ssh-keyscan.1#4 (text+ko) ==== @@ -6,7 +6,7 @@ .\" permitted provided that due credit is given to the author and the .\" OpenBSD project by leaving this copyright notice intact. .\" -.Dd $Mdocdate: April 30 2008 $ +.Dd April 30 2008 .Dt SSH-KEYSCAN 1 .Os .Sh NAME ==== //depot/projects/vap/crypto/openssh/ssh-keysign.8#4 (text+ko) ==== @@ -22,7 +22,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. .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd May 31 2007 .Dt SSH-KEYSIGN 8 .Os .Sh NAME ==== //depot/projects/vap/crypto/openssh/ssh.1#4 (text+ko) ==== @@ -35,8 +35,8 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: ssh.1,v 1.277 2008/07/02 13:47:39 djm Exp $ -.\" $FreeBSD: src/crypto/openssh/ssh.1,v 1.36 2008/08/01 02:48:36 des Exp $ -.Dd $Mdocdate: July 2 2008 $ +.\" $FreeBSD: src/crypto/openssh/ssh.1,v 1.37 2008/09/29 10:53:05 des Exp $ +.Dd July 2 2008 .Dt SSH 1 .Os .Sh NAME ==== //depot/projects/vap/crypto/openssh/ssh_config.5#4 (text+ko) ==== @@ -35,8 +35,8 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: ssh_config.5,v 1.111 2008/06/26 11:46:31 grunk Exp $ -.\" $FreeBSD: src/crypto/openssh/ssh_config.5,v 1.24 2008/08/01 02:48:36 des Exp $ -.Dd $Mdocdate: June 26 2008 $ +.\" $FreeBSD: src/crypto/openssh/ssh_config.5,v 1.25 2008/09/29 10:53:05 des Exp $ +.Dd June 26 2008 .Dt SSH_CONFIG 5 .Os .Sh NAME ==== //depot/projects/vap/crypto/openssh/sshd.8#4 (text+ko) ==== @@ -35,8 +35,8 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: sshd.8,v 1.246 2008/07/02 02:24:18 djm Exp $ -.\" $FreeBSD: src/crypto/openssh/sshd.8,v 1.35 2008/08/01 02:48:36 des Exp $ -.Dd $Mdocdate: July 2 2008 $ +.\" $FreeBSD: src/crypto/openssh/sshd.8,v 1.36 2008/09/29 10:53:05 des Exp $ +.Dd July 2 2008 .Dt SSHD 8 .Os .Sh NAME ==== //depot/projects/vap/crypto/openssh/sshd_config.5#4 (text+ko) ==== @@ -35,8 +35,8 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: sshd_config.5,v 1.96 2008/07/02 02:24:18 djm Exp $ -.\" $FreeBSD: src/crypto/openssh/sshd_config.5,v 1.30 2008/08/01 02:48:36 des Exp $ -.Dd $Mdocdate: July 2 2008 $ +.\" $FreeBSD: src/crypto/openssh/sshd_config.5,v 1.31 2008/09/29 10:53:05 des Exp $ +.Dd July 2 2008 .Dt SSHD_CONFIG 5 .Os .Sh NAME ==== //depot/projects/vap/etc/network.subr#14 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/network.subr,v 1.190 2008/06/23 20:50:11 mtm Exp $ +# $FreeBSD: src/etc/network.subr,v 1.191 2008/10/01 18:46:46 brooks Exp $ # # @@ -506,15 +506,9 @@ # Create wireless interfaces child_wlans=`get_if_var $ifn wlans_IF` - if [ -z "${child_wlans}" ]; then - child_wlans=`get_if_var $ifn vaps_IF` - if [ -n "${child_wlans}" ]; then - warn "soon to be deleted vaps_$ifn variable defined use wlans_$ifn" - fi - fi for child in ${child_wlans}; do - create_args="wlandev $ifn `get_if_var $child create_args_IF` `get_if_var $child vap_create_IF`" + create_args="wlandev $ifn `get_if_var $child create_args_IF`" if expr $child : 'wlan[0-9][0-9]*$' >/dev/null 2>&1; then ifconfig $child create ${create_args} && cfg=0 else ==== //depot/projects/vap/gnu/lib/csu/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.30 2008/09/26 15:00:18 marcel Exp $ +# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.31 2008/09/28 19:17:54 marcel Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs @@ -25,7 +25,7 @@ BEGINSRC= crtbegin.asm ENDSRC= crtend.asm CFLAGS+= -x assembler-with-cpp # Ugly hack -CFLAGS+= -D_OSRELDATE_H -include osreldate.h +CFLAGS+= -include osreldate.h .undef SRCS # hack for 'make depend' .endif .if ${MACHINE_ARCH} == "powerpc" ==== //depot/projects/vap/gnu/usr.bin/gdb/kgdb/kld.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kld.c,v 1.10 2008/09/25 19:32:03 jhb Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kld.c,v 1.11 2008/10/02 20:42:10 jhb Exp $"); #include <sys/param.h> #include <sys/stat.h> @@ -201,7 +201,7 @@ load_kld (char *path, CORE_ADDR base_addr, int from_tty) { struct section_addr_info *sap; - struct section_table *sections, *sections_end, *s; + struct section_table *sections = NULL, *sections_end = NULL, *s; struct cleanup *cleanup; bfd *bfd; int i; ==== //depot/projects/vap/lib/libarchive/archive_entry.c#8 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.53 2008/09/01 04:54:29 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.54 2008/09/30 03:53:03 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> @@ -461,6 +461,24 @@ } time_t +archive_entry_birthtime(struct archive_entry *entry) +{ + return (entry->ae_stat.aest_birthtime); +} + +long +archive_entry_birthtime_nsec(struct archive_entry *entry) +{ + return (entry->ae_stat.aest_birthtime_nsec); +} + +int +archive_entry_birthtime_is_set(struct archive_entry *entry) +{ + return (entry->ae_set & AE_SET_BIRTHTIME); +} + +time_t archive_entry_ctime(struct archive_entry *entry) { return (entry->ae_stat.aest_ctime); @@ -838,6 +856,22 @@ } void +archive_entry_set_birthtime(struct archive_entry *entry, time_t m, long ns) +{ + entry->stat_valid = 0; + entry->ae_set |= AE_SET_BIRTHTIME; + entry->ae_stat.aest_birthtime = m; + entry->ae_stat.aest_birthtime_nsec = ns; +} + +void +archive_entry_unset_birthtime(struct archive_entry *entry) +{ + archive_entry_set_birthtime(entry, 0, 0); + entry->ae_set &= ~AE_SET_BIRTHTIME; +} + +void archive_entry_set_ctime(struct archive_entry *entry, time_t t, long ns) { entry->stat_valid = 0; ==== //depot/projects/vap/lib/libarchive/archive_entry.h#8 (text+ko) ==== @@ -22,7 +22,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_entry.h,v 1.29 2008/09/18 04:19:06 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_entry.h,v 1.30 2008/09/30 03:53:03 kientzle Exp $ */ #ifndef ARCHIVE_ENTRY_H_INCLUDED @@ -174,6 +174,9 @@ __LA_DECL time_t archive_entry_atime(struct archive_entry *); __LA_DECL long archive_entry_atime_nsec(struct archive_entry *); __LA_DECL int archive_entry_atime_is_set(struct archive_entry *); +__LA_DECL time_t archive_entry_birthtime(struct archive_entry *); +__LA_DECL long archive_entry_birthtime_nsec(struct archive_entry *); +__LA_DECL int archive_entry_birthtime_is_set(struct archive_entry *); __LA_DECL time_t archive_entry_ctime(struct archive_entry *); __LA_DECL long archive_entry_ctime_nsec(struct archive_entry *); __LA_DECL int archive_entry_ctime_is_set(struct archive_entry *); @@ -224,6 +227,8 @@ __LA_DECL void archive_entry_set_atime(struct archive_entry *, time_t, long); __LA_DECL void archive_entry_unset_atime(struct archive_entry *); +__LA_DECL void archive_entry_set_birthtime(struct archive_entry *, time_t, long); +__LA_DECL void archive_entry_unset_birthtime(struct archive_entry *); __LA_DECL void archive_entry_set_ctime(struct archive_entry *, time_t, long); __LA_DECL void archive_entry_unset_ctime(struct archive_entry *); __LA_DECL void archive_entry_set_dev(struct archive_entry *, dev_t); ==== //depot/projects/vap/lib/libarchive/archive_entry_copy_stat.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_copy_stat.c,v 1.1 2007/05/29 01:00:18 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_copy_stat.c,v 1.2 2008/09/30 03:53:03 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> @@ -47,6 +47,12 @@ archive_entry_set_atime(entry, st->st_atime, 0); archive_entry_set_ctime(entry, st->st_ctime, 0); archive_entry_set_mtime(entry, st->st_mtime, 0); +#if HAVE_STRUCT_STAT_ST_BIRTHTIME + archive_entry_set_birthtime(entry, st->st_birthtime, 0); +#endif +#endif +#if HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC + archive_entry_set_birthtime(entry, st->st_birthtime, st->st_birthtimespec.tv_nsec); #endif archive_entry_set_dev(entry, st->st_dev); archive_entry_set_gid(entry, st->st_gid); ==== //depot/projects/vap/lib/libarchive/archive_entry_private.h#7 (text+ko) ==== @@ -22,7 +22,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_entry_private.h,v 1.5 2008/09/01 04:54:29 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_entry_private.h,v 1.6 2008/09/30 03:53:03 kientzle Exp $ */ #ifndef ARCHIVE_ENTRY_PRIVATE_H_INCLUDED @@ -112,6 +112,8 @@ uint32_t aest_ctime_nsec; int64_t aest_mtime; uint32_t aest_mtime_nsec; + int64_t aest_birthtime; + uint32_t aest_birthtime_nsec; gid_t aest_gid; ino_t aest_ino; mode_t aest_mode; @@ -142,6 +144,7 @@ #define AE_SET_ATIME 4 #define AE_SET_CTIME 8 #define AE_SET_MTIME 16 +#define AE_SET_BIRTHTIME 32 #define AE_SET_SIZE 64 /* ==== //depot/projects/vap/lib/libarchive/archive_entry_stat.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_stat.c,v 1.1 2007/05/29 01:00:18 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_stat.c,v 1.2 2008/09/30 03:53:03 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> @@ -64,6 +64,9 @@ * the appropriate conversions get invoked. */ st->st_atime = archive_entry_atime(entry); +#if HAVE_STRUCT_STAT_ST_BIRTHTIME + st->st_birthtime = archive_entry_birthtime(entry); +#endif st->st_ctime = archive_entry_ctime(entry); st->st_mtime = archive_entry_mtime(entry); st->st_dev = archive_entry_dev(entry); @@ -88,6 +91,9 @@ st->st_ctim.tv_nsec = archive_entry_ctime_nsec(entry); st->st_mtim.tv_nsec = archive_entry_mtime_nsec(entry); #endif +#if HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC + st->st_birthtimespec.tv_nsec = archive_entry_birthtime_nsec(entry); +#endif /* * TODO: On Linux, store 32 or 64 here depending on whether ==== //depot/projects/vap/lib/libarchive/archive_read_support_format_tar.c#8 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.70 2008/07/10 09:50:55 cperciva Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.71 2008/09/30 03:57:07 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include <errno.h> @@ -1451,6 +1451,10 @@ if (strcmp(key, "LIBARCHIVE.xxxxxxx")==0) archive_entry_set_xxxxxx(entry, value); */ + if (strcmp(key, "LIBARCHIVE.creationtime")==0) { + pax_time(value, &s, &n); + archive_entry_set_birthtime(entry, s, n); + } if (strncmp(key, "LIBARCHIVE.xattr.", 17)==0) pax_attribute_xattr(entry, key, value); break; ==== //depot/projects/vap/lib/libarchive/archive_write_disk.c#16 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.39 2008/09/14 05:51:25 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.40 2008/09/30 04:02:36 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> @@ -96,10 +96,12 @@ struct fixup_entry { struct fixup_entry *next; mode_t mode; + int64_t atime; + int64_t birthtime; int64_t mtime; - int64_t atime; + unsigned long atime_nanos; + unsigned long birthtime_nanos; unsigned long mtime_nanos; - unsigned long atime_nanos; unsigned long fflags_set; int fixup; /* bitmask of what needs fixing */ char *name; @@ -227,7 +229,8 @@ unsigned long fflags_set, unsigned long fflags_clear); static int set_ownership(struct archive_write_disk *); static int set_mode(struct archive_write_disk *, int mode); -static int set_time(struct archive_write_disk *); +static int set_time(int, int, const char *, time_t, long, time_t, long); +static int set_times(struct archive_write_disk *); static struct fixup_entry *sort_dir_list(struct fixup_entry *p); static gid_t trivial_lookup_gid(void *, const char *, gid_t); static uid_t trivial_lookup_uid(void *, const char *, uid_t); @@ -448,19 +451,29 @@ || archive_entry_atime_is_set(entry))) { fe = current_fixup(a, archive_entry_pathname(entry)); fe->fixup |= TODO_TIMES; + if (archive_entry_atime_is_set(entry)) { + fe->atime = archive_entry_atime(entry); + fe->atime_nanos = archive_entry_atime_nsec(entry); + } else { + /* If atime is unset, use start time. */ + fe->atime = a->start_time; + fe->atime_nanos = 0; + } if (archive_entry_mtime_is_set(entry)) { fe->mtime = archive_entry_mtime(entry); fe->mtime_nanos = archive_entry_mtime_nsec(entry); } else { + /* If mtime is unset, use start time. */ fe->mtime = a->start_time; fe->mtime_nanos = 0; } - if (archive_entry_atime_is_set(entry)) { - fe->atime = archive_entry_atime(entry); - fe->atime_nanos = archive_entry_atime_nsec(entry); + if (archive_entry_birthtime_is_set(entry)) { + fe->birthtime = archive_entry_birthtime(entry); + fe->birthtime_nanos = archive_entry_birthtime_nsec(entry); } else { - fe->atime = a->start_time; - fe->atime_nanos = 0; + /* If birthtime is unset, use mtime. */ + fe->birthtime = fe->mtime; + fe->birthtime_nanos = fe->mtime_nanos; } } @@ -698,7 +711,7 @@ if (r2 < ret) ret = r2; } if (a->todo & TODO_TIMES) { - int r2 = set_time(a); + int r2 = set_times(a); if (r2 < ret) ret = r2; } if (a->todo & TODO_ACLS) { @@ -1170,10 +1183,19 @@ #ifdef HAVE_UTIMES /* {f,l,}utimes() are preferred, when available. */ struct timeval times[2]; + times[0].tv_sec = p->atime; + times[0].tv_usec = p->atime_nanos / 1000; +#ifdef HAVE_STRUCT_STAT_ST_BIRTHTIME + /* if it's valid and not mtime, push the birthtime first */ + if (((times[1].tv_sec = p->birthtime) < p->mtime) && + (p->birthtime > 0)) + { + times[1].tv_usec = p->birthtime_nanos / 1000; + utimes(p->name, times); + } +#endif times[1].tv_sec = p->mtime; times[1].tv_usec = p->mtime_nanos / 1000; - times[0].tv_sec = p->atime; - times[0].tv_usec = p->atime_nanos / 1000; #ifdef HAVE_LUTIMES lutimes(p->name, times); #else @@ -1687,61 +1709,31 @@ * when they're available. */ static int -set_time(struct archive_write_disk *a) +set_time(int fd, int mode, const char *name, + time_t atime, long atime_nsec, + time_t mtime, long mtime_nsec) { struct timeval times[2]; - /* If no time was provided, we're done. */ - if (!archive_entry_atime_is_set(a->entry) - && !archive_entry_mtime_is_set(a->entry)) - return (ARCHIVE_OK); - - /* We know at least one is set, so... */ - if (archive_entry_mtime_is_set(a->entry)) { - times[1].tv_sec = archive_entry_mtime(a->entry); - times[1].tv_usec = archive_entry_mtime_nsec(a->entry) / 1000; - } else { - times[1].tv_sec = a->start_time; - times[1].tv_usec = 0; - } + times[0].tv_sec = atime; + times[0].tv_usec = atime_nsec / 1000; + times[1].tv_sec = mtime; + times[1].tv_usec = mtime_nsec / 1000; - /* If no atime was specified, use start time instead. */ - /* In theory, it would be marginally more correct to use - * time(NULL) here, but that would cost us an extra syscall - * for little gain. */ - if (archive_entry_atime_is_set(a->entry)) { - times[0].tv_sec = archive_entry_atime(a->entry); - times[0].tv_usec = archive_entry_atime_nsec(a->entry) / 1000; - } else { - times[0].tv_sec = a->start_time; - times[0].tv_usec = 0; - } - #ifdef HAVE_FUTIMES - if (a->fd >= 0 && futimes(a->fd, times) == 0) { - return (ARCHIVE_OK); - } + if (fd >= 0) + return (futimes(fd, times)); +#else + (void)fd; /* UNUSED */ #endif - #ifdef HAVE_LUTIMES - if (lutimes(a->name, times) != 0) + (void)mode; /* UNUSED */ + return (lutimes(name, times)); #else - if (!S_ISLNK(a->mode) && utimes(a->name, times) != 0) + if (S_ISLNK(mode)) + return (0); + return (utimes(name, times)); #endif - { - archive_set_error(&a->archive, errno, "Can't update time for %s", - a->name); - return (ARCHIVE_WARN); - } - - /* - * Note: POSIX does not provide a portable way to restore ctime. - * (Apart from resetting the system clock, which is distasteful.) - * So, any restoration of ctime will necessarily be OS-specific. - */ - - /* XXX TODO: Can FreeBSD restore ctime? XXX */ - return (ARCHIVE_OK); } #elif defined(HAVE_UTIME) /* @@ -1749,47 +1741,93 @@ * if utimes() isn't available. */ static int -set_time(struct archive_write_disk *a) +set_time(int fd, int mode, const char *name, + time_t atime, long atime_nsec, >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200810030431.m934Vnbm028921>