PERFORCE change 131034 for review
Peter Wemm
peter at FreeBSD.org
Sun Dec 16 11:31:00 PST 2007
http://perforce.freebsd.org/chv.cgi?CH=131034
Change 131034 by peter at peter_daintree on 2007/12/16 19:30:22
IFC @131032
Affected files ...
.. //depot/projects/hammer/Makefile#45 integrate
.. //depot/projects/hammer/bin/mv/mv.c#9 integrate
.. //depot/projects/hammer/etc/rc.d/ldconfig#16 integrate
.. //depot/projects/hammer/games/fortune/datfiles/fortunes#72 integrate
.. //depot/projects/hammer/games/fortune/datfiles/fortunes-o.real#9 integrate
.. //depot/projects/hammer/include/complex.h#4 integrate
.. //depot/projects/hammer/include/pthread_np.h#6 integrate
.. //depot/projects/hammer/lib/libc/Versions.def#3 integrate
.. //depot/projects/hammer/lib/libc/stdlib/grantpt.c#6 integrate
.. //depot/projects/hammer/lib/libfetch/Makefile#17 integrate
.. //depot/projects/hammer/lib/libfetch/common.c#9 integrate
.. //depot/projects/hammer/lib/libfetch/common.h#5 integrate
.. //depot/projects/hammer/lib/libfetch/fetch.c#4 integrate
.. //depot/projects/hammer/lib/libfetch/file.c#4 integrate
.. //depot/projects/hammer/lib/libfetch/ftp.c#12 integrate
.. //depot/projects/hammer/lib/libfetch/http.c#14 integrate
.. //depot/projects/hammer/lib/libthr/pthread.map#15 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_mutex.c#38 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_private.h#38 integrate
.. //depot/projects/hammer/lib/libufs/Makefile#10 integrate
.. //depot/projects/hammer/lib/libufs/block.c#7 integrate
.. //depot/projects/hammer/lib/libufs/bread.3#4 integrate
.. //depot/projects/hammer/lib/libufs/libufs.h#7 integrate
.. //depot/projects/hammer/lib/msun/Makefile#35 integrate
.. //depot/projects/hammer/lib/msun/Symbol.map#5 integrate
.. //depot/projects/hammer/lib/msun/man/atan2.3#6 integrate
.. //depot/projects/hammer/lib/msun/man/csqrt.3#1 branch
.. //depot/projects/hammer/lib/msun/man/hypot.3#7 integrate
.. //depot/projects/hammer/lib/msun/man/sqrt.3#4 integrate
.. //depot/projects/hammer/lib/msun/src/s_carg.c#1 branch
.. //depot/projects/hammer/lib/msun/src/s_cargf.c#1 branch
.. //depot/projects/hammer/lib/msun/src/s_csqrt.c#1 branch
.. //depot/projects/hammer/lib/msun/src/s_csqrtf.c#1 branch
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/article.sgml#9 integrate
.. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#48 integrate
.. //depot/projects/hammer/sbin/atacontrol/atacontrol.c#24 integrate
.. //depot/projects/hammer/sbin/natd/natd.8#9 integrate
.. //depot/projects/hammer/share/man/man3/tgmath.3#3 integrate
.. //depot/projects/hammer/share/man/man4/Makefile#99 integrate
.. //depot/projects/hammer/share/man/man4/hptrr.4#1 branch
.. //depot/projects/hammer/share/man/man7/build.7#18 integrate
.. //depot/projects/hammer/sys/amd64/conf/GENERIC#102 integrate
.. //depot/projects/hammer/sys/amd64/conf/NOTES#106 integrate
.. //depot/projects/hammer/sys/arm/at91/if_ate.c#10 integrate
.. //depot/projects/hammer/sys/cam/cam_xpt.c#35 integrate
.. //depot/projects/hammer/sys/conf/NOTES#132 integrate
.. //depot/projects/hammer/sys/conf/files.amd64#101 integrate
.. //depot/projects/hammer/sys/conf/files.i386#87 integrate
.. //depot/projects/hammer/sys/conf/files.powerpc#26 integrate
.. //depot/projects/hammer/sys/conf/options#119 integrate
.. //depot/projects/hammer/sys/conf/options.powerpc#8 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-all.h#46 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#84 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-dma.c#30 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-lowlevel.c#39 integrate
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_adapter.h#11 integrate
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_config.h#4 integrate
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_include.h#3 integrate
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_l2t.c#3 integrate
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_l2t.h#3 integrate
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_main.c#11 integrate
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_offload.c#6 integrate
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_offload.h#6 integrate
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_osdep.h#6 integrate
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_sge.c#12 integrate
.. //depot/projects/hammer/sys/dev/cxgb/sys/cxgb_support.c#1 branch
.. //depot/projects/hammer/sys/dev/cxgb/sys/mbufq.h#2 integrate
.. //depot/projects/hammer/sys/dev/cxgb/sys/mvec.h#5 integrate
.. //depot/projects/hammer/sys/dev/cxgb/sys/uipc_mvec.c#4 integrate
.. //depot/projects/hammer/sys/dev/cxgb/t3cdev.h#1 branch
.. //depot/projects/hammer/sys/dev/cxgb/ulp/toecore/cxgb_toedev.h#1 branch
.. //depot/projects/hammer/sys/dev/cxgb/ulp/toecore/toedev.c#1 branch
.. //depot/projects/hammer/sys/dev/cxgb/ulp/toecore/toedev.h#2 delete
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#1 branch
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#1 branch
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_defs.h#1 branch
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_listen.c#1 branch
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#1 branch
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#1 branch
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_tom.c#1 branch
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_tom.h#1 branch
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#1 branch
.. //depot/projects/hammer/sys/dev/hptrr/amd64-elf.hptrr_lib.o.uu#1 branch
.. //depot/projects/hammer/sys/dev/hptrr/array.h#1 branch
.. //depot/projects/hammer/sys/dev/hptrr/him.h#1 branch
.. //depot/projects/hammer/sys/dev/hptrr/himfuncs.h#1 branch
.. //depot/projects/hammer/sys/dev/hptrr/hptintf.h#1 branch
.. //depot/projects/hammer/sys/dev/hptrr/hptrr_config.c#1 branch
.. //depot/projects/hammer/sys/dev/hptrr/hptrr_config.h#1 branch
.. //depot/projects/hammer/sys/dev/hptrr/hptrr_os_bsd.c#1 branch
.. //depot/projects/hammer/sys/dev/hptrr/hptrr_osm_bsd.c#1 branch
.. //depot/projects/hammer/sys/dev/hptrr/i386-elf.hptrr_lib.o.uu#1 branch
.. //depot/projects/hammer/sys/dev/hptrr/ldm.h#1 branch
.. //depot/projects/hammer/sys/dev/hptrr/list.h#1 branch
.. //depot/projects/hammer/sys/dev/hptrr/os_bsd.h#1 branch
.. //depot/projects/hammer/sys/dev/hptrr/osm.h#1 branch
.. //depot/projects/hammer/sys/dev/sound/pci/hda/hdac.c#14 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/maestro.c#19 integrate
.. //depot/projects/hammer/sys/dev/usb/uplcom.c#27 integrate
.. //depot/projects/hammer/sys/geom/geom_dev.c#36 integrate
.. //depot/projects/hammer/sys/geom/geom_io.c#42 integrate
.. //depot/projects/hammer/sys/i386/conf/GENERIC#60 integrate
.. //depot/projects/hammer/sys/i386/conf/NOTES#96 integrate
.. //depot/projects/hammer/sys/i386/conf/PAE#25 integrate
.. //depot/projects/hammer/sys/kern/Makefile#6 integrate
.. //depot/projects/hammer/sys/kern/kern_event.c#47 integrate
.. //depot/projects/hammer/sys/kern/kern_mbuf.c#28 integrate
.. //depot/projects/hammer/sys/kern/kern_mutex.c#52 integrate
.. //depot/projects/hammer/sys/kern/kern_rwlock.c#15 integrate
.. //depot/projects/hammer/sys/kern/kern_sx.c#20 integrate
.. //depot/projects/hammer/sys/kern/kern_thread.c#102 integrate
.. //depot/projects/hammer/sys/kern/sched_4bsd.c#56 integrate
.. //depot/projects/hammer/sys/kern/sched_ule.c#88 integrate
.. //depot/projects/hammer/sys/kern/subr_lock.c#9 integrate
.. //depot/projects/hammer/sys/kern/sys_generic.c#36 integrate
.. //depot/projects/hammer/sys/kern/sys_pipe.c#37 integrate
.. //depot/projects/hammer/sys/kern/uipc_sockbuf.c#6 integrate
.. //depot/projects/hammer/sys/modules/Makefile#119 integrate
.. //depot/projects/hammer/sys/modules/cxgb/Makefile#7 integrate
.. //depot/projects/hammer/sys/modules/cxgb/cxgb/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/cxgb/toecore/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/cxgb/tom/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/hptrr/Makefile#1 branch
.. //depot/projects/hammer/sys/net/if.h#30 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_radiotap.h#10 integrate
.. //depot/projects/hammer/sys/netinet/if_ether.c#43 integrate
.. //depot/projects/hammer/sys/netinet/tcp.h#19 integrate
.. //depot/projects/hammer/sys/netinet/tcp_ofld.c#2 integrate
.. //depot/projects/hammer/sys/netinet/tcp_ofld.h#2 integrate
.. //depot/projects/hammer/sys/netinet/tcp_var.h#51 integrate
.. //depot/projects/hammer/sys/netinet/toedev.h#2 integrate
.. //depot/projects/hammer/sys/netncp/ncp_rq.c#7 integrate
.. //depot/projects/hammer/sys/netncp/ncp_sock.c#8 integrate
.. //depot/projects/hammer/sys/netncp/ncp_sock.h#4 integrate
.. //depot/projects/hammer/sys/netsmb/smb_trantcp.c#12 integrate
.. //depot/projects/hammer/sys/powerpc/aim/clock.c#1 branch
.. //depot/projects/hammer/sys/powerpc/aim/copyinout.c#1 branch
.. //depot/projects/hammer/sys/powerpc/aim/interrupt.c#1 branch
.. //depot/projects/hammer/sys/powerpc/aim/locore.S#1 branch
.. //depot/projects/hammer/sys/powerpc/aim/machdep.c#1 branch
.. //depot/projects/hammer/sys/powerpc/aim/mmu_oea.c#1 branch
.. //depot/projects/hammer/sys/powerpc/aim/nexus.c#1 branch
.. //depot/projects/hammer/sys/powerpc/aim/ofw_machdep.c#1 branch
.. //depot/projects/hammer/sys/powerpc/aim/ofwmagic.S#1 branch
.. //depot/projects/hammer/sys/powerpc/aim/swtch.S#1 branch
.. //depot/projects/hammer/sys/powerpc/aim/trap.c#1 branch
.. //depot/projects/hammer/sys/powerpc/aim/trap_subr.S#1 branch
.. //depot/projects/hammer/sys/powerpc/aim/uio_machdep.c#1 branch
.. //depot/projects/hammer/sys/powerpc/aim/uma_machdep.c#1 branch
.. //depot/projects/hammer/sys/powerpc/aim/vm_machdep.c#1 branch
.. //depot/projects/hammer/sys/powerpc/conf/GENERIC#35 integrate
.. //depot/projects/hammer/sys/powerpc/conf/NOTES#6 integrate
.. //depot/projects/hammer/sys/powerpc/include/fpu.h#3 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/clock.c#14 delete
.. //depot/projects/hammer/sys/powerpc/powerpc/copyinout.c#7 delete
.. //depot/projects/hammer/sys/powerpc/powerpc/db_memrw.c#5 delete
.. //depot/projects/hammer/sys/powerpc/powerpc/interrupt.c#7 delete
.. //depot/projects/hammer/sys/powerpc/powerpc/locore.S#8 delete
.. //depot/projects/hammer/sys/powerpc/powerpc/machdep.c#48 delete
.. //depot/projects/hammer/sys/powerpc/powerpc/mmu_oea.c#6 delete
.. //depot/projects/hammer/sys/powerpc/powerpc/nexus.c#12 delete
.. //depot/projects/hammer/sys/powerpc/powerpc/ofw_machdep.c#11 delete
.. //depot/projects/hammer/sys/powerpc/powerpc/ofwmagic.S#4 delete
.. //depot/projects/hammer/sys/powerpc/powerpc/swtch.S#7 delete
.. //depot/projects/hammer/sys/powerpc/powerpc/trap.c#26 delete
.. //depot/projects/hammer/sys/powerpc/powerpc/trap_subr.S#11 delete
.. //depot/projects/hammer/sys/powerpc/powerpc/uio_machdep.c#7 delete
.. //depot/projects/hammer/sys/powerpc/powerpc/uma_machdep.c#5 delete
.. //depot/projects/hammer/sys/powerpc/powerpc/vm_machdep.c#32 delete
.. //depot/projects/hammer/sys/sys/_lock.h#7 integrate
.. //depot/projects/hammer/sys/sys/kerneldump.h#7 integrate
.. //depot/projects/hammer/sys/sys/lock_profile.h#7 integrate
.. //depot/projects/hammer/sys/sys/pcpu.h#16 integrate
.. //depot/projects/hammer/sys/sys/proc.h#112 integrate
.. //depot/projects/hammer/sys/sys/selinfo.h#5 integrate
.. //depot/projects/hammer/sys/sys/socket.h#25 integrate
.. //depot/projects/hammer/sys/sys/socketvar.h#39 integrate
.. //depot/projects/hammer/sys/sys/sx.h#15 integrate
.. //depot/projects/hammer/sys/sys/systm.h#51 integrate
.. //depot/projects/hammer/sys/sys/tty.h#22 integrate
.. //depot/projects/hammer/tools/regression/bin/mv/Makefile#1 branch
.. //depot/projects/hammer/tools/regression/bin/mv/regress.sh#1 branch
.. //depot/projects/hammer/tools/regression/bin/mv/regress.t#1 branch
.. //depot/projects/hammer/tools/regression/lib/msun/Makefile#7 integrate
.. //depot/projects/hammer/tools/regression/lib/msun/test-csqrt.c#1 branch
.. //depot/projects/hammer/tools/regression/lib/msun/test-csqrt.t#1 branch
.. //depot/projects/hammer/tools/regression/usr.bin/sed/multitest.t#3 integrate
.. //depot/projects/hammer/tools/regression/usr.bin/sed/regress.sh#10 integrate
.. //depot/projects/hammer/tools/tools/ath/athdebug/athdebug.c#4 integrate
.. //depot/projects/hammer/tools/tools/ath/athstats/Makefile#5 integrate
.. //depot/projects/hammer/tools/tools/ath/athstats/athstats.c#6 integrate
.. //depot/projects/hammer/tools/tools/ath/athstats/main.c#3 integrate
.. //depot/projects/hammer/tools/tools/ath/athstats/statfoo.c#3 integrate
.. //depot/projects/hammer/usr.bin/vmstat/Makefile#6 integrate
.. //depot/projects/hammer/usr.bin/vmstat/vmstat.8#12 integrate
.. //depot/projects/hammer/usr.bin/vmstat/vmstat.c#28 integrate
.. //depot/projects/hammer/usr.bin/xinstall/xinstall.c#11 integrate
.. //depot/projects/hammer/usr.sbin/iostat/iostat.c#9 integrate
Differences ...
==== //depot/projects/hammer/Makefile#45 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile,v 1.343 2007/12/11 20:00:55 imp Exp $
+# $FreeBSD: src/Makefile,v 1.344 2007/12/13 00:08:02 imp Exp $
#
# The user-driven targets are:
#
@@ -234,7 +234,7 @@
PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \
PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \
then \
- (cd ${.CURDIR} && ${BSDMAKE} make); \
+ (cd ${.CURDIR} && ${MAKE} make); \
fi
#
@@ -242,11 +242,10 @@
# headers, libraries and tools. Also, allow the location of
# the system bsdmake-like utility to be overridden.
#
-BSDMAKE?=make
MMAKEENV= MAKEOBJDIRPREFIX=${MAKEPATH} \
DESTDIR= \
INSTALL="sh ${.CURDIR}/tools/install.sh"
-MMAKE= ${MMAKEENV} ${BSDMAKE} \
+MMAKE= ${MMAKEENV} ${MAKE} \
-D_UPGRADING \
-DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \
-DNO_CPU_CFLAGS -DNO_WERROR
==== //depot/projects/hammer/bin/mv/mv.c#9 (text+ko) ====
@@ -42,7 +42,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.46 2005/09/05 04:36:08 csjp Exp $");
+__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.48 2007/12/16 17:47:34 dds Exp $");
#include <sys/types.h>
#include <sys/acl.h>
@@ -355,8 +355,34 @@
int
copy(char *from, char *to)
{
+ struct stat sb;
+ enum clean {CLEAN_SOURCE, CLEAN_DEST, CLEAN_ODEST, CLEAN_MAX};
+ char *cleanup[CLEAN_MAX];
int pid, status;
+ volatile int i, rval;
+ rval = 0;
+ for (i = 0; i < CLEAN_MAX; i++)
+ cleanup[i] = NULL;
+ /*
+ * If "to" exists and is a directory, get it out of the way.
+ * When the copy succeeds, delete it.
+ */
+ if (stat(to, &sb) == 0 && S_ISDIR(sb.st_mode)) {
+ if (asprintf(&cleanup[CLEAN_ODEST], "%s.XXXXXX", to) == -1) {
+ warnx("asprintf failed");
+ return (1);
+
+ }
+ if (rename(to, cleanup[CLEAN_ODEST]) < 0) {
+ warn("rename of existing target from %s to %s failed",
+ to, cleanup[CLEAN_ODEST]);
+ free(cleanup[CLEAN_ODEST]);
+ return (1);
+ }
+ }
+ /* Copy source to destination. */
+ cleanup[CLEAN_DEST] = to;
if ((pid = fork()) == 0) {
execl(_PATH_CP, "mv", vflg ? "-PRpv" : "-PRp", "--", from, to,
(char *)NULL);
@@ -365,36 +391,71 @@
}
if (waitpid(pid, &status, 0) == -1) {
warn("%s: waitpid", _PATH_CP);
- return (1);
+ rval = 1;
+ goto done;
}
if (!WIFEXITED(status)) {
warnx("%s: did not terminate normally", _PATH_CP);
- return (1);
+ rval = 1;
+ goto done;
}
if (WEXITSTATUS(status)) {
warnx("%s: terminated with %d (non-zero) status",
_PATH_CP, WEXITSTATUS(status));
- return (1);
+ rval = 1;
+ goto done;
}
- if (!(pid = vfork())) {
- execl(_PATH_RM, "mv", "-rf", "--", from, (char *)NULL);
- warn("%s", _PATH_RM);
- _exit(1);
+ /*
+ * The copy succeeded. From now on the destination is where users
+ * will find their files.
+ */
+ cleanup[CLEAN_DEST] = NULL;
+ cleanup[CLEAN_SOURCE] = from;
+done:
+ /* Clean what needs to be cleaned. */
+ for (i = 0; i < CLEAN_MAX; i++) {
+ if (cleanup[i] == NULL)
+ continue;
+ if (!(pid = vfork())) {
+ execl(_PATH_RM, "mv", "-rf", "--", cleanup[i],
+ (char *)NULL);
+ warn("%s %s", _PATH_RM, cleanup[i]);
+ _exit(1);
+ }
+ if (waitpid(pid, &status, 0) == -1) {
+ warn("%s %s: waitpid", _PATH_RM, cleanup[i]);
+ rval = 1;
+ continue;
+ }
+ if (!WIFEXITED(status)) {
+ warnx("%s %s: did not terminate normally",
+ _PATH_RM, cleanup[i]);
+ rval = 1;
+ continue;
+ }
+ if (WEXITSTATUS(status)) {
+ warnx("%s %s: terminated with %d (non-zero) status",
+ _PATH_RM, cleanup[i], WEXITSTATUS(status));
+ rval = 1;
+ continue;
+ }
+ /*
+ * If the copy failed, and we just deleted the copy's trash,
+ * try to salvage the original destination,
+ */
+ if (i == CLEAN_DEST && cleanup[CLEAN_ODEST]) {
+ if (rename(cleanup[CLEAN_ODEST], to) < 0) {
+ warn("rename back renamed existing target from %s to %s failed",
+ cleanup[CLEAN_ODEST], to);
+ rval = 1;
+ }
+ free(cleanup[CLEAN_ODEST]);
+ cleanup[CLEAN_ODEST] = NULL;
+ }
}
- if (waitpid(pid, &status, 0) == -1) {
- warn("%s: waitpid", _PATH_RM);
- return (1);
- }
- if (!WIFEXITED(status)) {
- warnx("%s: did not terminate normally", _PATH_RM);
- return (1);
- }
- if (WEXITSTATUS(status)) {
- warnx("%s: terminated with %d (non-zero) status",
- _PATH_RM, WEXITSTATUS(status));
- return (1);
- }
- return (0);
+ if (cleanup[CLEAN_ODEST])
+ free(cleanup[CLEAN_ODEST]);
+ return (rval);
}
void
==== //depot/projects/hammer/etc/rc.d/ldconfig#16 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/ldconfig,v 1.18 2007/12/08 07:20:22 dougb Exp $
+# $FreeBSD: src/etc/rc.d/ldconfig,v 1.19 2007/12/13 00:51:01 jhb Exp $
#
# PROVIDE: ldconfig
@@ -49,8 +49,14 @@
fi
fi
done
- echo '32-bit compatibility ldconfig path:' ${ldconfig32_paths}
- ${ldconfig} -32 -m ${_ins} ${ldconfig32_paths}
+ _LDC=""
+ for i in ${ldconfig32_paths}; do
+ if [ -r "${i}" ]; then
+ _LDC="${_LDC} ${i}"
+ fi
+ done
+ echo '32-bit compatibility ldconfig path:' ${_LDC}
+ ${ldconfig} -32 -m ${_ins} ${_LDC}
;;
esac
==== //depot/projects/hammer/games/fortune/datfiles/fortunes#72 (text+ko) ====
@@ -1,5 +1,5 @@
This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.249 2007/12/09 01:00:11 dougb Exp $
+$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.250 2007/12/14 01:47:11 wes Exp $
%
=======================================================================
|| ||
@@ -56259,6 +56259,9 @@
%
Where am I? Who am I? Am I? I
%
+Where am I, and what am I doing in this handbasket?
+ -- Mark A. Matthews, to Wes Peters, circa 1996
+%
Where are the calculations that go with a calculated risk?
%
WHERE CAN THE MATTER BE
==== //depot/projects/hammer/games/fortune/datfiles/fortunes-o.real#9 (text+ko) ====
@@ -1,4 +1,4 @@
-%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.28 2007/12/09 01:00:11 dougb Exp $
+%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.29 2007/12/14 21:58:58 des Exp $
%
PLAYGIRL, Inc.
Philadelphia, Pa. 19369
@@ -755,7 +755,7 @@
"What is amiss, my friend?" asked the king.
"My lord," gasped Lancelot, "you have given me the wrong key!"
%
- "Before we get married," said the young woman to her fiancee,
+ "Before we get married," said the young woman to her fiance,
"I want to confess some affairs that I've had in the past."
"But you told me all about those a few weeks ago," her young man
replied.
==== //depot/projects/hammer/include/complex.h#4 (text+ko) ====
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2001 The FreeBSD Project.
+ * Copyright (c) 2001-2007 The FreeBSD Project.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/include/complex.h,v 1.6 2004/08/14 18:03:21 stefanf Exp $
+ * $FreeBSD: src/include/complex.h,v 1.8 2007/12/15 08:38:44 das Exp $
*/
#ifndef _COMPLEX_H
@@ -45,6 +45,8 @@
double cabs(double complex);
float cabsf(float complex);
+double carg(double complex);
+float cargf(float complex);
double cimag(double complex);
float cimagf(float complex);
long double cimagl(long double complex);
@@ -55,6 +57,8 @@
double creal(double complex);
float crealf(float complex);
long double creall(long double complex);
+double complex csqrt(double complex);
+float complex csqrtf(float complex);
__END_DECLS
==== //depot/projects/hammer/include/pthread_np.h#6 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/include/pthread_np.h,v 1.17 2007/10/29 00:31:54 imp Exp $
+ * $FreeBSD: src/include/pthread_np.h,v 1.18 2007/12/14 06:25:56 davidxu Exp $
*/
#ifndef _PTHREAD_NP_H_
#define _PTHREAD_NP_H_
@@ -49,6 +49,10 @@
void pthread_resume_all_np(void);
int pthread_resume_np(pthread_t);
void pthread_set_name_np(pthread_t, const char *);
+int pthread_mutex_getspinloops_np(pthread_mutex_t *mutex, int *count);
+int pthread_mutex_setspinloops_np(pthread_mutex_t *mutex, int count);
+int pthread_mutex_getyieldloops_np(pthread_mutex_t *mutex, int *count);
+int pthread_mutex_setyieldloops_np(pthread_mutex_t *mutex, int count);
int pthread_single_np(void);
void pthread_suspend_all_np(void);
int pthread_suspend_np(pthread_t);
==== //depot/projects/hammer/lib/libc/Versions.def#3 (text) ====
@@ -1,9 +1,14 @@
-# $FreeBSD: src/lib/libc/Versions.def,v 1.3 2007/04/29 16:14:17 kan Exp $
+# $FreeBSD: src/lib/libc/Versions.def,v 1.4 2007/12/14 20:49:06 deischen Exp $
# This is our first version; it depends on no other.
+# This version was first added to 7.0-current.
FBSD_1.0 {
};
+# This version was first added to 8.0-current.
+FBSD_1.1 {
+} FBSD_1.0;
+
# This is our private namespace. Any global interfaces that are
# strictly for use only by other FreeBSD applications and libraries
# are listed here. We use a separate namespace so we can write
==== //depot/projects/hammer/lib/libc/stdlib/grantpt.c#6 (text+ko) ====
@@ -32,7 +32,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/grantpt.c,v 1.7 2006/02/13 00:04:04 kan Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/grantpt.c,v 1.8 2007/12/13 00:08:59 jhb Exp $");
#endif /* not lint */
#include "namespace.h"
@@ -63,10 +63,10 @@
/*
* The following are range values for pseudo TTY devices. Pseudo TTYs have a
- * name of /dev/[pt]ty[p-sP-S][0-9a-v], yielding 256 combinations per major.
+ * name of /dev/[pt]ty[l-sL-S][0-9a-v], yielding 256 combinations per major.
*/
#define PT_MAX 256
-#define PT_DEV1 "pqrsPQRS"
+#define PT_DEV1 "pqrsPQRSlmnoLMNO"
#define PT_DEV2 "0123456789abcdefghijklmnopqrstuv"
/*
==== //depot/projects/hammer/lib/libfetch/Makefile#17 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libfetch/Makefile,v 1.49 2007/05/24 20:28:14 des Exp $
+# $FreeBSD: src/lib/libfetch/Makefile,v 1.50 2007/12/14 10:26:58 des Exp $
.include <bsd.own.mk>
@@ -28,7 +28,7 @@
SHLIB_MAJOR= 5
ftperr.h: ftp.errors
- @echo "static struct fetcherr _ftp_errlist[] = {" > ${.TARGET}
+ @echo "static struct fetcherr ftp_errlist[] = {" > ${.TARGET}
@cat ${.ALLSRC} \
| grep -v ^# \
| sort \
@@ -39,7 +39,7 @@
@echo "};" >> ${.TARGET}
httperr.h: http.errors
- @echo "static struct fetcherr _http_errlist[] = {" > ${.TARGET}
+ @echo "static struct fetcherr http_errlist[] = {" > ${.TARGET}
@cat ${.ALLSRC} \
| grep -v ^# \
| sort \
==== //depot/projects/hammer/lib/libfetch/common.c#9 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libfetch/common.c,v 1.50 2005/02/16 12:46:46 des Exp $");
+__FBSDID("$FreeBSD: src/lib/libfetch/common.c,v 1.51 2007/12/14 10:26:58 des Exp $");
#include <sys/param.h>
#include <sys/socket.h>
@@ -53,7 +53,7 @@
/*
* Error messages for resolver errors
*/
-static struct fetcherr _netdb_errlist[] = {
+static struct fetcherr netdb_errlist[] = {
#ifdef EAI_NODATA
{ EAI_NODATA, FETCH_RESOLV, "Host not found" },
#endif
@@ -73,7 +73,7 @@
* Map error code to string
*/
static struct fetcherr *
-_fetch_finderr(struct fetcherr *p, int e)
+fetch_finderr(struct fetcherr *p, int e)
{
while (p->num != -1 && p->num != e)
p++;
@@ -84,9 +84,9 @@
* Set error code
*/
void
-_fetch_seterr(struct fetcherr *p, int e)
+fetch_seterr(struct fetcherr *p, int e)
{
- p = _fetch_finderr(p, e);
+ p = fetch_finderr(p, e);
fetchLastErrCode = p->cat;
snprintf(fetchLastErrString, MAXERRSTRING, "%s", p->string);
}
@@ -95,7 +95,7 @@
* Set error code according to errno
*/
void
-_fetch_syserr(void)
+fetch_syserr(void)
{
switch (errno) {
case 0:
@@ -155,7 +155,7 @@
* Emit status message
*/
void
-_fetch_info(const char *fmt, ...)
+fetch_info(const char *fmt, ...)
{
va_list ap;
@@ -172,7 +172,7 @@
* Return the default port for a scheme
*/
int
-_fetch_default_port(const char *scheme)
+fetch_default_port(const char *scheme)
{
struct servent *se;
@@ -189,7 +189,7 @@
* Return the default proxy port for a scheme
*/
int
-_fetch_default_proxy_port(const char *scheme)
+fetch_default_proxy_port(const char *scheme)
{
if (strcasecmp(scheme, SCHEME_FTP) == 0)
return (FTP_DEFAULT_PROXY_PORT);
@@ -203,7 +203,7 @@
* Create a connection for an existing descriptor.
*/
conn_t *
-_fetch_reopen(int sd)
+fetch_reopen(int sd)
{
conn_t *conn;
@@ -220,7 +220,7 @@
* Bump a connection's reference count.
*/
conn_t *
-_fetch_ref(conn_t *conn)
+fetch_ref(conn_t *conn)
{
++conn->ref;
@@ -232,7 +232,7 @@
* Bind a socket to a specific local address
*/
int
-_fetch_bind(int sd, int af, const char *addr)
+fetch_bind(int sd, int af, const char *addr)
{
struct addrinfo hints, *res, *res0;
int err;
@@ -254,7 +254,7 @@
* Establish a TCP connection to the specified port on the specified host.
*/
conn_t *
-_fetch_connect(const char *host, int port, int af, int verbose)
+fetch_connect(const char *host, int port, int af, int verbose)
{
conn_t *conn;
char pbuf[10];
@@ -265,7 +265,7 @@
DEBUG(fprintf(stderr, "---> %s:%d\n", host, port));
if (verbose)
- _fetch_info("looking up %s", host);
+ fetch_info("looking up %s", host);
/* look up host name and set up socket address structure */
snprintf(pbuf, sizeof(pbuf), "%d", port);
@@ -274,13 +274,13 @@
hints.ai_socktype = SOCK_STREAM;
hints.ai_protocol = 0;
if ((err = getaddrinfo(host, pbuf, &hints, &res0)) != 0) {
- _netdb_seterr(err);
+ netdb_seterr(err);
return (NULL);
}
bindaddr = getenv("FETCH_BIND_ADDRESS");
if (verbose)
- _fetch_info("connecting to %s:%d", host, port);
+ fetch_info("connecting to %s:%d", host, port);
/* try to connect */
for (sd = -1, res = res0; res; sd = -1, res = res->ai_next) {
@@ -288,8 +288,8 @@
res->ai_protocol)) == -1)
continue;
if (bindaddr != NULL && *bindaddr != '\0' &&
- _fetch_bind(sd, res->ai_family, bindaddr) != 0) {
- _fetch_info("failed to bind to '%s'", bindaddr);
+ fetch_bind(sd, res->ai_family, bindaddr) != 0) {
+ fetch_info("failed to bind to '%s'", bindaddr);
close(sd);
continue;
}
@@ -299,12 +299,12 @@
}
freeaddrinfo(res0);
if (sd == -1) {
- _fetch_syserr();
+ fetch_syserr();
return (NULL);
}
- if ((conn = _fetch_reopen(sd)) == NULL) {
- _fetch_syserr();
+ if ((conn = fetch_reopen(sd)) == NULL) {
+ fetch_syserr();
close(sd);
}
return (conn);
@@ -315,7 +315,7 @@
* Enable SSL on a connection.
*/
int
-_fetch_ssl(conn_t *conn, int verbose)
+fetch_ssl(conn_t *conn, int verbose)
{
#ifdef WITH_SSL
@@ -373,7 +373,7 @@
* Read a character from a connection w/ timeout
*/
ssize_t
-_fetch_read(conn_t *conn, char *buf, size_t len)
+fetch_read(conn_t *conn, char *buf, size_t len)
{
struct timeval now, timeout, wait;
fd_set readfds;
@@ -399,7 +399,7 @@
}
if (wait.tv_sec < 0) {
errno = ETIMEDOUT;
- _fetch_syserr();
+ fetch_syserr();
return (-1);
}
errno = 0;
@@ -407,7 +407,7 @@
if (r == -1) {
if (errno == EINTR && fetchRestartCalls)
continue;
- _fetch_syserr();
+ fetch_syserr();
return (-1);
}
}
@@ -438,7 +438,7 @@
#define MIN_BUF_SIZE 1024
int
-_fetch_getln(conn_t *conn)
+fetch_getln(conn_t *conn)
{
char *tmp;
size_t tmpsize;
@@ -457,7 +457,7 @@
conn->buflen = 0;
do {
- len = _fetch_read(conn, &c, 1);
+ len = fetch_read(conn, &c, 1);
if (len == -1)
return (-1);
if (len == 0)
@@ -485,13 +485,13 @@
* Write to a connection w/ timeout
*/
ssize_t
-_fetch_write(conn_t *conn, const char *buf, size_t len)
+fetch_write(conn_t *conn, const char *buf, size_t len)
{
struct iovec iov;
iov.iov_base = __DECONST(char *, buf);
iov.iov_len = len;
- return _fetch_writev(conn, &iov, 1);
+ return fetch_writev(conn, &iov, 1);
}
/*
@@ -499,7 +499,7 @@
* Note: can modify the iovec.
*/
ssize_t
-_fetch_writev(conn_t *conn, struct iovec *iov, int iovcnt)
+fetch_writev(conn_t *conn, struct iovec *iov, int iovcnt)
{
struct timeval now, timeout, wait;
fd_set writefds;
@@ -525,7 +525,7 @@
}
if (wait.tv_sec < 0) {
errno = ETIMEDOUT;
- _fetch_syserr();
+ fetch_syserr();
return (-1);
}
errno = 0;
@@ -547,7 +547,7 @@
if (wlen == 0) {
/* we consider a short write a failure */
errno = EPIPE;
- _fetch_syserr();
+ fetch_syserr();
return (-1);
}
if (wlen < 0) {
@@ -574,7 +574,7 @@
* Write a line of text to a connection w/ timeout
*/
int
-_fetch_putln(conn_t *conn, const char *str, size_t len)
+fetch_putln(conn_t *conn, const char *str, size_t len)
{
struct iovec iov[2];
int ret;
@@ -585,9 +585,9 @@
iov[1].iov_base = __DECONST(char *, ENDL);
iov[1].iov_len = sizeof(ENDL);
if (len == 0)
- ret = _fetch_writev(conn, &iov[1], 1);
+ ret = fetch_writev(conn, &iov[1], 1);
else
- ret = _fetch_writev(conn, iov, 2);
+ ret = fetch_writev(conn, iov, 2);
if (ret == -1)
return (-1);
return (0);
@@ -598,7 +598,7 @@
* Close connection
*/
int
-_fetch_close(conn_t *conn)
+fetch_close(conn_t *conn)
{
int ret;
@@ -614,7 +614,7 @@
/*** Directory-related utility functions *************************************/
int
-_fetch_add_entry(struct url_ent **p, int *size, int *len,
+fetch_add_entry(struct url_ent **p, int *size, int *len,
const char *name, struct url_stat *us)
{
struct url_ent *tmp;
@@ -628,7 +628,7 @@
tmp = realloc(*p, (*size * 2 + 1) * sizeof(**p));
if (tmp == NULL) {
errno = ENOMEM;
- _fetch_syserr();
+ fetch_syserr();
return (-1);
}
*size = (*size * 2 + 1);
@@ -649,7 +649,7 @@
/*** Authentication-related utility functions ********************************/
static const char *
-_fetch_read_word(FILE *f)
+fetch_read_word(FILE *f)
{
static char word[1024];
@@ -662,7 +662,7 @@
* Get authentication data for a URL from .netrc
*/
int
-_fetch_netrc_auth(struct url *url)
+fetch_netrc_auth(struct url *url)
{
char fn[PATH_MAX];
const char *word;
@@ -671,7 +671,7 @@
if ((p = getenv("NETRC")) != NULL) {
if (snprintf(fn, sizeof(fn), "%s", p) >= (int)sizeof(fn)) {
- _fetch_info("$NETRC specifies a file name "
+ fetch_info("$NETRC specifies a file name "
"longer than PATH_MAX");
return (-1);
}
@@ -689,39 +689,39 @@
if ((f = fopen(fn, "r")) == NULL)
return (-1);
- while ((word = _fetch_read_word(f)) != NULL) {
+ while ((word = fetch_read_word(f)) != NULL) {
if (strcmp(word, "default") == 0) {
- DEBUG(_fetch_info("Using default .netrc settings"));
+ DEBUG(fetch_info("Using default .netrc settings"));
break;
}
if (strcmp(word, "machine") == 0 &&
- (word = _fetch_read_word(f)) != NULL &&
+ (word = fetch_read_word(f)) != NULL &&
strcasecmp(word, url->host) == 0) {
- DEBUG(_fetch_info("Using .netrc settings for %s", word));
+ DEBUG(fetch_info("Using .netrc settings for %s", word));
break;
}
}
if (word == NULL)
goto ferr;
- while ((word = _fetch_read_word(f)) != NULL) {
+ while ((word = fetch_read_word(f)) != NULL) {
if (strcmp(word, "login") == 0) {
- if ((word = _fetch_read_word(f)) == NULL)
+ if ((word = fetch_read_word(f)) == NULL)
goto ferr;
if (snprintf(url->user, sizeof(url->user),
"%s", word) > (int)sizeof(url->user)) {
- _fetch_info("login name in .netrc is too long");
+ fetch_info("login name in .netrc is too long");
url->user[0] = '\0';
}
} else if (strcmp(word, "password") == 0) {
- if ((word = _fetch_read_word(f)) == NULL)
+ if ((word = fetch_read_word(f)) == NULL)
goto ferr;
if (snprintf(url->pwd, sizeof(url->pwd),
"%s", word) > (int)sizeof(url->pwd)) {
- _fetch_info("password in .netrc is too long");
+ fetch_info("password in .netrc is too long");
url->pwd[0] = '\0';
}
} else if (strcmp(word, "account") == 0) {
- if ((word = _fetch_read_word(f)) == NULL)
+ if ((word = fetch_read_word(f)) == NULL)
goto ferr;
/* XXX not supported! */
} else {
==== //depot/projects/hammer/lib/libfetch/common.h#5 (text+ko) ====
@@ -25,7 +25,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/libfetch/common.h,v 1.28 2004/09/21 18:35:20 des Exp $
+ * $FreeBSD: src/lib/libfetch/common.h,v 1.29 2007/12/14 10:26:58 des Exp $
*/
#ifndef _COMMON_H_INCLUDED
@@ -68,33 +68,33 @@
const char *string;
};
-/* for _fetch_writev */
+/* for fetch_writev */
struct iovec;
-void _fetch_seterr(struct fetcherr *, int);
-void _fetch_syserr(void);
-void _fetch_info(const char *, ...);
-int _fetch_default_port(const char *);
-int _fetch_default_proxy_port(const char *);
-int _fetch_bind(int, int, const char *);
-conn_t *_fetch_connect(const char *, int, int, int);
-conn_t *_fetch_reopen(int);
-conn_t *_fetch_ref(conn_t *);
-int _fetch_ssl(conn_t *, int);
-ssize_t _fetch_read(conn_t *, char *, size_t);
-int _fetch_getln(conn_t *);
-ssize_t _fetch_write(conn_t *, const char *, size_t);
-ssize_t _fetch_writev(conn_t *, struct iovec *, int);
-int _fetch_putln(conn_t *, const char *, size_t);
-int _fetch_close(conn_t *);
-int _fetch_add_entry(struct url_ent **, int *, int *,
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list