PERFORCE change 103188 for review
Marcel Moolenaar
marcel at FreeBSD.org
Fri Aug 4 19:27:58 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=103188
Change 103188 by marcel at marcel_nfs on 2006/08/04 19:26:52
IFC @103186
Affected files ...
.. //depot/projects/gdb/Makefile.inc1#15 integrate
.. //depot/projects/gdb/bin/sh/histedit.c#4 integrate
.. //depot/projects/gdb/bin/sh/parser.c#5 integrate
.. //depot/projects/gdb/bin/test/test.1#7 integrate
.. //depot/projects/gdb/etc/mtree/BSD.include.dist#11 integrate
.. //depot/projects/gdb/etc/mtree/BSD.local.dist#8 integrate
.. //depot/projects/gdb/etc/mtree/BSD.usr.dist#9 integrate
.. //depot/projects/gdb/etc/rc.d/Makefile#11 integrate
.. //depot/projects/gdb/games/fortune/datfiles/fortunes#13 integrate
.. //depot/projects/gdb/include/Makefile#12 integrate
.. //depot/projects/gdb/lib/Makefile#12 integrate
.. //depot/projects/gdb/lib/libarchive/archive_write.c#11 integrate
.. //depot/projects/gdb/lib/libc/resolv/res_init.c#2 integrate
.. //depot/projects/gdb/lib/libc/resolv/res_send.c#2 integrate
.. //depot/projects/gdb/lib/libc/sys/kse.2#3 integrate
.. //depot/projects/gdb/lib/libc/uuid/uuid_compare.c#3 integrate
.. //depot/projects/gdb/lib/libtelnet/Makefile#4 integrate
.. //depot/projects/gdb/lib/libthread_db/arch/powerpc/libc_r_md.c#1 branch
.. //depot/projects/gdb/lib/libthread_db/arch/powerpc/libpthread_md.c#1 branch
.. //depot/projects/gdb/libexec/rtld-elf/rtld.c#9 integrate
.. //depot/projects/gdb/libexec/telnetd/Makefile#4 integrate
.. //depot/projects/gdb/release/doc/en_US.ISO8859-1/hardware/Makefile#3 integrate
.. //depot/projects/gdb/release/doc/en_US.ISO8859-1/hardware/common/hw.ent#2 integrate
.. //depot/projects/gdb/release/doc/en_US.ISO8859-1/hardware/ia64/Makefile#3 integrate
.. //depot/projects/gdb/release/doc/en_US.ISO8859-1/hardware/powerpc/Makefile#1 branch
.. //depot/projects/gdb/release/doc/en_US.ISO8859-1/hardware/powerpc/article.sgml#1 branch
.. //depot/projects/gdb/release/doc/en_US.ISO8859-1/hardware/powerpc/proc-powerpc.sgml#1 branch
.. //depot/projects/gdb/release/doc/en_US.ISO8859-1/installation/Makefile#3 integrate
.. //depot/projects/gdb/release/doc/en_US.ISO8859-1/installation/powerpc/Makefile#1 branch
.. //depot/projects/gdb/release/doc/en_US.ISO8859-1/installation/powerpc/article.sgml#1 branch
.. //depot/projects/gdb/release/doc/en_US.ISO8859-1/relnotes/Makefile#3 integrate
.. //depot/projects/gdb/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#27 integrate
.. //depot/projects/gdb/release/doc/en_US.ISO8859-1/relnotes/powerpc/Makefile#1 branch
.. //depot/projects/gdb/release/doc/en_US.ISO8859-1/relnotes/powerpc/article.sgml#1 branch
.. //depot/projects/gdb/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.sgml#2 integrate
.. //depot/projects/gdb/release/doc/share/examples/Makefile.relnotesng#3 integrate
.. //depot/projects/gdb/release/doc/share/misc/dev.archlist.txt#3 integrate
.. //depot/projects/gdb/sbin/reboot/reboot.c#4 integrate
.. //depot/projects/gdb/sbin/sysctl/sysctl.c#5 integrate
.. //depot/projects/gdb/share/doc/papers/timecounter/timecounter.ms#3 integrate
.. //depot/projects/gdb/share/man/man4/acpi.4#11 integrate
.. //depot/projects/gdb/share/man/man4/devctl.4#3 integrate
.. //depot/projects/gdb/share/man/man4/if_bridge.4#2 integrate
.. //depot/projects/gdb/share/man/man4/man4.powerpc/Makefile#1 branch
.. //depot/projects/gdb/share/man/man4/man4.powerpc/powermac_nvram.4#1 branch
.. //depot/projects/gdb/share/man/man4/ng_ether.4#5 integrate
.. //depot/projects/gdb/share/man/man5/src.conf.5#2 integrate
.. //depot/projects/gdb/share/man/man7/hier.7#12 integrate
.. //depot/projects/gdb/share/misc/bsd-family-tree#7 integrate
.. //depot/projects/gdb/sys/amd64/amd64/identcpu.c#8 integrate
.. //depot/projects/gdb/sys/amd64/amd64/pmap.c#24 integrate
.. //depot/projects/gdb/sys/amd64/include/pmap.h#13 integrate
.. //depot/projects/gdb/sys/arm/arm/pmap.c#10 integrate
.. //depot/projects/gdb/sys/boot/i386/loader/main.c#4 integrate
.. //depot/projects/gdb/sys/boot/pc98/loader/main.c#4 integrate
.. //depot/projects/gdb/sys/conf/files.powerpc#8 integrate
.. //depot/projects/gdb/sys/conf/options#36 integrate
.. //depot/projects/gdb/sys/ddb/db_ps.c#7 integrate
.. //depot/projects/gdb/sys/dev/bktr/CHANGELOG.TXT#3 integrate
.. //depot/projects/gdb/sys/dev/dc/dcphy.c#2 integrate
.. //depot/projects/gdb/sys/dev/dc/pnphy.c#2 integrate
.. //depot/projects/gdb/sys/dev/dpt/dpt_scsi.c#5 integrate
.. //depot/projects/gdb/sys/dev/em/README#3 integrate
.. //depot/projects/gdb/sys/dev/em/if_em.c#10 integrate
.. //depot/projects/gdb/sys/dev/em/if_em.h#4 integrate
.. //depot/projects/gdb/sys/dev/em/if_em_hw.c#4 integrate
.. //depot/projects/gdb/sys/dev/em/if_em_hw.h#4 integrate
.. //depot/projects/gdb/sys/dev/em/if_em_osdep.h#3 integrate
.. //depot/projects/gdb/sys/dev/fe/if_fe.c#8 integrate
.. //depot/projects/gdb/sys/dev/ixgb/if_ixgb.c#5 integrate
.. //depot/projects/gdb/sys/dev/mxge/if_mxge.c#2 integrate
.. //depot/projects/gdb/sys/dev/patm/if_patm_intr.c#4 integrate
.. //depot/projects/gdb/sys/dev/pci/pcivar.h#4 integrate
.. //depot/projects/gdb/sys/dev/powermac_nvram/powermac_nvram.c#1 branch
.. //depot/projects/gdb/sys/dev/powermac_nvram/powermac_nvramvar.h#1 branch
.. //depot/projects/gdb/sys/dev/ral/rt2560.c#2 integrate
.. //depot/projects/gdb/sys/dev/re/if_re.c#10 integrate
.. //depot/projects/gdb/sys/dev/sk/if_sk.c#2 integrate
.. //depot/projects/gdb/sys/dev/sym/sym_fw1.h#3 integrate
.. //depot/projects/gdb/sys/dev/sym/sym_fw2.h#3 integrate
.. //depot/projects/gdb/sys/dev/ubsec/ubsec.c#5 integrate
.. //depot/projects/gdb/sys/dev/usb/if_ural.c#2 integrate
.. //depot/projects/gdb/sys/fs/hpfs/hpfs.h#4 integrate
.. //depot/projects/gdb/sys/fs/msdosfs/msdosfs_vfsops.c#11 integrate
.. //depot/projects/gdb/sys/geom/bde/g_bde_work.c#5 integrate
.. //depot/projects/gdb/sys/geom/mirror/g_mirror.c#3 integrate
.. //depot/projects/gdb/sys/geom/raid3/g_raid3.c#3 integrate
.. //depot/projects/gdb/sys/i386/i386/identcpu.c#9 integrate
.. //depot/projects/gdb/sys/i386/i386/pmap.c#22 integrate
.. //depot/projects/gdb/sys/i386/i386/tsc.c#3 integrate
.. //depot/projects/gdb/sys/ia64/ia64/pmap.c#17 integrate
.. //depot/projects/gdb/sys/kern/init_sysent.c#11 integrate
.. //depot/projects/gdb/sys/kern/kern_fork.c#16 integrate
.. //depot/projects/gdb/sys/kern/kern_ktrace.c#8 integrate
.. //depot/projects/gdb/sys/kern/kern_resource.c#11 integrate
.. //depot/projects/gdb/sys/kern/kern_syscalls.c#3 integrate
.. //depot/projects/gdb/sys/kern/kern_tc.c#6 integrate
.. //depot/projects/gdb/sys/kern/kern_time.c#6 integrate
.. //depot/projects/gdb/sys/kern/makesyscalls.sh#3 integrate
.. //depot/projects/gdb/sys/kern/subr_bus.c#16 integrate
.. //depot/projects/gdb/sys/kern/subr_rman.c#6 integrate
.. //depot/projects/gdb/sys/kern/syscalls.c#11 integrate
.. //depot/projects/gdb/sys/kern/systrace_args.c#1 branch
.. //depot/projects/gdb/sys/kern/uipc_sockbuf.c#2 integrate
.. //depot/projects/gdb/sys/kern/uipc_socket.c#27 integrate
.. //depot/projects/gdb/sys/kern/uipc_socket2.c#17 integrate
.. //depot/projects/gdb/sys/kern/uipc_syscalls.c#23 integrate
.. //depot/projects/gdb/sys/kern/uipc_usrreq.c#16 integrate
.. //depot/projects/gdb/sys/kern/vfs_syscalls.c#19 integrate
.. //depot/projects/gdb/sys/modules/Makefile#18 integrate
.. //depot/projects/gdb/sys/modules/powermac_nvram/Makefile#1 branch
.. //depot/projects/gdb/sys/net/bridgestp.c#2 integrate
.. //depot/projects/gdb/sys/net/bridgestp.h#2 integrate
.. //depot/projects/gdb/sys/net/if_bridge.c#2 integrate
.. //depot/projects/gdb/sys/net/if_bridgevar.h#2 integrate
.. //depot/projects/gdb/sys/net/if_vlan.c#14 integrate
.. //depot/projects/gdb/sys/netatalk/ddp_pcb.c#7 integrate
.. //depot/projects/gdb/sys/netgraph/ng_ether.c#10 integrate
.. //depot/projects/gdb/sys/netinet/ip_fw2.c#15 integrate
.. //depot/projects/gdb/sys/netinet/tcp_subr.c#14 integrate
.. //depot/projects/gdb/sys/netncp/ncp_sock.c#3 integrate
.. //depot/projects/gdb/sys/netsmb/smb_trantcp.c#6 integrate
.. //depot/projects/gdb/sys/nfsserver/nfs.h#8 integrate
.. //depot/projects/gdb/sys/nfsserver/nfs_srvcache.c#7 integrate
.. //depot/projects/gdb/sys/nfsserver/nfs_srvsubs.c#10 integrate
.. //depot/projects/gdb/sys/nfsserver/nfs_syscalls.c#10 integrate
.. //depot/projects/gdb/sys/pci/if_rlreg.h#6 integrate
.. //depot/projects/gdb/sys/pci/ncr.c#7 integrate
.. //depot/projects/gdb/sys/powerpc/conf/GENERIC#8 integrate
.. //depot/projects/gdb/sys/powerpc/powerpc/intr_machdep.c#6 integrate
.. //depot/projects/gdb/sys/powerpc/powerpc/machdep.c#11 integrate
.. //depot/projects/gdb/sys/powerpc/powerpc/mmu_if.m#2 integrate
.. //depot/projects/gdb/sys/powerpc/powerpc/mmu_oea.c#2 integrate
.. //depot/projects/gdb/sys/powerpc/powerpc/pmap_dispatch.c#2 integrate
.. //depot/projects/gdb/sys/sparc64/sparc64/pmap.c#12 integrate
.. //depot/projects/gdb/sys/sys/kernel.h#7 integrate
.. //depot/projects/gdb/sys/sys/socketvar.h#12 integrate
.. //depot/projects/gdb/sys/sys/syscall.h#11 integrate
.. //depot/projects/gdb/sys/sys/syscall.mk#11 integrate
.. //depot/projects/gdb/sys/sys/sysent.h#4 integrate
.. //depot/projects/gdb/sys/sys/sysproto.h#11 integrate
.. //depot/projects/gdb/sys/ufs/ufs/ufs_lookup.c#6 integrate
.. //depot/projects/gdb/sys/vm/pmap.h#7 integrate
.. //depot/projects/gdb/sys/vm/swap_pager.c#12 integrate
.. //depot/projects/gdb/sys/vm/vm_object.c#11 integrate
.. //depot/projects/gdb/sys/vm/vm_page.c#17 integrate
.. //depot/projects/gdb/sys/vm/vm_pageout.c#11 integrate
.. //depot/projects/gdb/tools/build/options/WITHOUT_GNU#1 branch
.. //depot/projects/gdb/tools/build/options/WITHOUT_NS_CACHING#1 branch
.. //depot/projects/gdb/tools/build/options/WITHOUT_PAM#1 branch
.. //depot/projects/gdb/tools/build/options/makeman#2 integrate
.. //depot/projects/gdb/tools/kerneldoc/subsys/Makefile#2 integrate
.. //depot/projects/gdb/usr.bin/hexdump/conv.c#4 integrate
.. //depot/projects/gdb/usr.bin/logger/logger.1#4 integrate
.. //depot/projects/gdb/usr.bin/logger/logger.c#3 integrate
.. //depot/projects/gdb/usr.bin/tar/write.c#17 integrate
.. //depot/projects/gdb/usr.bin/telnet/Makefile#4 integrate
.. //depot/projects/gdb/usr.sbin/Makefile#13 integrate
.. //depot/projects/gdb/usr.sbin/elf2exe/Makefile#2 delete
.. //depot/projects/gdb/usr.sbin/elf2exe/elf2exe.8#3 delete
.. //depot/projects/gdb/usr.sbin/elf2exe/elf2exe.c#2 delete
.. //depot/projects/gdb/usr.sbin/inetd/Makefile#3 integrate
.. //depot/projects/gdb/usr.sbin/nvram/Makefile#1 branch
.. //depot/projects/gdb/usr.sbin/nvram/nvram.8#1 branch
.. //depot/projects/gdb/usr.sbin/nvram/nvram.c#1 branch
Differences ...
==== //depot/projects/gdb/Makefile.inc1#15 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.549 2006/06/06 18:07:58 imp Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.550 2006/08/02 15:26:15 netchild Exp $
#
# Make command line options:
# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -731,7 +731,7 @@
echo "You need doxygen (devel/doxygen) to generate the API documentation of the kernel." | /usr/bin/fmt; \
exit 1; \
fi
- cd ${.CURDIR}/sys/doc/subsys && ${MAKE} obj all
+ cd ${.CURDIR}/tools/kerneldoc/subsys && ${MAKE} obj all
#
# update
==== //depot/projects/gdb/bin/sh/histedit.c#4 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/histedit.c,v 1.28 2005/10/19 15:37:42 stefanf Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/histedit.c,v 1.29 2006/08/04 07:56:31 yar Exp $");
#include <sys/param.h>
#include <limits.h>
@@ -370,7 +370,7 @@
fputs(s, efp);
}
/*
- * At end? (if we were to loose last, we'd sure be
+ * At end? (if we were to lose last, we'd sure be
* messed up).
*/
if (he.num == last)
==== //depot/projects/gdb/bin/sh/parser.c#5 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.56 2005/08/15 17:49:38 stefanf Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.57 2006/07/31 11:32:12 yar Exp $");
#include <stdlib.h>
#include <unistd.h>
@@ -952,6 +952,7 @@
USTPUTC('\\', out);
pungetc();
} else if (c == '\n') {
+ plinno++;
if (doprompt)
setprompt(2);
else
==== //depot/projects/gdb/bin/test/test.1#7 (text+ko) ====
@@ -30,9 +30,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)test.1 8.1 (Berkeley) 5/31/93
-.\" $FreeBSD: src/bin/test/test.1,v 1.24 2006/07/27 19:08:21 yar Exp $
+.\" $FreeBSD: src/bin/test/test.1,v 1.25 2006/07/31 09:25:20 yar Exp $
.\"
-.Dd July 27, 2006
+.Dd July 31, 2006
.Dt TEST 1
.Os
.Sh NAME
@@ -339,3 +339,9 @@
.Fl o ,
unlike in the logical operators of
.Xr sh 1 .
+For instance, the writable status of
+.Pa file
+will be tested by the following command even though the former expression
+indicated false, which results in a gratuitous access to the file system:
+.Pp
+.Dl "[ -z abc -a -w file ]"
==== //depot/projects/gdb/etc/mtree/BSD.include.dist#11 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.106 2006/03/19 15:44:53 rwatson Exp $
+# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.107 2006/08/01 22:19:00 sobomax Exp $
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
@@ -56,6 +56,8 @@
..
ppbus
..
+ powermac_nvram
+ ..
smbus
..
speaker
==== //depot/projects/gdb/etc/mtree/BSD.local.dist#8 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.118 2006/01/08 10:15:30 dougb Exp $
+# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.119 2006/08/02 17:22:30 marcel Exp $
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
@@ -111,8 +111,6 @@
cat3
..
cat4
- alpha
- ..
i386
..
..
@@ -123,8 +121,6 @@
cat7
..
cat8
- alpha
- ..
i386
..
..
==== //depot/projects/gdb/etc/mtree/BSD.usr.dist#9 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.315 2006/07/29 19:47:09 simon Exp $
+# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.319 2006/08/03 05:44:51 jb Exp $
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
@@ -18,6 +18,8 @@
aout
..
..
+ dtrace
+ ..
engines
..
..
@@ -655,8 +657,6 @@
cat3
..
cat4
- alpha
- ..
amd64
..
i386
@@ -671,8 +671,6 @@
cat7
..
cat8
- alpha
- ..
amd64
..
i386
@@ -692,8 +690,6 @@
cat3
..
cat4
- alpha
- ..
amd64
..
i386
@@ -708,8 +704,6 @@
cat7
..
cat8
- alpha
- ..
amd64
..
i386
@@ -768,8 +762,6 @@
man3
..
man4
- alpha
- ..
amd64
..
i386
@@ -784,8 +776,6 @@
man7
..
man8
- alpha
- ..
amd64
..
i386
==== //depot/projects/gdb/etc/rc.d/Makefile#11 (text+ko) ====
@@ -1,5 +1,5 @@
# $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $
-# $FreeBSD: src/etc/rc.d/Makefile,v 1.73 2006/06/01 11:01:54 thompsa Exp $
+# $FreeBSD: src/etc/rc.d/Makefile,v 1.74 2006/08/04 18:37:03 des Exp $
.include <bsd.own.mk>
@@ -21,7 +21,7 @@
jail \
kadmind kerberos kernel keyserv kldxref kpasswdd \
ldconfig local localpkg lpd \
- mixer motd mountcritlocal mountcritremote \
+ mixer motd mountcritlocal mountcritremote mountlate \
mdconfig mdconfig2 mountd moused mroute6d mrouted msgs \
named natd netif netoptions \
network_ipv6 newsyslog nfsclient nfsd \
==== //depot/projects/gdb/games/fortune/datfiles/fortunes#13 (text+ko) ====
@@ -1,5 +1,5 @@
This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.223 2006/07/10 16:53:32 phk Exp $
+$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.224 2006/08/04 07:56:31 yar Exp $
%
=======================================================================
@@ -5459,7 +5459,7 @@
Most of us just sit back and marvel at such a story; how could that terminal
know whether the poor guy was sitting or standing? Good debuggers, though,
know that there has to be a reason. Electrical theories are the easiest to
-hypothesize: was there a loose with under the carpet, or problems with static
+hypothesize: was there a loose wire under the carpet, or problems with static
electricity? But electrical problems are rarely consistently reproducible.
An alert IBMer finally noticed that the problem was in the terminal's keyboard:
the tops of two keys were switched. When the programmer was seated he was a
==== //depot/projects/gdb/include/Makefile#12 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.2 (Berkeley) 1/4/94
-# $FreeBSD: src/include/Makefile,v 1.261 2006/03/30 20:15:53 ume Exp $
+# $FreeBSD: src/include/Makefile,v 1.262 2006/08/01 22:19:00 sobomax Exp $
#
# Doing a "make install" builds /usr/include.
@@ -41,7 +41,7 @@
LSUBDIRS= cam/scsi \
dev/acpica dev/an dev/bktr dev/firewire dev/hwpmc \
dev/ic dev/iicbus ${_dev_ieee488} dev/lmc dev/ofw \
- dev/pbio dev/ppbus dev/smbus dev/speaker dev/usb dev/wi dev/utopia \
+ dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus dev/speaker dev/usb dev/wi dev/utopia \
fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs \
${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/umapfs \
fs/unionfs \
@@ -55,6 +55,10 @@
security/mac_mls security/mac_partition \
ufs/ffs ufs/ufs
+.if ${MACHINE_ARCH} == "powerpc"
+_dev_powermac_nvram= dev/powermac_nvram
+.endif
+
.if ${MK_GPIB} != "no"
_dev_ieee488= dev/ieee488
.endif
==== //depot/projects/gdb/lib/Makefile#12 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/Makefile,v 1.214 2006/03/20 14:24:57 ru Exp $
+# $FreeBSD: src/lib/Makefile,v 1.215 2006/08/04 17:56:31 marcel Exp $
.include <bsd.own.mk>
@@ -111,7 +111,7 @@
_libthr= libthr
.endif
-.if ${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "powerpc"
+.if ${MACHINE_ARCH} != "arm"
_libthread_db= libthread_db
.endif
==== //depot/projects/gdb/lib/libarchive/archive_write.c#11 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_write.c,v 1.16 2005/09/24 21:15:00 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write.c,v 1.17 2006/08/01 05:31:29 kientzle Exp $");
/*
* This file contains the "essential" portions of the write API, that
@@ -201,7 +201,9 @@
if (a->state & ARCHIVE_STATE_DATA)
((a->format_finish_entry)(a));
- if (archive_entry_dev(entry) == a->skip_file_dev &&
+ if (a->skip_file_dev != 0 &&
+ archive_entry_dev(entry) == a->skip_file_dev &&
+ a->skip_file_ino != 0 &&
archive_entry_ino(entry) == a->skip_file_ino) {
archive_set_error(a, 0, "Can't add archive to itself");
return (ARCHIVE_WARN);
==== //depot/projects/gdb/lib/libc/resolv/res_init.c#2 (text) ====
@@ -73,10 +73,12 @@
static const char rcsid[] = "$Id: res_init.c,v 1.9.2.5.4.5 2005/11/03 00:00:52 marka Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/resolv/res_init.c,v 1.2 2006/03/21 15:37:16 ume Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/resolv/res_init.c,v 1.3 2006/08/04 10:21:11 ume Exp $");
#include "port_before.h"
+#include "namespace.h"
+
#include <sys/types.h>
#include <sys/param.h>
#include <sys/socket.h>
@@ -93,6 +95,8 @@
#include <unistd.h>
#include <netdb.h>
+#include "un-namespace.h"
+
#include "port_after.h"
/* ensure that sockaddr_in6 and IN6ADDR_ANY_INIT are declared / defined */
@@ -735,13 +739,13 @@
int ns;
if (statp->_vcsock >= 0) {
- (void) close(statp->_vcsock);
+ (void) _close(statp->_vcsock);
statp->_vcsock = -1;
statp->_flags &= ~(RES_F_VC | RES_F_CONN);
}
for (ns = 0; ns < statp->_u._ext.nscount; ns++) {
if (statp->_u._ext.nssocks[ns] != -1) {
- (void) close(statp->_u._ext.nssocks[ns]);
+ (void) _close(statp->_u._ext.nssocks[ns]);
statp->_u._ext.nssocks[ns] = -1;
}
}
==== //depot/projects/gdb/lib/libc/resolv/res_send.c#2 (text) ====
@@ -73,7 +73,7 @@
static const char rcsid[] = "$Id: res_send.c,v 1.5.2.2.4.7 2005/08/15 02:04:41 marka Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/resolv/res_send.c,v 1.2 2006/03/21 15:37:16 ume Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/resolv/res_send.c,v 1.3 2006/08/04 12:26:07 ume Exp $");
/*
* Send query to name server and wait for reply.
@@ -970,6 +970,10 @@
res_nclose(statp);
return (0);
}
+#ifdef USE_KQUEUE
+ if (kv.ident != s)
+ goto wait;
+#endif
errno = 0;
fromlen = sizeof(from);
resplen = _recvfrom(s, (char*)ans, anssiz,0,
==== //depot/projects/gdb/lib/libc/sys/kse.2#3 (text+ko) ====
@@ -33,7 +33,7 @@
.\" THE USE OF THIS SOFTWARE, EVEN IF PACKET DESIGN IS ADVISED OF
.\" THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/sys/kse.2,v 1.17 2005/11/24 07:33:35 ru Exp $
+.\" $FreeBSD: src/lib/libc/sys/kse.2,v 1.18 2006/08/04 07:56:31 yar Exp $
.\"
.Dd July 12, 2004
.Dt KSE 2
@@ -267,7 +267,7 @@
.Pp
As a special case, if the last remaining KSE in the last remaining KSE group
invokes this system call, then the KSE is not destroyed;
-instead, the KSE just looses the association with its mailbox and
+instead, the KSE just loses the association with its mailbox and
.Fn kse_exit
returns normally.
This returns the process to its original, unthreaded state.
==== //depot/projects/gdb/lib/libc/uuid/uuid_compare.c#3 (text+ko) ====
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libc/uuid/uuid_compare.c,v 1.4 2005/01/03 02:56:15 marcel Exp $
+ * $FreeBSD: src/lib/libc/uuid/uuid_compare.c,v 1.5 2006/08/03 03:34:36 delphij Exp $
*/
#include <string.h>
@@ -41,7 +41,8 @@
int32_t
uuid_compare(const uuid_t *a, const uuid_t *b, uint32_t *status)
{
- int res;
+ int res;
+ int64_t res64;
if (status != NULL)
*status = uuid_s_ok;
@@ -54,10 +55,19 @@
if (b == NULL)
return ((uuid_is_nil(a, NULL)) ? 0 : 1);
- /* We have to compare the hard way. */
- res = (int)((int64_t)a->time_low - (int64_t)b->time_low);
- if (res)
- return ((res < 0) ? -1 : 1);
+ /*
+ * We have to compare the hard way.
+ *
+ * Note that time_low is defined as unsigned 32-bit
+ * integer, therefore, with a significantly large
+ * a->time_low and a small b->time_low, we will end
+ * up with a value which is larger than 0x7fffffff
+ * which is negative if casted to signed 32-bit
+ * integer.
+ */
+ res64 = (int64_t)a->time_low - (int64_t)b->time_low;
+ if (res64)
+ return ((res64 < 0) ? -1 : 1);
res = (int)a->time_mid - (int)b->time_mid;
if (res)
return ((res < 0) ? -1 : 1);
==== //depot/projects/gdb/lib/libtelnet/Makefile#4 (text+ko) ====
@@ -1,5 +1,5 @@
# From: @(#)Makefile 8.2 (Berkeley) 12/15/93
-# $FreeBSD: src/lib/libtelnet/Makefile,v 1.23 2006/03/17 18:54:28 ru Exp $
+# $FreeBSD: src/lib/libtelnet/Makefile,v 1.24 2006/07/31 13:29:35 yar Exp $
.include <bsd.own.mk>
@@ -19,13 +19,14 @@
.if ${MK_OPENSSL} != "no"
SRCS+= encrypt.c auth.c enc_des.c sra.c pk.c
CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DSRA
+.endif
+
.if ${MK_KERBEROS_SUPPORT} != "no"
SRCS+= kerberos5.c
CFLAGS+= -DKRB5 -I${KRB5DIR}/lib/krb5 -I${KRB5OBJDIR} -I${ASN1OBJDIR}
CFLAGS+= -DFORWARD -Dnet_write=telnet_net_write
.endif
.endif
-.endif
INCS= ${TELNETDIR}/arpa/telnet.h
INCSDIR= ${INCLUDEDIR}/arpa
==== //depot/projects/gdb/libexec/rtld-elf/rtld.c#9 (text+ko) ====
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.114 2006/03/28 06:14:22 davidxu Exp $
+ * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.115 2006/08/04 13:37:54 delphij Exp $
*/
/*
@@ -2451,8 +2451,8 @@
} else {
if (obj->versyms == NULL) {
if (object_match_name(obj, ventry->name)) {
- _rtld_error("%s: object %s should provide version %s for ",
- "symbol %s", obj->path, ventry->name,
+ _rtld_error("%s: object %s should provide version %s for "
+ "symbol %s", obj_rtld.path, obj->path, ventry->name,
obj->strtab + symnum);
continue;
}
==== //depot/projects/gdb/libexec/telnetd/Makefile#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/libexec/telnetd/Makefile,v 1.28 2006/07/27 12:15:37 yar Exp $
+# $FreeBSD: src/libexec/telnetd/Makefile,v 1.31 2006/07/31 19:15:09 yar Exp $
# Do not define -DKLUDGELINEMODE, as it does not interact well with many
# telnet implementations.
@@ -30,18 +30,20 @@
DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET}
LDADD= -lutil -ltermcap ${LIBTELNET}
+# XXX for src/release/picobsd
.if !defined(RELEASE_CRUNCH)
.if ${MK_OPENSSL} != "no"
SRCS+= authenc.c
CFLAGS+= -DAUTHENTICATION -DENCRYPTION
DPADD+= ${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} ${LIBPAM}
LDADD+= -lmp -lcrypto -lcrypt ${MINUSLPAM}
+.endif
+
.if ${MK_KERBEROS_SUPPORT} != "no"
CFLAGS+= -DKRB5 -DFORWARD -Dnet_write=telnet_net_write
DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR}
LDADD+= -lkrb5 -lasn1 -lroken -lcom_err
.endif
.endif
-.endif
.include <bsd.prog.mk>
==== //depot/projects/gdb/release/doc/en_US.ISO8859-1/hardware/Makefile#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/Makefile,v 1.7 2006/05/15 21:12:12 wilko Exp $
+# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/Makefile,v 1.8 2006/07/31 01:32:29 marcel Exp $
RELN_ROOT?= ${.CURDIR}/../..
@@ -6,6 +6,7 @@
SUBDIR+= ia64
SUBDIR+= i386
SUBDIR+= pc98
+SUBDIR+= powerpc
SUBDIR+= sparc64
.include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
==== //depot/projects/gdb/release/doc/en_US.ISO8859-1/hardware/common/hw.ent#2 (text+ko) ====
@@ -1,5 +1,5 @@
<!-- -*- sgml -*- -->
-<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/hw.ent,v 1.5 2003/06/27 03:50:35 bmah Exp $ -->
+<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/hw.ent,v 1.6 2006/07/31 01:32:29 marcel Exp $ -->
<!-- Text constants which probably don't need to be changed.-->
@@ -11,6 +11,7 @@
<!ENTITY sect.proc.amd64 SYSTEM "../amd64/proc-amd64.sgml">
<!ENTITY sect.proc.i386 SYSTEM "../i386/proc-i386.sgml">
<!ENTITY sect.proc.ia64 SYSTEM "../ia64/proc-ia64.sgml">
+<!ENTITY sect.proc.powerpc SYSTEM "../powerpc/proc-powerpc.sgml">
<!ENTITY sect.proc.pc98 SYSTEM "../pc98/proc-pc98.sgml">
<!ENTITY sect.proc.sparc64 SYSTEM "../sparc64/proc-sparc64.sgml">
<!ENTITY sect.dev SYSTEM "../common/dev.sgml">
==== //depot/projects/gdb/release/doc/en_US.ISO8859-1/hardware/ia64/Makefile#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/ia64/Makefile,v 1.3 2004/08/03 22:12:45 simon Exp $
+# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/ia64/Makefile,v 1.4 2006/07/31 01:27:16 marcel Exp $
RELN_ROOT?= ${.CURDIR}/../../..
@@ -11,7 +11,7 @@
# SGML content
SRCS+= article.sgml
-# SRCS+= proc-ia64.sgml
+SRCS+= proc-ia64.sgml
SRCS+= ../common/hw.ent
SRCS+= ../common/artheader.sgml
SRCS+= ../common/dev.sgml
==== //depot/projects/gdb/release/doc/en_US.ISO8859-1/installation/Makefile#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/Makefile,v 1.7 2006/05/18 16:27:53 bmah Exp $
+# $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/Makefile,v 1.8 2006/07/31 01:32:29 marcel Exp $
RELN_ROOT?= ${.CURDIR}/../..
@@ -6,6 +6,7 @@
SUBDIR+= ia64
SUBDIR+= i386
SUBDIR+= pc98
+SUBDIR+= powerpc
SUBDIR+= sparc64
.include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
==== //depot/projects/gdb/release/doc/en_US.ISO8859-1/relnotes/Makefile#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/Makefile,v 1.7 2006/05/18 16:27:53 bmah Exp $
+# $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/Makefile,v 1.8 2006/07/31 01:32:30 marcel Exp $
RELN_ROOT?= ${.CURDIR}/../..
@@ -6,6 +6,7 @@
SUBDIR+= ia64
SUBDIR+= i386
SUBDIR+= pc98
+SUBDIR+= powerpc
SUBDIR+= sparc64
.include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
==== //depot/projects/gdb/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#27 (text+ko) ====
@@ -3,7 +3,7 @@
<corpauthor>The &os; Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.958 2006/07/25 21:48:28 bmah Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.959 2006/07/31 16:49:25 brueffer Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -618,7 +618,7 @@
<para>The &man.my.4; driver is now MPSAFE. &merged;</para>
- <para>The &man.my.4; driver now supports &man.altq.4;.</para>
+ <para>The &man.my.4; driver now supports &man.altq.4;. &merged;</para>
<para arch="i386,amd64">The &man.mxge.4; driver,
which supports Myricom Myri10GE 10 Gigabit Ethernet
@@ -641,7 +641,7 @@
<para>The &man.sk.4; driver is now MPSAFE. &merged;</para>
- <para>The &man.ste.4; driver is now MPSAFE.</para>
+ <para>The &man.ste.4; driver is now MPSAFE. &merged;</para>
<para>The &man.stge.4; driver has been added. It supports the
Sundance/Tamarack TC9021 Gigabit Ethernet controller and was
==== //depot/projects/gdb/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.sgml#2 (text+ko) ====
@@ -3,7 +3,7 @@
The FreeBSD French Documentation Project
$Id: proc-alpha.sgml,v 1.5 2002/09/29 17:03:01 eagle Exp $
- $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.sgml,v 1.5 2002/12/30 21:18:04 schweikh Exp $
+ $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.sgml,v 1.6 2006/08/04 07:56:32 yar Exp $
Original revision: 1.43
-->
@@ -1212,7 +1212,7 @@
IDE interface is quite slow, a Promise card gives a 3-4 times
speed improvement.</para>
- <para>On PC164 the SRM sometimes seems to loose its variable settings.
+ <para>On PC164 the SRM sometimes seems to lose its variable settings.
<quote>For PC164, current superstition says that, to avoid losing settings,
you want to first downgrade to SRM 4.x and then upgrade to 5.x.</quote>
One sample error that was observed was:</para>
==== //depot/projects/gdb/release/doc/share/examples/Makefile.relnotesng#3 (text+ko) ====
@@ -1,12 +1,12 @@
# -*- makefile -*-
#
-# $FreeBSD: src/release/doc/share/examples/Makefile.relnotesng,v 1.12 2006/05/16 16:12:45 bmah Exp $
+# $FreeBSD: src/release/doc/share/examples/Makefile.relnotesng,v 1.13 2006/07/31 01:32:30 marcel Exp $
#
# Sample makefile for rendering and uploading RELNOTESng files outside
# the build tree.
#
-ARCHS= amd64 ia64 i386 pc98 sparc64
+ARCHS= amd64 ia64 i386 pc98 powerpc sparc64
MULTITEXTS= installation relnotes hardware
UNITEXTS= readme errata
==== //depot/projects/gdb/release/doc/share/misc/dev.archlist.txt#3 (text+ko) ====
@@ -23,7 +23,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.87 2006/07/25 05:13:53 brueffer Exp $
+# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.88 2006/07/31 17:04:28 brueffer Exp $
#
#
@@ -46,14 +46,14 @@
arcmsr i386,amd64
asr i386
ath i386
-aue i386,pc98,ia64,amd64
+aue i386,pc98,ia64,amd64,powerpc
awi i386,pc98,amd64
-axe i386,pc98,amd64
+axe i386,pc98,amd64,powerpc
bce i386,amd64
bge i386,pc98,sparc64,ia64,amd64
bktr i386,pc98
bt i386,amd64
-cdce i386,pc98,ia64,amd64
+cdce i386,pc98,ia64,amd64,powerpc
ciss i386,ia64,amd64
ce i386,pc98
cm i386
@@ -61,7 +61,7 @@
cp i386,pc98
ct pc98
ctau i386
-cue i386,pc98,ia64,amd64
+cue i386,pc98,ia64,amd64,powerpc
cx i386
de i386,pc98,alpha,ia64,amd64
dpt i386,ia64,amd64
@@ -70,8 +70,8 @@
esp sparc64
ex i386,amd64
fe i386,pc98,amd64
-fwohci i386,sparc64,ia64,amd64
-gem sparc64
+fwohci i386,sparc64,ia64,amd64,powerpc
+gem sparc64,powerpc
hifn i386,pc98,amd64
hptmv i386,amd64
ida i386
@@ -79,7 +79,7 @@
iir i386,ia64,amd64
ips i386,amd64
ixgb i386,amd64
-kue i386,pc98,ia64,amd64
+kue i386,pc98,ia64,amd64,powerpc
lge i386,pc98,amd64
mfi i386,alpha,ia64,amd64
mlx i386,alpha,ia64,amd64
@@ -93,7 +93,7 @@
nge i386,pc98,alpha,amd64
nsp i386,pc98
nve i386,amd64
-ohci i386,pc98,alpha,ia64,amd64
+ohci i386,pc98,alpha,ia64,amd64,powerpc
oltr i386
pcn i386,pc98,alpha,ia64,amd64
pst i386
@@ -148,13 +148,13 @@
ucycom i386,pc98,amd64
udav i386,pc98,amd64
uftdi i386,pc98,amd64
-uhci i386,pc98,alpha,ia64,amd64
-ulpt i386,pc98,alpha,amd64
-umass i386,pc98,alpha,amd64
+uhci i386,pc98,alpha,ia64,amd64,powerpc
+ulpt i386,pc98,alpha,amd64,powerpc
+umass i386,pc98,alpha,amd64,powerpc
umodem i386,pc98,amd64
uplcom i386,pc98,amd64
-urio i386,pc98,amd64
-uscanner i386,pc98,amd64
+urio i386,pc98,amd64,powerpc
+uscanner i386,pc98,amd64,powerpc
uvisor i386,pc98,amd64
uvscom i386,pc98,amd64
vge i386,pc98,amd64
==== //depot/projects/gdb/sbin/reboot/reboot.c#4 (text+ko) ====
@@ -39,7 +39,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/reboot/reboot.c,v 1.24 2005/03/21 23:44:04 pjd Exp $");
+__FBSDID("$FreeBSD: src/sbin/reboot/reboot.c,v 1.26 2006/08/02 13:05:38 bms Exp $");
#include <sys/reboot.h>
#include <sys/types.h>
@@ -151,13 +151,26 @@
if (!nflag)
sync();
+ /*
+ * Ignore signals that we can get as a result of killing
+ * parents, group leaders, etc.
+ */
+ (void)signal(SIGHUP, SIG_IGN);
+ (void)signal(SIGINT, SIG_IGN);
+ (void)signal(SIGQUIT, SIG_IGN);
+ (void)signal(SIGTERM, SIG_IGN);
+ (void)signal(SIGTSTP, SIG_IGN);
+
+ /*
+ * If we're running in a pipeline, we don't want to die
+ * after killing whatever we're writing to.
+ */
+ (void)signal(SIGPIPE, SIG_IGN);
+
/* Just stop init -- if we fail, we'll restart it. */
if (kill(1, SIGTSTP) == -1)
err(1, "SIGTSTP init");
- /* Ignore the SIGHUP we get when our parent shell dies. */
- (void)signal(SIGHUP, SIG_IGN);
-
/* Send a SIGTERM first, a chance to save the buffers. */
if (kill(-1, SIGTERM) == -1 && errno != ESRCH)
err(1, "SIGTERM processes");
==== //depot/projects/gdb/sbin/sysctl/sysctl.c#5 (text+ko) ====
@@ -38,7 +38,7 @@
static char sccsid[] = "@(#)from: sysctl.c 8.1 (Berkeley) 6/6/93";
#endif
static const char rcsid[] =
- "$FreeBSD: src/sbin/sysctl/sysctl.c,v 1.70 2006/07/25 02:28:43 njl Exp $";
+ "$FreeBSD: src/sbin/sysctl/sysctl.c,v 1.71 2006/08/04 07:31:55 njl Exp $";
#endif /* not lint */
#ifdef __i386__
@@ -577,15 +577,14 @@
val = "";
while (len >= sizeof(int)) {
fputs(val, stdout);
- if(*fmt == 'U')
+ if (*fmt == 'U')
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list