PERFORCE change 179598 for review
Alexander Motin
mav at FreeBSD.org
Mon Jun 14 12:06:53 UTC 2010
http://p4web.freebsd.org/@@179598?ac=10
Change 179598 by mav at mav_mavbook on 2010/06/14 12:06:37
IFC
Affected files ...
.. //depot/projects/scottl-camlock/src/Makefile#8 integrate
.. //depot/projects/scottl-camlock/src/Makefile.inc1#23 integrate
.. //depot/projects/scottl-camlock/src/contrib/llvm/tools/clang/lib/Basic/Version.cpp#2 integrate
.. //depot/projects/scottl-camlock/src/etc/Makefile#9 integrate
.. //depot/projects/scottl-camlock/src/gnu/usr.bin/Makefile#7 integrate
.. //depot/projects/scottl-camlock/src/include/histedit.h#3 integrate
.. //depot/projects/scottl-camlock/src/lib/clang/clang.build.mk#2 integrate
.. //depot/projects/scottl-camlock/src/lib/clang/include/llvm/Config/config.h#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/net/sctp_recvmsg.3#5 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/posix1e/Makefile.inc#7 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/posix1e/acl_id_to_name.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libc/posix1e/acl_support.c#6 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/stdlib/atexit.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libedit/Makefile#5 integrate
.. //depot/projects/scottl-camlock/src/lib/libedit/filecomplete.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libedit/filecomplete.h#1 branch
.. //depot/projects/scottl-camlock/src/lib/libelf/elf_getbase.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libelf/elf_getbase.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libkse/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libkse/arch/amd64/Makefile.inc#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libkse/arch/arm/Makefile.inc#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libkse/arch/i386/Makefile.inc#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libkse/arch/ia64/Makefile.inc#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libkse/arch/powerpc/Makefile.inc#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libkse/arch/sparc64/Makefile.inc#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libkse/support/Makefile.inc#2 integrate
.. //depot/projects/scottl-camlock/src/lib/liblzma/config.h#2 integrate
.. //depot/projects/scottl-camlock/src/lib/msun/Symbol.map#3 integrate
.. //depot/projects/scottl-camlock/src/lib/msun/src/math.h#3 integrate
.. //depot/projects/scottl-camlock/src/lib/msun/src/s_isnan.c#2 integrate
.. //depot/projects/scottl-camlock/src/sbin/camcontrol/modeedit.c#2 integrate
.. //depot/projects/scottl-camlock/src/sbin/ccdconfig/ccdconfig.c#2 integrate
.. //depot/projects/scottl-camlock/src/sbin/gbde/gbde.c#2 integrate
.. //depot/projects/scottl-camlock/src/sbin/gvinum/gvinum.c#4 integrate
.. //depot/projects/scottl-camlock/src/sbin/iscontrol/config.c#2 integrate
.. //depot/projects/scottl-camlock/src/share/mk/bsd.own.mk#10 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/acpica/madt.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/intr_machdep.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/legacy.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/nexus.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/DB-78XXX#6 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/DB-88F5XXX#7 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/DB-88F6XXX#7 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/SHEEVAPLUG#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/include/bootinfo.h#2 delete
.. //depot/projects/scottl-camlock/src/sys/arm/include/fdt.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/include/metadata.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/include/ofw_machdep.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/mv/bus_space.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/mv/common.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/mv/discovery/db78xxx.c#4 delete
.. //depot/projects/scottl-camlock/src/sys/arm/mv/discovery/discovery.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/mv/discovery/files.db78xxx#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/mv/files.mv#5 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/mv/gpio.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/mv/ic.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/mv/kirkwood/db88f6xxx.c#4 delete
.. //depot/projects/scottl-camlock/src/sys/arm/mv/kirkwood/files.db88f6xxx#3 delete
.. //depot/projects/scottl-camlock/src/sys/arm/mv/kirkwood/kirkwood.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/mv/kirkwood/sheevaplug.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/mv/kirkwood/std.db88f6xxx#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/mv/kirkwood/std.sheevaplug#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/mv/mv_machdep.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/mv/mv_pci.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/mv/mv_sata.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/mv/mvreg.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/mv/mvvar.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/mv/mvwin.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/mv/obio.c#2 delete
.. //depot/projects/scottl-camlock/src/sys/arm/mv/orion/db88f5xxx.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/mv/orion/orion.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/mv/rtc.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/mv/timer.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/mv/twsi.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/arm/uboot/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/powerpc/uboot/Makefile#5 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/uboot/common/metadata.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/dev/cyclic/cyclic.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/dev/dtrace/dtrace_debug.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/dev/dtrace/dtrace_load.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/dev/dtrace/i386/dtrace_subr.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linprocfs/linprocfs.c#32 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/ndis/subr_usbd.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/Makefile.arm#14 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files#80 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files.arm#12 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/options.arm#19 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_asus.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_fujitsu.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_hp.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_ibm.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_cpu.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_dock.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_thermal.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_video.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/if_ath.c#38 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_adapter.h#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_main.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_sge.c#24 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_igb.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/fdt/fdt_arm.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/fdt/fdtbus.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mge/if_mge.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mge/if_mgevar.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/pci/pci.c#34 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/pci/pcivar.h#18 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_bus_mbus.c#2 delete
.. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_cpu_mv.c#3 delete
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci_mbus.c#8 delete
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci_mv.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_dev.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_device.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_process.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_run.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_runvar.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clbio.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clcomsubs.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clrpcops.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clsubs.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clvnops.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsserver/nfs_nfsdsocket.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/procfs/procfs_type.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/geom_dev.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/acpica/madt.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/intr_machdep.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/legacy.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/mp_machdep.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/tsc.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/exception.S#11 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/pmap.c#31 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/bus_if.m#11 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_clock.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_conf.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_switch.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_timeout.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/sched_4bsd.c#26 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/sched_ule.c#33 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_bus.c#43 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_kdb.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_lock.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_pcpu.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_smp.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_taskqueue.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/net/flowtable.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_epair.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/net/netisr.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_rssadapt.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_bio.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_subs.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_vnops.c#32 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/aim/mp_cpudep.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/aim/platform_chrp.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/mp_locore.S#8 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/bus.h#20 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/conf.h#19 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/file.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/pcpu.h#19 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/vnode.h#27 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_softdep.c#26 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/uma_core.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/x86/x86/mca.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/x86/x86/msi.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/clang/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/tar/read.c#6 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/tar/write.c#7 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/tftp/extern.h#3 delete
.. //depot/projects/scottl-camlock/src/usr.bin/tftp/tftpsubs.c#3 delete
.. //depot/projects/scottl-camlock/src/usr.bin/tftp/tftpsubs.h#2 delete
.. //depot/projects/scottl-camlock/src/usr.sbin/Makefile#14 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/arp/arp.c#8 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/config/mkmakefile.c#5 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/Makefile#6 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/disks.c#6 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/install.c#6 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/installUpgrade.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/media.c#5 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/sysinstall.h#6 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/system.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/tcpip.c#6 integrate
Differences ...
==== //depot/projects/scottl-camlock/src/Makefile#8 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile,v 1.365 2010/03/18 18:58:17 dougb Exp $
+# $FreeBSD: src/Makefile,v 1.366 2010/06/13 13:02:43 raj Exp $
#
# The user-driven targets are:
#
@@ -89,7 +89,8 @@
obj objlink regress rerelease showconfig tags toolchain update \
_worldtmp _legacy _bootstrap-tools _cleanobj _obj \
_build-tools _cross-tools _includes _libraries _depend \
- build32 distribute32 install32 xdev xdev-build xdev-install
+ build32 builddtb distribute32 install32 xdev xdev-build xdev-install \
+
TGTS+= ${SUBDIR_TARGETS}
BITGTS= files includes
==== //depot/projects/scottl-camlock/src/Makefile.inc1#23 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.651 2010/06/09 19:57:20 rdivacky Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.652 2010/06/13 13:02:43 raj Exp $
#
# Make command line options:
# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -968,6 +968,10 @@
lib/libdwarf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge
.endif
+.if ${MK_FDT} != "no"
+_dtc= gnu/usr.bin/dtc
+.endif
+
bootstrap-tools:
.for _tool in \
${_clang_tblgen} \
@@ -976,6 +980,7 @@
${_gperf} \
${_groff} \
${_ar} \
+ ${_dtc} \
usr.bin/lorder \
usr.bin/makewhatis \
${_mklocale} \
@@ -1448,3 +1453,39 @@
../../../../usr/bin/${XDDIR}${OSREL}-$$i; \
done
.endif
+
+.if !empty(KRNLOBJDIR) && !empty(KERNCONF)
+DTBOUTPUTPATH= ${KRNLOBJDIR}/${KERNCONF}/
+
+.if !defined(FDT_DTS_FILE) || empty(FDT_DTS_FILE)
+FDT_DTS_FILE!= grep "^makeoptions[[:space:]]\+FDT_DTS_FILE" \
+ ${KERNCONFDIR}/${KERNCONF} 2> /dev/null | cut -d= -f2
+.endif
+
+.endif
+
+.if !defined(DTBOUTPUTPATH) || !exists(${DTBOUTPUTPATH})
+DTBOUTPUTPATH= ${.CURDIR}
+.endif
+
+#
+# Build 'standalone' Device Tree Blob
+#
+builddtb:
+ @if [ "${FDT_DTS_FILE}" = "" ]; then \
+ echo "ERROR: FDT_DTS_FILE must be specified!"; \
+ exit 1; \
+ fi; \
+ if [ ! -f ${.CURDIR}/sys/boot/fdt/dts/${FDT_DTS_FILE} ]; then \
+ echo "ERROR: Specified DTS file (${FDT_DTS_FILE}) does not \
+ exist!"; \
+ exit 1; \
+ fi; \
+ if [ "${DTBOUTPUTPATH}" = "${.CURDIR}" ]; then \
+ echo "WARNING: DTB will be placed in the current working \
+ directory"; \
+ fi
+ @PATH=${TMPPATH} \
+ dtc -O dtb -o \
+ ${DTBOUTPUTPATH}/`echo ${FDT_DTS_FILE} | cut -d. -f1`.dtb -b 0 \
+ -p 1024 ${.CURDIR}/sys/boot/fdt/dts/${FDT_DTS_FILE}
==== //depot/projects/scottl-camlock/src/contrib/llvm/tools/clang/lib/Basic/Version.cpp#2 (text+ko) ====
@@ -70,6 +70,9 @@
#endif
OS << "clang version " CLANG_VERSION_STRING " ("
<< getClangFullRepositoryVersion() << ')';
+#ifdef CLANG_VENDOR_SUFFIX
+ OS << CLANG_VENDOR_SUFFIX;
+#endif
return OS.str();
}
==== //depot/projects/scottl-camlock/src/etc/Makefile#9 (text+ko) ====
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.11 (Berkeley) 5/21/91
-# $FreeBSD: src/etc/Makefile,v 1.382 2010/05/19 23:56:26 jkim Exp $
+# $FreeBSD: src/etc/Makefile,v 1.383 2010/06/13 16:35:20 imp Exp $
.include <bsd.own.mk>
@@ -22,8 +22,12 @@
.if exists(${.CURDIR}/etc.${MACHINE}/ttys)
BIN1+= etc.${MACHINE}/ttys
+.elif exists(${.CURDIR}/etc.${MACHINE_ARCH}/ttys)
+BIN1+= etc.${MACHINE_ARCH}/ttys
+.elif exists(${.CURDIR}/etc.${MACHINE_CPUARCH}/ttys)
+BIN1+= etc.${MACHINE_CPUARCH}/ttys
.else
-BIN1+= etc.${MACHINE_ARCH}/ttys
+.error etc.MACHINE/ttys missing
.endif
OPENBSMDIR= ${.CURDIR}/../contrib/openbsm
==== //depot/projects/scottl-camlock/src/gnu/usr.bin/Makefile#7 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.103 2010/05/19 23:56:26 jkim Exp $
+# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.104 2010/06/13 13:02:43 raj Exp $
.include <bsd.own.mk>
@@ -8,6 +8,7 @@
dialog \
diff \
diff3 \
+ ${_dtc} \
${_gdb} \
${_gperf} \
${_grep} \
@@ -31,6 +32,10 @@
_cvs= cvs
.endif
+.if ${MK_FDT} != "no"
+_dtc= dtc
+.endif
+
.if ${MK_GNU_GREP} != "no"
_grep= grep
.endif
==== //depot/projects/scottl-camlock/src/include/histedit.h#3 (text+ko) ====
@@ -31,7 +31,7 @@
*
* @(#)histedit.h 8.2 (Berkeley) 1/3/94
* $NetBSD: histedit.h,v 1.32 2007/06/10 20:20:28 christos Exp $
- * $FreeBSD: src/include/histedit.h,v 1.12 2007/06/11 06:25:19 stefanf Exp $
+ * $FreeBSD: src/include/histedit.h,v 1.13 2010/06/13 17:04:42 jilles Exp $
*/
/*
@@ -105,9 +105,7 @@
*/
int el_set(EditLine *, int, ...);
int el_get(EditLine *, int, ...);
-#if 0
unsigned char _el_fn_complete(EditLine *, int);
-#endif
/*
* el_set/el_get parameters
==== //depot/projects/scottl-camlock/src/lib/clang/clang.build.mk#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/clang/clang.build.mk,v 1.2 2010/06/10 12:06:35 ed Exp $
+# $FreeBSD: src/lib/clang/clang.build.mk,v 1.5 2010/06/14 06:23:47 ed Exp $
CLANG_SRCS=${LLVM_SRCS}/tools/clang
@@ -8,10 +8,16 @@
-DLLVM_ON_UNIX -DLLVM_ON_FREEBSD \
-D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS #-DNDEBUG
+# Correct for gcc miscompilation when compiling on PPC with -O2
+.if ${MACHINE_ARCH} == "powerpc"
+CFLAGS+= -O1
+.endif
+
TARGET_ARCH?= ${MACHINE_ARCH}
# XXX: 8.0, to keep __FreeBSD_cc_version happy
CFLAGS+=-DLLVM_HOSTTRIPLE=\"${TARGET_ARCH}-undermydesk-freebsd9.0\" \
- -DCLANG_VENDOR=\"clang\ r104832\ 20100610\ [FreeBSD]\\n\"
+ -DCLANG_VENDOR=\"FreeBSD\ \" -DSVN_REVISION=\"104832\" \
+ -DCLANG_VENDOR_SUFFIX=\"\ 20100614\"
.PATH: ${LLVM_SRCS}/${SRCDIR}
==== //depot/projects/scottl-camlock/src/lib/clang/include/llvm/Config/config.h#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/lib/clang/include/llvm/Config/config.h,v 1.2 2010/06/10 12:15:09 ed Exp $ */
+/* $FreeBSD: src/lib/clang/include/llvm/Config/config.h,v 1.3 2010/06/13 12:39:22 ed Exp $ */
/* include/llvm/Config/config.h. Generated from config.h.in by configure. */
/* include/llvm/Config/config.h.in. Generated from autoconf/configure.ac by autoheader. */
@@ -270,7 +270,7 @@
#define HAVE_OPENDIR 1
/* Define to 1 if you have the `posix_spawn' function. */
-#define HAVE_POSIX_SPAWN 1
+/* #undef HAVE_POSIX_SPAWN */
/* Define to 1 if you have the `powf' function. */
#define HAVE_POWF 1
==== //depot/projects/scottl-camlock/src/lib/libc/net/sctp_recvmsg.3#5 (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_recvmsg.3,v 1.7 2010/01/31 21:45:14 brucec Exp $
+.\" $FreeBSD: src/lib/libc/net/sctp_recvmsg.3,v 1.8 2010/06/11 18:43:55 brucec Exp $
.\"
.Dd August 13, 2007
.Dt SCTP_RECVMSG 3
@@ -238,7 +238,7 @@
field is not used by
.Fn sctp_recvmsg .
.Sh RETURN VALUES
-The call returns the number of characters sent, or -1
+The call returns the number of bytes received, or -1
if an error occurred.
.Sh ERRORS
The
==== //depot/projects/scottl-camlock/src/lib/libc/posix1e/Makefile.inc#7 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libc/posix1e/Makefile.inc,v 1.24 2010/01/02 20:27:14 ed Exp $
+# $FreeBSD: src/lib/libc/posix1e/Makefile.inc,v 1.25 2010/06/14 02:26:13 kientzle Exp $
.PATH: ${.CURDIR}/posix1e
@@ -20,6 +20,7 @@
acl_from_text.c \
acl_from_text_nfs4.c \
acl_get.c \
+ acl_id_to_name.c \
acl_init.c \
acl_perm.c \
acl_set.c \
==== //depot/projects/scottl-camlock/src/lib/libc/posix1e/acl_support.c#6 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_support.c,v 1.19 2010/06/03 14:29:17 trasz Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_support.c,v 1.20 2010/06/14 02:26:13 kientzle Exp $");
#include <sys/types.h>
#include "namespace.h"
@@ -269,61 +269,6 @@
return (0);
}
-
-/*
- * Given a uid/gid, return a username/groupname for the text form of an ACL.
- * Note that we truncate user and group names, rather than error out, as
- * this is consistent with other tools manipulating user and group names.
- * XXX NOT THREAD SAFE, RELIES ON GETPWUID, GETGRGID
- * XXX USES *PW* AND *GR* WHICH ARE STATEFUL AND THEREFORE THIS ROUTINE
- * MAY HAVE SIDE-EFFECTS
- */
-int
-_posix1e_acl_id_to_name(acl_tag_t tag, uid_t id, ssize_t buf_len, char *buf,
- int flags)
-{
- struct group *g;
- struct passwd *p;
- int i;
-
- switch(tag) {
- case ACL_USER:
- if (flags & ACL_TEXT_NUMERIC_IDS)
- p = NULL;
- else
- p = getpwuid(id);
- if (!p)
- i = snprintf(buf, buf_len, "%d", id);
- else
- i = snprintf(buf, buf_len, "%s", p->pw_name);
-
- if (i < 0) {
- errno = ENOMEM;
- return (-1);
- }
- return (0);
-
- case ACL_GROUP:
- if (flags & ACL_TEXT_NUMERIC_IDS)
- g = NULL;
- else
- g = getgrgid(id);
- if (g == NULL)
- i = snprintf(buf, buf_len, "%d", id);
- else
- i = snprintf(buf, buf_len, "%s", g->gr_name);
-
- if (i < 0) {
- errno = ENOMEM;
- return (-1);
- }
- return (0);
-
- default:
- return (EINVAL);
- }
-}
-
/*
* Given a right-shifted permission (i.e., direct ACL_PERM_* mask), fill
* in a string describing the permissions.
==== //depot/projects/scottl-camlock/src/lib/libc/stdlib/atexit.c#2 (text+ko) ====
@@ -34,7 +34,7 @@
static char sccsid[] = "@(#)atexit.c 8.2 (Berkeley) 7/3/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/atexit.c,v 1.8 2007/01/09 00:28:09 imp Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/atexit.c,v 1.9 2010/06/13 01:13:36 cperciva Exp $");
#include "namespace.h"
#include <stddef.h>
@@ -54,6 +54,7 @@
#define _MUTEX_LOCK(x) if (__isthreaded) _pthread_mutex_lock(x)
#define _MUTEX_UNLOCK(x) if (__isthreaded) _pthread_mutex_unlock(x)
+#define _MUTEX_DESTROY(x) if (__isthreaded) _pthread_mutex_destroy(x)
struct atexit {
struct atexit *next; /* next in list */
@@ -182,4 +183,6 @@
}
}
_MUTEX_UNLOCK(&atexit_mutex);
+ if (dso == NULL)
+ _MUTEX_DESTROY(&atexit_mutex);
}
==== //depot/projects/scottl-camlock/src/lib/libedit/Makefile#5 (text+ko) ====
@@ -1,12 +1,13 @@
# $NetBSD: Makefile,v 1.34 2005/05/28 12:02:53 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libedit/Makefile,v 1.33 2010/01/02 09:58:07 ed Exp $
+# $FreeBSD: src/lib/libedit/Makefile,v 1.34 2010/06/13 17:04:42 jilles Exp $
LIB= edit
SHLIB_MAJOR= 7
SHLIBDIR?= /lib
-OSRCS= chared.c common.c el.c emacs.c fcns.c help.c hist.c key.c map.c \
+OSRCS= chared.c common.c el.c emacs.c fcns.c filecomplete.c help.c \
+ hist.c key.c map.c \
parse.c prompt.c read.c refresh.c search.c sig.c term.c tty.c vi.c
DPADD= ${LIBNCURSES}
==== //depot/projects/scottl-camlock/src/lib/libelf/elf_getbase.3#3 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2006 Joseph Koshy. All rights reserved.
+.\" Copyright (c) 2006,2008,2010 Joseph Koshy. All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -21,9 +21,9 @@
.\" out of the use of this software, even if advised of the possibility of
.\" such damage.
.\"
-.\" $FreeBSD: src/lib/libelf/elf_getbase.3,v 1.3 2010/04/14 19:08:06 uqs Exp $
+.\" $FreeBSD: src/lib/libelf/elf_getbase.3,v 1.4 2010/06/13 10:58:50 kaiw Exp $
.\"
-.Dd June 11, 2006
+.Dd June 6, 2010
.Dt ELF_GETBASE 3
.Os
.Sh NAME
@@ -38,17 +38,21 @@
.Sh DESCRIPTION
Function
.Fn elf_getbase
-returns the file offset in the containing archive of the first byte of
-the file referenced by ELF descriptor
+returns the file offset to the first byte of the object referenced by ELF
+descriptor
.Ar elf .
+.Pp
+For descriptors referencing members of archives, the returned offset is
+the file offset of the member in its containing archive.
+For descriptors to regular objects, the returned offset is (vacuously)
+zero.
.Sh RETURN VALUES
Function
.Fn elf_getbase
-returns a valid file offset into the containing archive if successful.
-It returns -1 if argument
-.Ar elf
-is NULL or is not a member of an
-archive.
+returns a valid file offset if successful, or
+.Pq Vt off_t
+.Li -1
+in case of an error.
.Sh ERRORS
Function
.Fn elf_getbase
@@ -57,7 +61,7 @@
.It Bq Er ELF_E_ARGUMENT
Argument
.Ar elf
-is not an ELF descriptor for an archive member.
+was NULL.
.El
.Sh SEE ALSO
.Xr elf 3 ,
==== //depot/projects/scottl-camlock/src/lib/libelf/elf_getbase.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libelf/elf_getbase.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $");
+__FBSDID("$FreeBSD: src/lib/libelf/elf_getbase.c,v 1.2 2010/06/13 10:58:50 kaiw Exp $");
#include <libelf.h>
@@ -34,12 +34,14 @@
off_t
elf_getbase(Elf *e)
{
- if (e == NULL ||
- e->e_parent == NULL) {
+ if (e == NULL) {
LIBELF_SET_ERROR(ARGUMENT, 0);
- return (off_t) -1;
+ return ((off_t) -1);
}
+ if (e->e_parent == NULL)
+ return ((off_t) 0);
+
return ((off_t) ((uintptr_t) e->e_rawfile -
(uintptr_t) e->e_parent->e_rawfile));
}
==== //depot/projects/scottl-camlock/src/lib/libkse/Makefile#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libkse/Makefile,v 1.74 2010/02/15 14:14:13 ru Exp $
+# $FreeBSD: src/lib/libkse/Makefile,v 1.75 2010/06/13 01:27:29 imp Exp $
#
# All library objects contain FreeBSD revision strings by default; they may be
# excluded as a space-saving measure. To produce a library that does
@@ -15,10 +15,10 @@
CFLAGS+=-DPTHREAD_KERNEL
CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \
-I${.CURDIR}/../../include
-CFLAGS+=-I${.CURDIR}/arch/${MACHINE_ARCH}/include
+CFLAGS+=-I${.CURDIR}/arch/${MACHINE_CPUARCH}/include
CFLAGS+=-I${.CURDIR}/sys
CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf
-CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf/${MACHINE_ARCH}
+CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf/${MACHINE_CPUARCH}
CFLAGS+=-fno-builtin
# Uncomment this if you want libkse to contain debug information for
@@ -38,7 +38,9 @@
PRECIOUSLIB=
-.include "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc"
+.path: ${.CURDIR}/arch/${MACHINE_CPUARCH}/${MACHINE_CPUARCH}
+
+.include "${.CURDIR}/arch/${MACHINE_CPUARCH}/Makefile.inc"
.include "${.CURDIR}/support/Makefile.inc"
.include "${.CURDIR}/sys/Makefile.inc"
.include "${.CURDIR}/thread/Makefile.inc"
==== //depot/projects/scottl-camlock/src/lib/libkse/arch/amd64/Makefile.inc#2 (text+ko) ====
@@ -1,5 +1,3 @@
-# $FreeBSD: src/lib/libkse/arch/amd64/Makefile.inc,v 1.3 2007/10/09 13:42:22 obrien Exp $
-
-.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
+# $FreeBSD: src/lib/libkse/arch/amd64/Makefile.inc,v 1.4 2010/06/13 01:27:29 imp Exp $
SRCS+= context.S enter_uts.S pthread_md.c
==== //depot/projects/scottl-camlock/src/lib/libkse/arch/arm/Makefile.inc#2 (text+ko) ====
@@ -1,6 +1,4 @@
-# $FreeBSD: src/lib/libkse/arch/arm/Makefile.inc,v 1.3 2007/10/09 13:42:22 obrien Exp $
-
-.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
+# $FreeBSD: src/lib/libkse/arch/arm/Makefile.inc,v 1.4 2010/06/13 01:27:29 imp Exp $
CFLAGS+=-DSYSTEM_SCOPE_ONLY
==== //depot/projects/scottl-camlock/src/lib/libkse/arch/i386/Makefile.inc#2 (text+ko) ====
@@ -1,5 +1,3 @@
-# $FreeBSD: src/lib/libkse/arch/i386/Makefile.inc,v 1.4 2007/10/09 13:42:23 obrien Exp $
-
-.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
+# $FreeBSD: src/lib/libkse/arch/i386/Makefile.inc,v 1.5 2010/06/13 01:27:29 imp Exp $
SRCS+= thr_enter_uts.S thr_getcontext.S pthread_md.c
==== //depot/projects/scottl-camlock/src/lib/libkse/arch/ia64/Makefile.inc#2 (text+ko) ====
@@ -1,5 +1,3 @@
-# $FreeBSD: src/lib/libkse/arch/ia64/Makefile.inc,v 1.5 2007/10/09 13:42:24 obrien Exp $
-
-.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
+# $FreeBSD: src/lib/libkse/arch/ia64/Makefile.inc,v 1.6 2010/06/13 01:27:29 imp Exp $
SRCS+= context.S enter_uts.S pthread_md.c
==== //depot/projects/scottl-camlock/src/lib/libkse/arch/powerpc/Makefile.inc#2 (text+ko) ====
@@ -1,8 +1,6 @@
-# $FreeBSD: src/lib/libkse/arch/powerpc/Makefile.inc,v 1.2 2007/10/09 13:42:24 obrien Exp $
+# $FreeBSD: src/lib/libkse/arch/powerpc/Makefile.inc,v 1.3 2010/06/13 01:27:29 imp Exp $
# XXX temporary
CFLAGS+=-DSYSTEM_SCOPE_ONLY
-.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
-
SRCS+= enter_uts.S context.S pthread_md.c
==== //depot/projects/scottl-camlock/src/lib/libkse/arch/sparc64/Makefile.inc#2 (text+ko) ====
@@ -1,5 +1,3 @@
-# $FreeBSD: src/lib/libkse/arch/sparc64/Makefile.inc,v 1.2 2007/10/09 13:42:25 obrien Exp $
-
-.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
+# $FreeBSD: src/lib/libkse/arch/sparc64/Makefile.inc,v 1.3 2010/06/13 01:27:29 imp Exp $
SRCS+= pthread_md.c thr_getcontext.S
==== //depot/projects/scottl-camlock/src/lib/libkse/support/Makefile.inc#2 (text+ko) ====
@@ -1,9 +1,9 @@
-# $FreeBSD: src/lib/libkse/support/Makefile.inc,v 1.9 2007/10/09 13:42:25 obrien Exp $
+# $FreeBSD: src/lib/libkse/support/Makefile.inc,v 1.10 2010/06/13 01:27:29 imp Exp $
.PATH: ${.CURDIR}/support ${.CURDIR}/../libc/gen ${.CURDIR}/../libc/string
-.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/sys
+.PATH: ${.CURDIR}/../libc/${MACHINE_CPUARCH}/sys
-CFLAGS+= -I${.CURDIR}/../libc/${MACHINE_ARCH}
+CFLAGS+= -I${.CURDIR}/../libc/${MACHINE_CPUARCH}
SYSCALLS= clock_gettime \
kse_create \
==== //depot/projects/scottl-camlock/src/lib/liblzma/config.h#2 (text+ko) ====
@@ -1,4 +1,4 @@
-// $FreeBSD: src/lib/liblzma/config.h,v 1.1 2010/05/10 06:59:50 mm Exp $
+// $FreeBSD: src/lib/liblzma/config.h,v 1.2 2010/06/11 22:29:49 delphij Exp $
#define ASSUME_RAM 128
#define HAVE_CHECK_CRC32 1
#define HAVE_CHECK_CRC64 1
@@ -84,6 +84,12 @@
# define __EXTENSIONS__ 1
#endif
#define VERSION "4.999.9beta"
+#if defined(__FreeBSD__)
+#include <machine/endian.h>
+#if _BYTE_ORDER == _BIG_ENDIAN
+# define WORDS_BIGENDIAN 1
+#endif
+#else
#if defined AC_APPLE_UNIVERSAL_BUILD
# if defined __BIG_ENDIAN__
# define WORDS_BIGENDIAN 1
@@ -93,3 +99,4 @@
/* # undef WORDS_BIGENDIAN */
# endif
#endif
+#endif
==== //depot/projects/scottl-camlock/src/lib/msun/Symbol.map#3 (text) ====
@@ -1,5 +1,5 @@
/*
- * $FreeBSD: src/lib/msun/Symbol.map,v 1.21 2008/08/07 15:07:48 das Exp $
+ * $FreeBSD: src/lib/msun/Symbol.map,v 1.22 2010/06/12 17:32:05 das Exp $
*/
/* 7.0-CURRENT */
@@ -218,3 +218,8 @@
cprojf;
cprojl;
};
+
+/* First added in 9.0-CURRENT */
+FBSD_1.2 {
+ __isnanf;
+};
==== //depot/projects/scottl-camlock/src/lib/msun/src/math.h#3 (text+ko) ====
@@ -11,7 +11,7 @@
/*
* from: @(#)fdlibm.h 5.1 93/09/24
- * $FreeBSD: src/lib/msun/src/math.h,v 1.77 2009/03/14 18:58:53 das Exp $
+ * $FreeBSD: src/lib/msun/src/math.h,v 1.78 2010/06/12 17:32:05 das Exp $
*/
#ifndef _MATH_H_
@@ -97,7 +97,7 @@
: (sizeof (x) == sizeof (double)) ? isinf(x) \
: __isinfl(x))
#define isnan(x) \
- ((sizeof (x) == sizeof (float)) ? isnanf(x) \
+ ((sizeof (x) == sizeof (float)) ? __isnanf(x) \
: (sizeof (x) == sizeof (double)) ? isnan(x) \
: __isnanl(x))
#define isnormal(x) \
@@ -179,6 +179,7 @@
int __isfinitel(long double) __pure2;
int __isinff(float) __pure2;
int __isinfl(long double) __pure2;
+int __isnanf(float) __pure2;
int __isnanl(long double) __pure2;
int __isnormalf(float) __pure2;
int __isnormal(double) __pure2;
==== //depot/projects/scottl-camlock/src/lib/msun/src/s_isnan.c#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/msun/src/s_isnan.c,v 1.8 2004/08/05 01:46:11 das Exp $
+ * $FreeBSD: src/lib/msun/src/s_isnan.c,v 1.9 2010/06/12 17:32:05 das Exp $
*/
#include <math.h>
@@ -43,7 +43,7 @@
#endif
int
-isnanf(float f)
+__isnanf(float f)
{
union IEEEf2bits u;
@@ -60,3 +60,5 @@
mask_nbit_l(u);
return (u.bits.exp == 32767 && (u.bits.manl != 0 || u.bits.manh != 0));
}
+
+__weak_reference(__isnanf, isnanf);
==== //depot/projects/scottl-camlock/src/sbin/camcontrol/modeedit.c#2 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/camcontrol/modeedit.c,v 1.17 2004/01/22 07:23:35 grehan Exp $");
+__FBSDID("$FreeBSD: src/sbin/camcontrol/modeedit.c,v 1.18 2010/06/11 17:02:57 uqs Exp $");
#include <sys/queue.h>
#include <sys/types.h>
@@ -394,6 +394,7 @@
SLIST_INIT(&namelist);
+ c = '\0';
depth = 0;
lineno = 0;
found = 0;
==== //depot/projects/scottl-camlock/src/sbin/ccdconfig/ccdconfig.c#2 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/ccdconfig/ccdconfig.c,v 1.37 2006/04/13 20:35:31 cracauer Exp $");
+__FBSDID("$FreeBSD: src/sbin/ccdconfig/ccdconfig.c,v 1.38 2010/06/11 17:03:04 uqs Exp $");
#include <sys/param.h>
#include <sys/linker.h>
@@ -177,11 +177,10 @@
*/
if (action == CCD_UNCONFIG || action == CCD_UNCONFIGALL) {
ex = 0;
- for (i = 0; argc != 0; ) {
+ for (; argc != 0;) {
cp = *argv++; --argc;
if ((ccd = resolve_ccdname(cp)) < 0) {
warnx("invalid ccd name: %s", cp);
- i = 1;
continue;
}
grq = gctl_get_handle();
==== //depot/projects/scottl-camlock/src/sbin/gbde/gbde.c#2 (text+ko) ====
@@ -29,7 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sbin/gbde/gbde.c,v 1.31 2006/02/08 06:52:15 cperciva Exp $
+ * $FreeBSD: src/sbin/gbde/gbde.c,v 1.32 2010/06/11 17:03:04 uqs Exp $
*
* XXX: Future stuff
*
@@ -750,7 +750,7 @@
if (argc < 3)
usage();
- if ((i = modfind("g_bde")) < 0) {
+ if (modfind("g_bde") < 0) {
/* need to load the gbde module */
if (kldload(GBDEMOD) < 0 || modfind("g_bde") < 0)
err(1, GBDEMOD ": Kernel module not available");
==== //depot/projects/scottl-camlock/src/sbin/gvinum/gvinum.c#4 (text+ko) ====
@@ -29,7 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sbin/gvinum/gvinum.c,v 1.14 2010/03/03 21:27:54 lulf Exp $
+ * $FreeBSD: src/sbin/gvinum/gvinum.c,v 1.15 2010/06/11 17:02:57 uqs Exp $
*/
#include <sys/param.h>
@@ -644,6 +644,7 @@
struct gctl_req *req;
int flags, i;
+ flags = 0;
optreset = 1;
optind = 1;
while ((i = getopt(argc, argv, "f")) != -1) {
==== //depot/projects/scottl-camlock/src/sbin/iscontrol/config.c#2 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/iscontrol/config.c,v 1.2 2008/11/25 07:17:11 scottl Exp $");
+__FBSDID("$FreeBSD: src/sbin/iscontrol/config.c,v 1.3 2010/06/11 17:03:04 uqs Exp $");
#include <stdlib.h>
#include <unistd.h>
@@ -249,7 +249,6 @@
switch(state) {
case 0:
if((p = strchr(lp, '{')) != NULL) {
- n = 0;
while((--p > lp) && *p && isspace(*p));
n = p - lp;
if(len && strncmp(lp, key, MAX(n, len)) == 0)
==== //depot/projects/scottl-camlock/src/share/mk/bsd.own.mk#10 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/mk/bsd.own.mk,v 1.87 2010/06/09 19:57:20 rdivacky Exp $
+# $FreeBSD: src/share/mk/bsd.own.mk,v 1.88 2010/06/13 12:53:44 raj Exp $
#
# The include file <bsd.own.mk> set common variables for owner,
# group, mode, and directories. Defaults are in brackets.
@@ -278,15 +278,6 @@
WITH_IDEA=
.endif
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list