Date: Thu, 27 Sep 2007 22:30:11 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 126894 for review Message-ID: <200709272230.l8RMUBR0082999@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=126894 Change 126894 by peter@peter_daintree on 2007/09/27 22:29:37 IFC @126882 Affected files ... .. //depot/projects/hammer/bin/getfacl/getfacl.c#6 integrate .. //depot/projects/hammer/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/hammer/etc/mtree/BSD.include.dist#48 integrate .. //depot/projects/hammer/etc/rc.d/nscd#3 integrate .. //depot/projects/hammer/etc/services#16 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/ld/Makefile#9 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/ld/genscripts.sh#5 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/cc_int/Makefile#17 integrate .. //depot/projects/hammer/gnu/usr.bin/man/man/man.c#6 integrate .. //depot/projects/hammer/gnu/usr.bin/texinfo/info/Makefile#2 integrate .. //depot/projects/hammer/include/Makefile#70 integrate .. //depot/projects/hammer/lib/libarchive/archive_read.3#25 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_disk.c#8 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_disk.c#4 integrate .. //depot/projects/hammer/lib/libc/net/sctp_connectx.3#3 integrate .. //depot/projects/hammer/lib/libc/net/sctp_opt_info.3#3 integrate .. //depot/projects/hammer/lib/libc/net/sctp_recvmsg.3#3 integrate .. //depot/projects/hammer/lib/libc/net/sctp_send.3#3 integrate .. //depot/projects/hammer/lib/libc/net/sctp_sendmsg.3#3 integrate .. //depot/projects/hammer/lib/libc/rpc/auth_time.c#4 integrate .. //depot/projects/hammer/lib/libc/rpc/getnetconfig.c#7 integrate .. //depot/projects/hammer/lib/libc/rpc/getnetpath.c#6 integrate .. //depot/projects/hammer/lib/libc/rpc/rpc_generic.c#5 integrate .. //depot/projects/hammer/lib/libc/rpc/rpcb_clnt.c#7 integrate .. //depot/projects/hammer/lib/libc/stdlib/getenv.c#7 integrate .. //depot/projects/hammer/lib/libc/sys/minherit.2#6 integrate .. //depot/projects/hammer/lib/libdisk/open_disk.c#10 integrate .. //depot/projects/hammer/lib/libdisk/open_ia64_disk.c#3 integrate .. //depot/projects/hammer/lib/libkvm/kvm_proc.c#36 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/article.sgml#7 integrate .. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#47 integrate .. //depot/projects/hammer/sbin/dhclient/dhclient.8#6 integrate .. //depot/projects/hammer/sbin/fsck_ffs/Makefile#8 integrate .. //depot/projects/hammer/sbin/fsck_ffs/main.c#13 integrate .. //depot/projects/hammer/sbin/geom/class/Makefile#12 integrate .. //depot/projects/hammer/sbin/geom/class/virstor/Makefile#1 branch .. //depot/projects/hammer/sbin/geom/class/virstor/geom_virstor.c#1 branch .. //depot/projects/hammer/sbin/geom/class/virstor/gvirstor.8#1 branch .. //depot/projects/hammer/sbin/geom/core/geom.8#13 integrate .. //depot/projects/hammer/sbin/geom/core/geom.c#18 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#58 integrate .. //depot/projects/hammer/sbin/tunefs/tunefs.8#11 integrate .. //depot/projects/hammer/share/man/man4/cxgb.4#2 integrate .. //depot/projects/hammer/share/man/man4/gem.4#6 integrate .. //depot/projects/hammer/share/man/man4/sctp.4#2 integrate .. //depot/projects/hammer/share/man/man9/DECLARE_GEOM_CLASS.9#5 integrate .. //depot/projects/hammer/share/man/man9/crypto.9#8 integrate .. //depot/projects/hammer/share/misc/committers-ports.dot#6 integrate .. //depot/projects/hammer/share/misc/committers-src.dot#4 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#97 integrate .. //depot/projects/hammer/sys/amd64/include/smp.h#35 integrate .. //depot/projects/hammer/sys/amd64/include/vmparam.h#25 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux.h#7 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_proto.h#13 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_syscall.h#13 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_sysent.c#13 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_sysvec.c#18 integrate .. //depot/projects/hammer/sys/amd64/linux32/syscalls.master#13 integrate .. //depot/projects/hammer/sys/arm/arm/locore.S#16 integrate .. //depot/projects/hammer/sys/arm/arm/pmap.c#41 integrate .. //depot/projects/hammer/sys/arm/conf/AVILA#4 integrate .. //depot/projects/hammer/sys/arm/conf/CRB#2 integrate .. //depot/projects/hammer/sys/arm/include/asmacros.h#6 integrate .. //depot/projects/hammer/sys/arm/include/vmparam.h#9 integrate .. //depot/projects/hammer/sys/arm/xscale/i8134x/crb_machdep.c#2 integrate .. //depot/projects/hammer/sys/arm/xscale/i8134x/files.crb#2 integrate .. //depot/projects/hammer/sys/arm/xscale/i8134x/i81342.c#2 integrate .. //depot/projects/hammer/sys/arm/xscale/i8134x/i81342reg.h#2 integrate .. //depot/projects/hammer/sys/arm/xscale/i8134x/iq81342_7seg.c#1 branch .. //depot/projects/hammer/sys/arm/xscale/i8134x/iq81342reg.h#1 branch .. //depot/projects/hammer/sys/arm/xscale/i8134x/iq81342var.h#1 branch .. //depot/projects/hammer/sys/arm/xscale/ixp425/IxNpeMicrocode.c#1 branch .. //depot/projects/hammer/sys/arm/xscale/ixp425/files.ixp425#2 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425_npe.c#4 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425_npevar.h#3 integrate .. //depot/projects/hammer/sys/boot/forth/loader.conf#35 integrate .. //depot/projects/hammer/sys/compat/ia32/ia32_sysvec.c#21 integrate .. //depot/projects/hammer/sys/compat/linux/linux_stats.c#29 integrate .. //depot/projects/hammer/sys/conf/NOTES#127 integrate .. //depot/projects/hammer/sys/conf/files#159 integrate .. //depot/projects/hammer/sys/conf/options#115 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evmisc.c#15 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evxface.c#12 integrate .. //depot/projects/hammer/sys/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/hammer/sys/dev/acpica/acpi_ec.c#40 integrate .. //depot/projects/hammer/sys/dev/gem/if_gem.c#29 integrate .. //depot/projects/hammer/sys/dev/gem/if_gem_pci.c#16 integrate .. //depot/projects/hammer/sys/dev/gem/if_gemreg.h#4 integrate .. //depot/projects/hammer/sys/dev/gem/if_gemvar.h#10 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_pci.c#22 integrate .. //depot/projects/hammer/sys/dev/pci/pcireg.h#19 integrate .. //depot/projects/hammer/sys/dev/syscons/syscons.c#41 integrate .. //depot/projects/hammer/sys/dev/syscons/syscons.h#13 integrate .. //depot/projects/hammer/sys/dev/usb/ehci_pci.c#24 integrate .. //depot/projects/hammer/sys/dev/usb/if_axe.c#36 integrate .. //depot/projects/hammer/sys/dev/usb/if_axereg.h#13 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_fat.c#10 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_vfsops.c#31 integrate .. //depot/projects/hammer/sys/geom/geom_event.c#25 integrate .. //depot/projects/hammer/sys/geom/virstor/binstream.c#1 branch .. //depot/projects/hammer/sys/geom/virstor/binstream.h#1 branch .. //depot/projects/hammer/sys/geom/virstor/g_virstor.c#1 branch .. //depot/projects/hammer/sys/geom/virstor/g_virstor.h#1 branch .. //depot/projects/hammer/sys/geom/virstor/g_virstor_md.c#1 branch .. //depot/projects/hammer/sys/geom/virstor/g_virstor_md.h#1 branch .. //depot/projects/hammer/sys/i386/conf/GENERIC#55 integrate .. //depot/projects/hammer/sys/i386/i386/geode.c#9 integrate .. //depot/projects/hammer/sys/i386/include/smp.h#18 integrate .. //depot/projects/hammer/sys/i386/include/vmparam.h#12 integrate .. //depot/projects/hammer/sys/i386/linux/linux.h#10 integrate .. //depot/projects/hammer/sys/i386/linux/linux_proto.h#24 integrate .. //depot/projects/hammer/sys/i386/linux/linux_syscall.h#24 integrate .. //depot/projects/hammer/sys/i386/linux/linux_sysent.c#25 integrate .. //depot/projects/hammer/sys/i386/linux/linux_sysvec.c#30 integrate .. //depot/projects/hammer/sys/i386/linux/syscalls.master#24 integrate .. //depot/projects/hammer/sys/ia64/conf/GENERIC#30 integrate .. //depot/projects/hammer/sys/ia64/include/vmparam.h#13 integrate .. //depot/projects/hammer/sys/kern/kern_exec.c#71 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#63 integrate .. //depot/projects/hammer/sys/kern/kern_proc.c#59 integrate .. //depot/projects/hammer/sys/kern/kern_switch.c#57 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#98 integrate .. //depot/projects/hammer/sys/kern/sched_4bsd.c#51 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#82 integrate .. //depot/projects/hammer/sys/kern/subr_witness.c#64 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#77 integrate .. //depot/projects/hammer/sys/kern/vfs_cache.c#23 integrate .. //depot/projects/hammer/sys/kern/vfs_lookup.c#28 integrate .. //depot/projects/hammer/sys/modules/Makefile#113 integrate .. //depot/projects/hammer/sys/modules/acpi/acpi/Makefile#15 integrate .. //depot/projects/hammer/sys/modules/geom/geom_virstor/Makefile#1 branch .. //depot/projects/hammer/sys/net/if_media.h#20 integrate .. //depot/projects/hammer/sys/net/if_stf.c#27 integrate .. //depot/projects/hammer/sys/net80211/_ieee80211.h#12 integrate .. //depot/projects/hammer/sys/net80211/ieee80211.c#30 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ht.c#3 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.h#19 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.c#42 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.h#24 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_output.c#31 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_proto.c#30 integrate .. //depot/projects/hammer/sys/netgraph/ng_pppoe.c#23 integrate .. //depot/projects/hammer/sys/netinet/in_gif.c#18 integrate .. //depot/projects/hammer/sys/netinet/sctp_asconf.c#14 integrate .. //depot/projects/hammer/sys/netinet/sctp_constants.h#13 integrate .. //depot/projects/hammer/sys/netinet/sctp_lock_bsd.h#7 integrate .. //depot/projects/hammer/sys/netinet/sctp_os_bsd.h#14 integrate .. //depot/projects/hammer/sys/netinet/sctp_output.c#15 integrate .. //depot/projects/hammer/sys/netinet/sctp_pcb.c#15 integrate .. //depot/projects/hammer/sys/netinet/sctp_pcb.h#12 integrate .. //depot/projects/hammer/sys/netinet/sctp_uio.h#11 integrate .. //depot/projects/hammer/sys/netinet/sctp_usrreq.c#15 integrate .. //depot/projects/hammer/sys/netinet/sctputil.c#17 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#75 integrate .. //depot/projects/hammer/sys/netinet/tcp_timer.c#29 integrate .. //depot/projects/hammer/sys/netinet/tcp_timer.h#15 integrate .. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#50 integrate .. //depot/projects/hammer/sys/netinet/tcp_var.h#48 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_bio.c#44 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_nfsiod.c#14 integrate .. //depot/projects/hammer/sys/pc98/conf/GENERIC#45 integrate .. //depot/projects/hammer/sys/pci/agp_via.c#19 integrate .. //depot/projects/hammer/sys/powerpc/conf/GENERIC#32 integrate .. //depot/projects/hammer/sys/powerpc/conf/NOTES#5 integrate .. //depot/projects/hammer/sys/powerpc/include/vmparam.h#8 integrate .. //depot/projects/hammer/sys/sparc64/conf/GENERIC#54 integrate .. //depot/projects/hammer/sys/sparc64/include/vmparam.h#6 integrate .. //depot/projects/hammer/sys/sparc64/pci/ofw_pcibus.c#15 integrate .. //depot/projects/hammer/sys/sun4v/conf/GENERIC#5 integrate .. //depot/projects/hammer/sys/sun4v/include/vmparam.h#4 integrate .. //depot/projects/hammer/sys/sys/proc.h#108 integrate .. //depot/projects/hammer/sys/sys/socket.h#23 integrate .. //depot/projects/hammer/sys/sys/vmmeter.h#9 integrate .. //depot/projects/hammer/sys/vm/vm_contig.c#36 integrate .. //depot/projects/hammer/sys/vm/vm_fault.c#48 integrate .. //depot/projects/hammer/sys/vm/vm_glue.c#48 integrate .. //depot/projects/hammer/sys/vm/vm_map.c#62 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#68 integrate .. //depot/projects/hammer/sys/vm/vm_object.h#26 integrate .. //depot/projects/hammer/sys/vm/vm_page.c#61 integrate .. //depot/projects/hammer/sys/vm/vm_page.h#30 integrate .. //depot/projects/hammer/sys/vm/vm_pageout.c#46 integrate .. //depot/projects/hammer/sys/vm/vm_pageq.c#22 integrate .. //depot/projects/hammer/sys/vm/vm_phys.c#3 integrate .. //depot/projects/hammer/sys/vm/vm_phys.h#3 integrate .. //depot/projects/hammer/tools/tools/crypto/ipsecstats.c#2 integrate .. //depot/projects/hammer/usr.bin/at/at.c#2 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.dutch#3 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#55 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.praznici#2 integrate .. //depot/projects/hammer/usr.bin/login/login_fbtab.c#3 integrate .. //depot/projects/hammer/usr.bin/m4/gnum4.c#3 integrate .. //depot/projects/hammer/usr.bin/mklocale/yacc.y#14 integrate .. //depot/projects/hammer/usr.sbin/nscd/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/nscd/agent.c#2 integrate .. //depot/projects/hammer/usr.sbin/nscd/agent.h#3 integrate .. //depot/projects/hammer/usr.sbin/nscd/agents/Makefile.inc#2 integrate .. //depot/projects/hammer/usr.sbin/nscd/agents/group.c#2 integrate .. //depot/projects/hammer/usr.sbin/nscd/agents/group.h#2 integrate .. //depot/projects/hammer/usr.sbin/nscd/agents/passwd.c#2 integrate .. //depot/projects/hammer/usr.sbin/nscd/agents/passwd.h#2 integrate .. //depot/projects/hammer/usr.sbin/nscd/agents/services.c#2 integrate .. //depot/projects/hammer/usr.sbin/nscd/agents/services.h#2 integrate .. //depot/projects/hammer/usr.sbin/nscd/cachelib.c#2 integrate .. //depot/projects/hammer/usr.sbin/nscd/cachelib.h#3 integrate .. //depot/projects/hammer/usr.sbin/nscd/cacheplcs.c#2 integrate .. //depot/projects/hammer/usr.sbin/nscd/cacheplcs.h#3 integrate .. //depot/projects/hammer/usr.sbin/nscd/config.c#2 integrate .. //depot/projects/hammer/usr.sbin/nscd/config.h#3 integrate .. //depot/projects/hammer/usr.sbin/nscd/debug.c#2 integrate .. //depot/projects/hammer/usr.sbin/nscd/hashtable.h#2 integrate .. //depot/projects/hammer/usr.sbin/nscd/log.c#3 integrate .. //depot/projects/hammer/usr.sbin/nscd/log.h#3 integrate .. //depot/projects/hammer/usr.sbin/nscd/mp_rs_query.#2 integrate .. //depot/projects/hammer/usr.sbin/nscd/mp_rs_query.c#3 integrate .. //depot/projects/hammer/usr.sbin/nscd/mp_rs_query.h#2 integrate .. //depot/projects/hammer/usr.sbin/nscd/mp_ws_query.c#3 integrate .. //depot/projects/hammer/usr.sbin/nscd/mp_ws_query.h#3 integrate .. //depot/projects/hammer/usr.sbin/nscd/nscd.8#3 integrate .. //depot/projects/hammer/usr.sbin/nscd/nscd.c#3 integrate .. //depot/projects/hammer/usr.sbin/nscd/nscd.conf.5#3 integrate .. //depot/projects/hammer/usr.sbin/nscd/nscdcli.c#3 integrate .. //depot/projects/hammer/usr.sbin/nscd/nscdcli.h#3 integrate .. //depot/projects/hammer/usr.sbin/nscd/parser.c#2 integrate .. //depot/projects/hammer/usr.sbin/nscd/parser.h#3 integrate .. //depot/projects/hammer/usr.sbin/nscd/protocol.c#2 integrate .. //depot/projects/hammer/usr.sbin/nscd/protocol.h#3 integrate .. //depot/projects/hammer/usr.sbin/nscd/query.c#3 integrate .. //depot/projects/hammer/usr.sbin/nscd/query.h#3 integrate .. //depot/projects/hammer/usr.sbin/nscd/singletons.c#2 integrate .. //depot/projects/hammer/usr.sbin/nscd/singletons.h#3 integrate .. //depot/projects/hammer/usr.sbin/repquota/repquota.c#8 integrate .. //depot/projects/hammer/usr.sbin/wpa/hostapd/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/wpa/wpa_supplicant/Makefile#9 integrate Differences ... ==== //depot/projects/hammer/bin/getfacl/getfacl.c#6 (text+ko) ==== @@ -32,7 +32,7 @@ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/getfacl/getfacl.c,v 1.11 2006/03/13 11:45:29 rwatson Exp $"); +__FBSDID("$FreeBSD: src/bin/getfacl/getfacl.c,v 1.12 2007/09/19 02:04:47 kevlo Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -41,6 +41,8 @@ #include <err.h> #include <errno.h> +#include <grp.h> +#include <pwd.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -55,6 +57,32 @@ fprintf(stderr, "getfacl [-dhq] [file ...]\n"); } +static char * +getuname(uid_t uid) +{ + struct passwd *pw; + static char uids[10]; + + if ((pw = getpwuid(uid)) == NULL) { + (void)snprintf(uids, sizeof(uids), "%u", uid); + return (uids); + } else + return (pw->pw_name); +} + +static char * +getgname(gid_t gid) +{ + struct group *gr; + static char gids[10]; + + if ((gr = getgrgid(gid)) == NULL) { + (void)snprintf(gids, sizeof(gids), "%u", gid); + return (gids); + } else + return (gr->gr_name); +} + /* * return an ACL corresponding to the permissions * contained in struct stat @@ -169,8 +197,8 @@ more_than_one++; if (!qflag) - printf("#file:%s\n#owner:%d\n#group:%d\n", path, sb.st_uid, - sb.st_gid); + printf("# file: %s\n# owner: %s\n# group: %s\n", path, + getuname(sb.st_uid), getgname(sb.st_gid)); if (hflag) acl = acl_get_link_np(path, type); ==== //depot/projects/hammer/etc/mtree/BSD.include.dist#48 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.118 2007/07/14 21:49:21 rwatson Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.119 2007/09/23 07:34:21 pjd Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -174,6 +174,8 @@ .. stripe .. + virstor + .. .. gnu posix ==== //depot/projects/hammer/etc/rc.d/nscd#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/nscd,v 1.4 2007/08/09 13:06:11 bushman Exp $ +# $FreeBSD: src/etc/rc.d/nscd,v 1.5 2007/09/27 12:30:12 bushman Exp $ # # PROVIDE: nscd ==== //depot/projects/hammer/etc/services#16 (text+ko) ==== @@ -16,7 +16,7 @@ # Kerberos services are for Kerberos v4, and are unofficial. Sites running # v5 should uncomment v5 entries and comment v4 entries. # -# $FreeBSD: src/etc/services,v 1.112 2007/09/08 08:56:01 mr Exp $ +# $FreeBSD: src/etc/services,v 1.113 2007/09/21 01:26:00 brooks Exp $ # From: @(#)services 5.8 (Berkeley) 5/9/91 # # WELL KNOWN PORT NUMBERS @@ -2331,7 +2331,7 @@ sge_qmaster 6444/tcp #Grid Engine Qmaster Service sge_qmaster 6444/udp #Grid Engine Qmaster Service sge_execd 6445/tcp #Grid Engine Execution Service -sge_execd 6445/upd #Grid Engine Execution Service +sge_execd 6445/udp #Grid Engine Execution Service xdsxdm 6558/tcp xdsxdm 6558/udp ircd 6667/tcp #Internet Relay Chat (unoffical) ==== //depot/projects/hammer/gnu/usr.bin/binutils/ld/Makefile#9 (text+ko) ==== @@ -1,9 +1,13 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile,v 1.31 2004/12/21 09:59:40 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile,v 1.32 2007/09/26 01:31:28 marcel Exp $ .include "../Makefile.inc0" .PATH: ${SRCDIR}/ld +.if ${TARGET_ARCH} == "ia64" +CFLAGS+= -O1 +.endif + PROG= ld SCRIPTDIR= /usr/libdata/ldscripts SRCS+= ldcref.c ldctor.c ldemul.c ldemul-list.h ldexp.c ldfile.c \ ==== //depot/projects/hammer/gnu/usr.bin/binutils/ld/genscripts.sh#5 (text+ko) ==== @@ -9,7 +9,7 @@ # sparc-sun-sunos4.1.3 sparc-sun-sunos4.1.3 sun4 "" sun3 sparc-sun-sunos4.1.3 # produces sun3.x sun3.xbn sun3.xn sun3.xr sun3.xu em_sun3.c # -# $FreeBSD: src/gnu/usr.bin/binutils/ld/genscripts.sh,v 1.7 2006/09/14 07:46:32 imp Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ld/genscripts.sh,v 1.9 2007/09/19 14:19:32 obrien Exp $ # # This is a cut-down version of the GNU script. Instead of jumping through # hoops for all possible combinations of paths, just use the libdir @@ -54,8 +54,12 @@ fi # Set some flags for the emultempl scripts. USE_LIBPATH will -# be set for any libpath-using emulation. - USE_LIBPATH=yes +# be set for any libpath-using emulation; NATIVE will be set for a +# emulation to enable 'LD_LIBRARY_PATH=/foo:/bar ld -lfooz' + if [ "x${host}" = "x${target}" ] ; then + NATIVE=yes + fi + USE_LIBPATH=yes # Set the library search path, for libraries named by -lfoo. # If LIB_PATH is defined (e.g., by Makefile) and non-empty, it is used. ==== //depot/projects/hammer/gnu/usr.bin/cc/cc_int/Makefile#17 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/cc_int/Makefile,v 1.51 2007/05/19 04:25:57 kan Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/cc_int/Makefile,v 1.52 2007/09/18 23:34:42 cognet Exp $ .include "../Makefile.inc" .include "../Makefile.ver" @@ -75,6 +75,10 @@ # Target specific, C specific object file C_TARGET_OBJS= +.if ${TARGET_ARCH} == "arm" && defined(TARGET_BIG_ENDIAN) +CFLAGS += -DTARGET_ENDIAN_DEFAULT=MASK_BIG_END +.endif + # Language-specific object files for C and Objective C. C_AND_OBJC_OBJS = attribs.o c-errors.o c-lex.o c-pragma.o c-decl.o c-typeck.o \ c-convert.o c-aux-info.o c-common.o c-opts.o c-format.o c-semantics.o \ ==== //depot/projects/hammer/gnu/usr.bin/man/man/man.c#6 (text+ko) ==== @@ -16,7 +16,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/gnu/usr.bin/man/man/man.c,v 1.63 2005/12/05 14:22:11 ru Exp $"; + "$FreeBSD: src/gnu/usr.bin/man/man/man.c,v 1.65 2007/09/25 21:41:22 edwin Exp $"; #endif /* not lint */ #define MAN_MAIN @@ -884,11 +884,26 @@ next: +#if HAVE_LIBZ > 0 + if ((fp = gzopen (ult, "r")) == NULL) + { + /* check for the compressed version too */ + strlcat(ult, ".gz", FILENAME_MAX); + if ((fp = gzopen (ult, "r")) == NULL) + return ult; /* we munged it, but it doesn't exist anyway */ + } +#else if ((fp = fopen (ult, "r")) == NULL) return ult; +#endif +#if HAVE_LIBZ > 0 + end = gzgets (fp, buf, BUFSIZ); + gzclose(fp); +#else end = fgets (buf, BUFSIZ, fp); fclose(fp); +#endif if (!end || strlen (buf) < 5) return ult; ==== //depot/projects/hammer/gnu/usr.bin/texinfo/info/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/texinfo/info/Makefile,v 1.13 2002/06/05 06:58:32 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/texinfo/info/Makefile,v 1.14 2007/09/19 14:21:18 obrien Exp $ PROG= info MAN= info.1 info.5 texinfo.5 @@ -8,7 +8,7 @@ infomap.c m-x.c man.c nodemenu.c nodes.c search.c session.c \ signals.c terminal.c tilde.c variables.c window.c -CFLAGS+= -DINFODIR=\"${INFODIR}:/usr/local/info:/usr/X11R6/info:.\" +CFLAGS+= -DINFODIR=\"${INFODIR}:/usr/local/info:.\" DPADD= ${LIBTERMCAP} ${LIBTXI} LDADD= -ltermcap ${LIBTXI} ==== //depot/projects/hammer/include/Makefile#70 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.274 2007/07/14 21:49:22 rwatson Exp $ +# $FreeBSD: src/include/Makefile,v 1.275 2007/09/23 07:34:21 pjd Exp $ # # Doing a "make install" builds /usr/include. @@ -48,7 +48,7 @@ fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs \ ${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/unionfs \ geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \ - geom/mirror geom/nop geom/raid3 geom/shsec geom/stripe \ + geom/mirror geom/nop geom/raid3 geom/shsec geom/stripe geom/virstor \ netgraph/atm netgraph/netflow \ security/audit \ security/mac_biba security/mac_bsdextended security/mac_lomac \ ==== //depot/projects/hammer/lib/libarchive/archive_read.3#25 (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_read.3,v 1.34 2007/05/29 01:00:18 kientzle Exp $ +.\" $FreeBSD: src/lib/libarchive/archive_read.3,v 1.35 2007/09/19 16:37:45 kientzle Exp $ .\" .Dd August 19, 2006 .Dt archive_read 3 @@ -267,7 +267,7 @@ The .Va flags argument is passed unmodified to -.Xr archiv_write_disk_set_options 3 . +.Xr archive_write_disk_set_options 3 . .It Fn archive_read_extract_set_progress_callback Sets a pointer to a user-defined callback that can be used for updating progress displays during extraction. ==== //depot/projects/hammer/lib/libarchive/archive_write_disk.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.14 2007/08/12 17:35:05 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.17 2007/09/21 04:52:42 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> @@ -448,8 +448,10 @@ __archive_check_magic(&a->archive, ARCHIVE_WRITE_DISK_MAGIC, ARCHIVE_STATE_DATA, "archive_write_disk_block"); - if (a->fd < 0) - return (ARCHIVE_OK); + if (a->fd < 0) { + archive_set_error(&a->archive, 0, "File not open"); + return (ARCHIVE_WARN); + } archive_clear_error(&a->archive); /* Seek if necessary to the specified offset. */ @@ -478,12 +480,17 @@ _archive_write_data(struct archive *_a, const void *buff, size_t size) { struct archive_write_disk *a = (struct archive_write_disk *)_a; + int r; + __archive_check_magic(&a->archive, ARCHIVE_WRITE_DISK_MAGIC, ARCHIVE_STATE_DATA, "archive_write_data"); if (a->fd < 0) return (ARCHIVE_OK); - return (_archive_write_data_block(_a, buff, size, a->offset)); + r = _archive_write_data_block(_a, buff, size, a->offset); + if (r < ARCHIVE_OK) + return (r); + return (size); } static int ==== //depot/projects/hammer/lib/libarchive/test/test_write_disk.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk.c,v 1.3 2007/07/06 15:43:11 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk.c,v 1.6 2007/09/21 04:52:43 kientzle Exp $"); #if ARCHIVE_VERSION_STAMP >= 1009000 @@ -50,8 +50,76 @@ st.st_mode, archive_entry_mode(ae)); assert(st.st_mode == (archive_entry_mode(ae) & ~UMASK)); } + +static void create_reg_file(struct archive_entry *ae, const char *msg) +{ + static const char data[]="abcdefghijklmnopqrstuvwxyz"; + struct archive *ad; + struct stat st; + + /* Write the entry to disk. */ + assert((ad = archive_write_disk_new()) != NULL); + failure("%s", msg); + assertEqualIntA(ad, 0, archive_write_header(ad, ae)); + assertEqualInt(sizeof(data), archive_write_data(ad, data, sizeof(data))); + assertEqualIntA(ad, 0, archive_write_finish_entry(ad)); +#if ARCHIVE_API_VERSION > 1 + assertEqualInt(0, archive_write_finish(ad)); +#else + archive_write_finish(ad); #endif + /* Test the entries on disk. */ + assert(0 == stat(archive_entry_pathname(ae), &st)); + failure("st.st_mode=%o archive_entry_mode(ae)=%o", + st.st_mode, archive_entry_mode(ae)); + assertEqualInt(st.st_mode, (archive_entry_mode(ae) & ~UMASK)); + assertEqualInt(st.st_size, sizeof(data)); +} + +static void create_reg_file2(struct archive_entry *ae, const char *msg) +{ + const int datasize = 100000; + char *data; + char *compare; + struct archive *ad; + struct stat st; + int i, fd; + data = malloc(datasize); + for (i = 0; i < datasize; i++) + data[i] = (char)(i % 256); + + /* Write the entry to disk. */ + assert((ad = archive_write_disk_new()) != NULL); + failure("%s", msg); + assertEqualIntA(ad, 0, archive_write_header(ad, ae)); + for (i = 0; i < datasize - 999; i += 1000) { + assertEqualIntA(ad, ARCHIVE_OK, + archive_write_data_block(ad, data + i, 1000, i)); + } + assertEqualIntA(ad, 0, archive_write_finish_entry(ad)); +#if ARCHIVE_API_VERSION > 1 + assertEqualInt(0, archive_write_finish(ad)); +#else + archive_write_finish(ad); +#endif + /* Test the entries on disk. */ + assert(0 == stat(archive_entry_pathname(ae), &st)); + failure("st.st_mode=%o archive_entry_mode(ae)=%o", + st.st_mode, archive_entry_mode(ae)); + assertEqualInt(st.st_mode, (archive_entry_mode(ae) & ~UMASK)); + assertEqualInt(st.st_size, i); + + compare = malloc(datasize); + fd = open(archive_entry_pathname(ae), O_RDONLY); + assertEqualInt(datasize, read(fd, compare, datasize)); + close(fd); + assert(memcmp(compare, data, datasize) == 0); + free(compare); + free(data); +} +#endif + DEFINE_TEST(test_write_disk) { #if ARCHIVE_VERSION_STAMP < 1009000 @@ -66,7 +134,14 @@ assert((ae = archive_entry_new()) != NULL); archive_entry_copy_pathname(ae, "file"); archive_entry_set_mode(ae, S_IFREG | 0755); - create(ae, "Test creating a regular file"); + create_reg_file(ae, "Test creating a regular file"); + archive_entry_free(ae); + + /* Another regular file. */ + assert((ae = archive_entry_new()) != NULL); + archive_entry_copy_pathname(ae, "file2"); + archive_entry_set_mode(ae, S_IFREG | 0755); + create_reg_file2(ae, "Test creating another regular file"); archive_entry_free(ae); /* A regular file over an existing file */ ==== //depot/projects/hammer/lib/libc/net/sctp_connectx.3#3 (text+ko) ==== @@ -29,14 +29,14 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/net/sctp_connectx.3,v 1.5 2007/06/19 16:29:46 brueffer Exp $ +.\" $FreeBSD: src/lib/libc/net/sctp_connectx.3,v 1.6 2007/09/25 16:48:08 brueffer Exp $ .\" .Dd June 19, 2007 .Dt SCTP_CONNECTX 3 .Os .Sh NAME .Nm sctp_connectx -.Nd connect an sctp socket with multiple destination addresses. +.Nd connect an SCTP socket with multiple destination addresses. .Sh LIBRARY .Lb libc .Sh SYNOPSIS ==== //depot/projects/hammer/lib/libc/net/sctp_opt_info.3#3 (text+ko) ==== @@ -30,14 +30,14 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)send.2 8.2 (Berkeley) 2/21/94 -.\" $FreeBSD: src/lib/libc/net/sctp_opt_info.3,v 1.3 2007/06/18 10:20:32 brueffer Exp $ +.\" $FreeBSD: src/lib/libc/net/sctp_opt_info.3,v 1.4 2007/09/25 16:48:08 brueffer Exp $ .\" .Dd December 15, 2006 .Dt SCTP_OPT_INFO 3 .Os .Sh NAME .Nm sctp_opt_info -.Nd get sctp socket information +.Nd get SCTP socket information .Sh LIBRARY .Lb libc .Sh SYNOPSIS ==== //depot/projects/hammer/lib/libc/net/sctp_recvmsg.3#3 (text+ko) ==== @@ -29,14 +29,14 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/net/sctp_recvmsg.3,v 1.3 2007/06/18 10:20:32 brueffer Exp $ +.\" $FreeBSD: src/lib/libc/net/sctp_recvmsg.3,v 1.5 2007/09/25 16:48:08 brueffer Exp $ .\" -.Dd December 15, 2006 +.Dd August 13, 2007 .Dt SCTP_RECVMSG 3 .Os .Sh NAME .Nm sctp_recvmsg -.Nd send a message from an SCTP socket +.Nd receive a message from an SCTP socket .Sh LIBRARY .Lb libc .Sh SYNOPSIS @@ -60,8 +60,8 @@ .Fn connect call or after the application has performed a .Fn listen -followed by a sucessful -.Fn accept +followed by a successful +.Fn accept . For a one-to-many (SOCK_SEQPACKET) type socket, an endpoint may call .Fn sctp_recvmsg after having implicitly started an association via one @@ -73,7 +73,7 @@ Or, an application may also receive a message after having called .Fn listen -with a postive backlog to enable the reception of new associations. +with a positive backlog to enable the reception of new associations. .Pp The address of the sender is held in the .Fa from @@ -99,7 +99,9 @@ If the message is too long to fit in the users receive buffer, then the .Fa flags -argument will NOT have the +argument will +.Em not +have the .Dv MSG_EOF flag applied. If the message is a complete message then @@ -117,7 +119,9 @@ argument may also hold the value .Dv MSG_NOTIFICATION . When this -occurs this indicates that the message received is NOT from +occurs it indicates that the message received is +.Em not +from the peer endpoint, but instead is a notification from the SCTP stack (see .Xr sctp 4 @@ -194,7 +198,9 @@ The .Fa sinfo->sinfo_ssn will hold the stream sequence number assigned -by the peer endpoint if the message is NOT unordered. +by the peer endpoint if the message is +.Em not +unordered. For unordered messages this field holds an undefined value. .Pp The @@ -203,8 +209,8 @@ to this message by the peer endpoint. For messages that fit in or less than the path MTU this will be the only TSN assigned. -Note that for messages that span multiple TSN's this -value will be one of the TSN's that was used on the +Note that for messages that span multiple TSNs this +value will be one of the TSNs that was used on the message. .Pp The @@ -224,8 +230,7 @@ It is also quite useful in setting various socket options on the specific association (see -.Xr sctp 4 -). +.Xr sctp 4 ) . .Pp The .Fa sinfo->info_timetolive ==== //depot/projects/hammer/lib/libc/net/sctp_send.3#3 (text+ko) ==== @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/net/sctp_send.3,v 1.3 2007/06/18 10:20:32 brueffer Exp $ +.\" $FreeBSD: src/lib/libc/net/sctp_send.3,v 1.4 2007/09/25 16:48:08 brueffer Exp $ .\" .Dd December 15, 2006 .Dt SCTP_SEND 3 @@ -75,10 +75,10 @@ the message is not transmitted. .Pp No indication of failure to deliver is implicit in a -.Fn sctp_send +.Fn sctp_send . Locally detected errors are indicated by a return value of -1. .Pp -If no messages space is available at the socket to hold +If no space is available at the socket to hold the message to be transmitted, then .Fn sctp_send normally blocks, unless the socket has been placed in @@ -111,8 +111,7 @@ argument is an opaque 32 bit value that is passed transparently through the stack to the peer endpoint. It will be available on reception of a message (see -.Xr sctp_recvmsg 2 -). +.Xr sctp_recvmsg 2 ) . Note that the stack passes this value without regard to byte order. .Pp @@ -174,7 +173,7 @@ Note that this mechanism is quite efficent and makes only one actual copy of the data which is shared by all the associations for sending. .Pp -The remaining flags are used for the partial reliabilty extension (RFC3758) +The remaining flags are used for the partial reliability extension (RFC3758) and will only be effective if the peer endpoint supports this extension. This option specifies what local policy the local endpoint should use in skipping data. @@ -182,7 +181,7 @@ never skipped over. .Pp .Dv SCTP_PR_SCTP_TTL -Is used to indicate that a time based lifetime is being applied +is used to indicate that a time based lifetime is being applied to the data. The .Fa sinfo->sinfo_timetolive @@ -206,7 +205,8 @@ send queue. If that number or more bytes are in queue, then other buffer-based sends are looked to be removed and -skipped. Note that this policy may also result in the data +skipped. +Note that this policy may also result in the data never being sent if no buffer based sends are in queue and the maximum specified by .Fa timetolive @@ -233,16 +233,16 @@ The .Fa sinfo->sinfo_assoc_id field is used to -select the association to send to on an one-to-many socket. +select the association to send to on a one-to-many socket. For a one-to-one socket, this field is ignored. .Pp +The .Fa sinfo->sinfo_context field is used only in the event the message cannot be sent. This is an opaque value that the stack retains and will give to the user when a failed send is given if that notification is enabled (see -.Xr sctp 4 -). +.Xr sctp 4 ) . Normally a user process can use this value to index some application specific data structure when a send cannot be fulfilled. .Pp @@ -275,7 +275,7 @@ Note that all of the addresses will only be used when an implicit association is being set up. This allows the -user the equivilant behavior as doing a +user the equivalent behavior as doing a .Fn sctp_connectx followed by a .Fn sctp_send ==== //depot/projects/hammer/lib/libc/net/sctp_sendmsg.3#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)send.2 8.2 (Berkeley) 2/21/94 -.\" $FreeBSD: src/lib/libc/net/sctp_sendmsg.3,v 1.3 2007/06/18 10:20:32 brueffer Exp $ +.\" $FreeBSD: src/lib/libc/net/sctp_sendmsg.3,v 1.4 2007/09/25 16:48:08 brueffer Exp $ .\" .Dd December 15, 2006 .Dt SCTP_SENDMSG 3 @@ -123,8 +123,7 @@ through the stack to the peer endpoint. It will be available on reception of a message (see -.Xr sctp_recvmsg 2 -). +.Xr sctp_recvmsg 2 ) . Note that the stack passes this value without regard to byte order. .Pp @@ -186,15 +185,15 @@ Note that this mechanism is quite efficent and makes only one actual copy of the data which is shared by all the associations for sending. .Pp -The remaining flags are used for the partial reliabilty extension (RFC3758) +The remaining flags are used for the partial reliability extension (RFC3758) and will only be effective if the peer endpoint supports this extension. -This option specify's what local policy the local endpoint should use +This option specifies what local policy the local endpoint should use in skipping data. If none of these options are set, then data is never skipped over. .Pp .Dv SCTP_PR_SCTP_TTL -Is used to indicate that a time based lifetime is being applied +is used to indicate that a time based lifetime is being applied to the data. The .Fa timetolive @@ -248,30 +247,29 @@ This is an opaque value that the stack retains and will give to the user when a failed send is given if that notification is enabled (see -.Xr sctp 4 -). +.Xr sctp 4 ) . Normally a user process can use this value to index some application specific data structure when a send cannot be fulfilled. .Fn sctp_sendmsgx is identical to .Fn sctp_sendmsg -with the exception that it takes a array of sockaddr structures in the +with the exception that it takes an array of sockaddr structures in the argument .Fa to and adds the additional argument .Fa addrcnt which specifies how many addresses are in the array. This allows a -caller to implictly setup an association passing multiple addresses -as if an +caller to implicitly set up an association passing multiple addresses +as if .Fn sctp_connectx -had been called to setup the association. +had been called to set up the association. .Sh RETURN VALUES The call returns the number of characters sent, or -1 if an error occurred. .Sh ERRORS The -.Fn sctp_sendmsg 2 +.Fn sctp_sendmsg system call fail if: .Bl -tag -width Er @@ -322,8 +320,8 @@ .Xr select 2 , .Xr socket 2 , .Xr write 2 , +.Xr sctp_connectx 3 , .Xr sendmsg 3 , -.Xr sctp_connectx 3 , .Xr sctp 4 .Sh BUGS Because in the one-to-many style socket the ==== //depot/projects/hammer/lib/libc/rpc/auth_time.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/rpc/auth_time.c,v 1.11 2005/03/10 00:57:01 stefanf Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/auth_time.c,v 1.12 2007/09/20 22:35:24 matteo Exp $"); #include "namespace.h" #include <stdio.h> @@ -156,6 +156,7 @@ struct hostent *he; struct hostent dummy; char *ptr[2]; + endpoint *ep; >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200709272230.l8RMUBR0082999>