Date: Mon, 23 Jun 2003 02:29:45 -0700 (PDT) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 33557 for review Message-ID: <200306230929.h5N9TjDE013064@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=33557 Change 33557 by marcel@marcel_nfs on 2003/06/23 02:29:01 IFC @33556 Affected files ... .. //depot/projects/ia64/Makefile#26 integrate .. //depot/projects/ia64/Makefile.inc1#67 integrate .. //depot/projects/ia64/bin/cp/utils.c#9 integrate .. //depot/projects/ia64/contrib/gdtoa/gdtoaimp.h#5 integrate .. //depot/projects/ia64/contrib/groff/src/roff/nroff/nroff.sh#4 integrate .. //depot/projects/ia64/etc/rc.d/Makefile#15 integrate .. //depot/projects/ia64/etc/rc.d/devdb#3 delete .. //depot/projects/ia64/gnu/usr.bin/send-pr/categories#5 integrate .. //depot/projects/ia64/gnu/usr.bin/send-pr/send-pr.1#6 integrate .. //depot/projects/ia64/include/paths.h#9 integrate .. //depot/projects/ia64/include/stdlib.h#19 integrate .. //depot/projects/ia64/lib/libc/compat-43/sigpause.2#4 integrate .. //depot/projects/ia64/lib/libc/gdtoa/glue.c#2 integrate .. //depot/projects/ia64/lib/libc/gen/devname.3#5 integrate .. //depot/projects/ia64/lib/libc/gen/devname.c#4 integrate .. //depot/projects/ia64/lib/libc/gen/ttyname.c#3 integrate .. //depot/projects/ia64/lib/libc/sys/ntp_adjtime.2#2 integrate .. //depot/projects/ia64/lib/libc/sys/ntp_gettime.2#2 integrate .. //depot/projects/ia64/lib/libpthread/Makefile#8 integrate .. //depot/projects/ia64/lib/libpthread/arch/alpha/Makefile.inc#1 branch .. //depot/projects/ia64/lib/libpthread/arch/alpha/alpha/_atomic_lock.S#2 delete .. //depot/projects/ia64/lib/libpthread/arch/i386/Makefile.inc#1 branch .. //depot/projects/ia64/lib/libpthread/arch/ia64/Makefile.inc#1 branch .. //depot/projects/ia64/lib/libpthread/arch/ia64/ia64/_atomic_lock.S#2 delete .. //depot/projects/ia64/lib/libpthread/arch/ia64/include/atomic_ops.h#1 branch .. //depot/projects/ia64/lib/libpthread/arch/ia64/include/pthread_md.h#1 branch .. //depot/projects/ia64/lib/libpthread/sys/Makefile.inc#5 integrate .. //depot/projects/ia64/libexec/ftpd/ftpcmd.y#16 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/errata/article.sgml#20 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#99 integrate .. //depot/projects/ia64/release/picobsd/bridge/PICOBSD#4 integrate .. //depot/projects/ia64/release/picobsd/bridge/crunch.conf#6 integrate .. //depot/projects/ia64/sbin/dmesg/dmesg.c#5 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw.8#20 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw2.c#16 integrate .. //depot/projects/ia64/share/man/man4/pci.4#2 integrate .. //depot/projects/ia64/sys/alpha/osf1/osf1_mount.c#9 integrate .. //depot/projects/ia64/sys/amd64/amd64/mem.c#3 integrate .. //depot/projects/ia64/sys/amd64/amd64/pmap.c#6 integrate .. //depot/projects/ia64/sys/amd64/include/pmap.h#4 integrate .. //depot/projects/ia64/sys/compat/linux/linux_file.c#16 integrate .. //depot/projects/ia64/sys/compat/linux/linux_stats.c#13 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_fcntl.c#10 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_misc.c#20 integrate .. //depot/projects/ia64/sys/conf/files#82 integrate .. //depot/projects/ia64/sys/conf/kern.post.mk#34 integrate .. //depot/projects/ia64/sys/dev/md/md.c#30 integrate .. //depot/projects/ia64/sys/dev/pci/pci.c#24 integrate .. //depot/projects/ia64/sys/dev/pci/pci_user.c#7 integrate .. //depot/projects/ia64/sys/fs/fdescfs/fdesc_vnops.c#14 integrate .. //depot/projects/ia64/sys/fs/ntfs/ntfs_subr.c#11 integrate .. //depot/projects/ia64/sys/fs/pseudofs/pseudofs_vnops.c#18 integrate .. //depot/projects/ia64/sys/fs/unionfs/union_subr.c#13 integrate .. //depot/projects/ia64/sys/i386/bios/apm.c#3 integrate .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_misc.c#11 integrate .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_stat.c#7 integrate .. //depot/projects/ia64/sys/i386/isa/pcf.c#6 integrate .. //depot/projects/ia64/sys/kern/kern_acl.c#17 integrate .. //depot/projects/ia64/sys/kern/kern_alq.c#7 integrate .. //depot/projects/ia64/sys/kern/kern_descrip.c#58 integrate .. //depot/projects/ia64/sys/kern/kern_ktr.c#12 integrate .. //depot/projects/ia64/sys/kern/kern_mac.c#28 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#53 integrate .. //depot/projects/ia64/sys/kern/kern_timeout.c#8 integrate .. //depot/projects/ia64/sys/kern/sched_ule.c#19 integrate .. //depot/projects/ia64/sys/kern/subr_log.c#11 integrate .. //depot/projects/ia64/sys/kern/subr_msgbuf.c#1 branch .. //depot/projects/ia64/sys/kern/subr_prf.c#27 integrate .. //depot/projects/ia64/sys/kern/tty.c#29 integrate .. //depot/projects/ia64/sys/kern/tty_cons.c#14 integrate .. //depot/projects/ia64/sys/kern/vfs_aio.c#35 integrate .. //depot/projects/ia64/sys/kern/vfs_bio.c#54 integrate .. //depot/projects/ia64/sys/kern/vfs_syscalls.c#47 integrate .. //depot/projects/ia64/sys/kern/vfs_vnops.c#32 integrate .. //depot/projects/ia64/sys/kern/vnode_if.src#13 integrate .. //depot/projects/ia64/sys/netinet/ip_fw2.c#19 integrate .. //depot/projects/ia64/sys/netsmb/smb_dev.c#12 integrate .. //depot/projects/ia64/sys/nfsserver/nfs_serv.c#22 integrate .. //depot/projects/ia64/sys/pci/viapm.c#5 integrate .. //depot/projects/ia64/sys/security/mac_biba/mac_biba.c#19 integrate .. //depot/projects/ia64/sys/security/mac_lomac/mac_lomac.c#12 integrate .. //depot/projects/ia64/sys/security/mac_mls/mac_mls.c#19 integrate .. //depot/projects/ia64/sys/security/mac_none/mac_none.c#9 integrate .. //depot/projects/ia64/sys/security/mac_partition/mac_partition.c#5 integrate .. //depot/projects/ia64/sys/security/mac_test/mac_test.c#10 integrate .. //depot/projects/ia64/sys/sparc64/include/bus.h#17 integrate .. //depot/projects/ia64/sys/sparc64/include/cpufunc.h#9 integrate .. //depot/projects/ia64/sys/sparc64/pci/psycho.c#27 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/support.S#7 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/trap.c#28 integrate .. //depot/projects/ia64/sys/sys/alq.h#3 integrate .. //depot/projects/ia64/sys/sys/fcntl.h#5 integrate .. //depot/projects/ia64/sys/sys/file.h#18 integrate .. //depot/projects/ia64/sys/sys/mac_policy.h#15 integrate .. //depot/projects/ia64/sys/sys/msgbuf.h#6 integrate .. //depot/projects/ia64/sys/sys/tty.h#7 integrate .. //depot/projects/ia64/sys/tools/vnode_if.awk#7 integrate .. //depot/projects/ia64/sys/vm/swap_pager.c#30 integrate .. //depot/projects/ia64/sys/vm/swap_pager.h#10 integrate .. //depot/projects/ia64/sys/vm/vm_fault.c#34 integrate .. //depot/projects/ia64/sys/vm/vm_mmap.c#20 integrate .. //depot/projects/ia64/sys/vm/vm_object.c#61 integrate .. //depot/projects/ia64/sys/vm/vm_page.c#48 integrate .. //depot/projects/ia64/sys/vm/vm_pager.c#13 integrate .. //depot/projects/ia64/sys/vm/vm_pager.h#7 integrate .. //depot/projects/ia64/sys/vm/vnode_pager.c#34 integrate .. //depot/projects/ia64/tools/tools/tinderbox/tbmaster.pl#14 integrate .. //depot/projects/ia64/usr.bin/Makefile#48 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.computer#3 integrate .. //depot/projects/ia64/usr.bin/locale/Makefile#2 integrate .. //depot/projects/ia64/usr.bin/locale/locale.1#1 branch .. //depot/projects/ia64/usr.bin/locale/locale.c#2 integrate .. //depot/projects/ia64/usr.sbin/Makefile#41 integrate .. //depot/projects/ia64/usr.sbin/adduser/adduser.8#11 integrate .. //depot/projects/ia64/usr.sbin/adduser/adduser.sh#8 integrate .. //depot/projects/ia64/usr.sbin/adduser/rmuser.sh#5 integrate .. //depot/projects/ia64/usr.sbin/apmd/apmd.8#4 integrate .. //depot/projects/ia64/usr.sbin/apmd/apmd.c#2 integrate .. //depot/projects/ia64/usr.sbin/dev_mkdb/Makefile#2 delete .. //depot/projects/ia64/usr.sbin/dev_mkdb/dev_mkdb.8#5 delete .. //depot/projects/ia64/usr.sbin/dev_mkdb/dev_mkdb.c#7 delete .. //depot/projects/ia64/usr.sbin/gifconfig/Makefile#2 delete .. //depot/projects/ia64/usr.sbin/gifconfig/gifconfig.8#6 delete .. //depot/projects/ia64/usr.sbin/gifconfig/gifconfig.c#3 delete .. //depot/projects/ia64/usr.sbin/lpr/filters.ru/koi2855/koi2855.c#3 integrate .. //depot/projects/ia64/usr.sbin/pciconf/pciconf.c#4 integrate .. //depot/projects/ia64/usr.sbin/ppp/command.c#15 integrate .. //depot/projects/ia64/usr.sbin/ppp/ncpaddr.c#9 integrate .. //depot/projects/ia64/usr.sbin/ppp/ppp.8.m4#17 integrate .. //depot/projects/ia64/usr.sbin/ppp/radius.c#10 integrate .. //depot/projects/ia64/usr.sbin/ppp/radius.h#7 integrate .. //depot/projects/ia64/usr.sbin/prefix/Makefile#3 delete .. //depot/projects/ia64/usr.sbin/prefix/prefix.8#6 delete .. //depot/projects/ia64/usr.sbin/prefix/prefix.sh#2 delete Differences ... ==== //depot/projects/ia64/Makefile#26 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.280 2003/04/03 05:34:36 imp Exp $ +# $FreeBSD: src/Makefile,v 1.282 2003/06/22 21:56:22 ru Exp $ # # The user-driven targets are: # @@ -11,7 +11,9 @@ # world - buildworld + installworld. # buildkernel - Rebuild the kernel and the kernel-modules. # installkernel - Install the kernel and the kernel-modules. +# installkernel.debug # reinstallkernel - Reinstall the kernel and the kernel-modules. +# reinstallkernel.debug # kernel - buildkernel + installkernel. # update - Convenient way to update your source tree (cvs). # most - Build user commands, no libraries or include files. @@ -60,8 +62,9 @@ # TGTS= all all-man buildkernel buildworld checkdpadd clean \ cleandepend cleandir depend distribute distributeworld everything \ - hierarchy install installcheck installkernel \ - reinstallkernel installmost installworld libraries lint maninstall \ + hierarchy install installcheck installkernel installkernel.debug\ + reinstallkernel reinstallkernel.debug installmost installworld \ + libraries lint maninstall \ mk most obj objlink regress rerelease tags update BITGTS= files includes @@ -71,7 +74,9 @@ .ORDER: buildworld distributeworld .ORDER: buildworld buildkernel .ORDER: buildkernel installkernel +.ORDER: buildkernel installkernel.debug .ORDER: buildkernel reinstallkernel +.ORDER: buildkernel reinstallkernel.debug PATH= /sbin:/bin:/usr/sbin:/usr/bin MAKEOBJDIRPREFIX?= /usr/obj @@ -135,7 +140,7 @@ # upgrade_checks: @if ! (cd ${.CURDIR}/tools/regression/usr.bin/make && \ - PATH=${PATH} ${MAKE} 2>/dev/null); \ + PATH=${PATH} ${MAKE} >/dev/null 2>&1); \ then \ (cd ${.CURDIR} && make make); \ fi @@ -155,7 +160,7 @@ make: @echo @echo "--------------------------------------------------------------" - @echo " Building an up-to-date make(1)" + @echo ">>> Building an up-to-date make(1)" @echo "--------------------------------------------------------------" @cd ${.CURDIR}/usr.bin/make; \ ${MMAKE} obj && \ ==== //depot/projects/ia64/Makefile.inc1#67 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.367 2003/06/14 17:50:13 imp Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.368 2003/06/22 10:01:03 simokawa Exp $ # # Make command line options: # -DNO_KERBEROS Do not build Heimdal (Kerberos 5) @@ -538,14 +538,14 @@ # # Install the kernel defined by INSTALLKERNEL # -installkernel reinstallkernel: +installkernel reinstallkernel installkernel.debug reinstallkernel.debug: .if empty(INSTALLKERNEL) @echo "ERROR: No kernel \"${KERNCONF}\" to install." @false .endif cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \ ${CROSSENV} PATH=${TMPPATH} \ - ${MAKE} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel$//} + ${MAKE} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel//} # # update ==== //depot/projects/ia64/bin/cp/utils.c#9 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.40 2003/04/07 11:00:56 mdodd Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.41 2003/06/22 07:02:17 jmg Exp $"); #include <sys/param.h> #include <sys/stat.h> @@ -233,7 +233,7 @@ warn("symlink: %s", llink); return (1); } - return (0); + return (pflag ? setfile(p->fts_statp, -1) : 0); } int @@ -247,7 +247,7 @@ warn("mkfifo: %s", to.p_path); return (1); } - return (pflag ? setfile(from_stat, 0) : 0); + return (pflag ? setfile(from_stat, -1) : 0); } int @@ -261,7 +261,7 @@ warn("mknod: %s", to.p_path); return (1); } - return (pflag ? setfile(from_stat, 0) : 0); + return (pflag ? setfile(from_stat, -1) : 0); } int @@ -269,20 +269,22 @@ { static struct timeval tv[2]; struct stat ts; - int rval; - int gotstat; + int rval, gotstat, islink, fdval; rval = 0; + fdval = fd != -1; + islink = !fdval && S_ISLNK(fs->st_mode); fs->st_mode &= S_ISUID | S_ISGID | S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO; TIMESPEC_TO_TIMEVAL(&tv[0], &fs->st_atimespec); TIMESPEC_TO_TIMEVAL(&tv[1], &fs->st_mtimespec); - if (utimes(to.p_path, tv)) { - warn("utimes: %s", to.p_path); + if (islink ? lutimes(to.p_path, tv) : utimes(to.p_path, tv)) { + warn("%sutimes: %s", islink ? "l" : "", to.p_path); rval = 1; } - if (fd ? fstat(fd, &ts) : stat(to.p_path, &ts)) + if (fdval ? fstat(fd, &ts) : + (islink ? lstat(to.p_path, &ts) : stat(to.p_path, &ts))) gotstat = 0; else { gotstat = 1; @@ -296,8 +298,9 @@ * chown. If chown fails, lose setuid/setgid bits. */ if (!gotstat || fs->st_uid != ts.st_uid || fs->st_gid != ts.st_gid) - if (fd ? fchown(fd, fs->st_uid, fs->st_gid) : - chown(to.p_path, fs->st_uid, fs->st_gid)) { + if (fdval ? fchown(fd, fs->st_uid, fs->st_gid) : + (islink ? lchown(to.p_path, fs->st_uid, fs->st_gid) : + chown(to.p_path, fs->st_uid, fs->st_gid))) { if (errno != EPERM) { warn("chown: %s", to.p_path); rval = 1; @@ -306,14 +309,18 @@ } if (!gotstat || fs->st_mode != ts.st_mode) - if (fd ? fchmod(fd, fs->st_mode) : chmod(to.p_path, fs->st_mode)) { + if (fdval ? fchmod(fd, fs->st_mode) : + (islink ? lchmod(to.p_path, fs->st_mode) : + chmod(to.p_path, fs->st_mode))) { warn("chmod: %s", to.p_path); rval = 1; } if (!gotstat || fs->st_flags != ts.st_flags) - if (fd ? - fchflags(fd, fs->st_flags) : chflags(to.p_path, fs->st_flags)) { + if (fdval ? + fchflags(fd, fs->st_flags) : + (islink ? (errno = ENOSYS) : + chflags(to.p_path, fs->st_flags))) { warn("chflags: %s", to.p_path); rval = 1; } ==== //depot/projects/ia64/contrib/gdtoa/gdtoaimp.h#5 (text+ko) ==== @@ -26,7 +26,7 @@ ****************************************************************/ -/* $FreeBSD: src/contrib/gdtoa/gdtoaimp.h,v 1.5 2003/04/09 06:04:35 das Exp $ */ +/* $FreeBSD: src/contrib/gdtoa/gdtoaimp.h,v 1.6 2003/06/21 08:20:14 das Exp $ */ /* This is a variation on dtoa.c that converts arbitary binary floating-point formats to and from decimal notation. It uses @@ -188,7 +188,10 @@ #include "stdlib.h" #include "string.h" #include "libc_private.h" -#include "spinlock.h" + +#include "namespace.h" +#include <pthread.h> +#include "un-namespace.h" #ifdef KR_headers #define Char char @@ -465,14 +468,14 @@ #endif #define MULTIPLE_THREADS -extern spinlock_t __gdtoa_locks[2]; -#define ACQUIRE_DTOA_LOCK(n) do { \ - if (__isthreaded) \ - _SPINLOCK(&__gdtoa_locks[n]); \ +extern pthread_mutex_t __gdtoa_locks[2]; +#define ACQUIRE_DTOA_LOCK(n) do { \ + if (__isthreaded) \ + _pthread_mutex_lock(&__gdtoa_locks[n]); \ } while(0) -#define FREE_DTOA_LOCK(n) do { \ - if (__isthreaded) \ - _SPINUNLOCK(&__gdtoa_locks[n]); \ +#define FREE_DTOA_LOCK(n) do { \ + if (__isthreaded) \ + _pthread_mutex_unlock(&__gdtoa_locks[n]); \ } while(0) #define Kmax 15 ==== //depot/projects/ia64/contrib/groff/src/roff/nroff/nroff.sh#4 (text+ko) ==== @@ -1,18 +1,20 @@ #!/bin/sh # Emulate nroff with groff. -# $FreeBSD: src/contrib/groff/src/roff/nroff/nroff.sh,v 1.14 2003/05/01 13:18:29 ru Exp $ +# $FreeBSD: src/contrib/groff/src/roff/nroff/nroff.sh,v 1.15 2003/06/22 10:41:47 ru Exp $ prog="$0" # Default device. # First try the "locale charmap" command, because it's most reliable. # On systems where it doesn't exist, look at the environment variables. -case "`#locale charmap 2>/dev/null`" in +case "`locale charmap 2>/dev/null`" in UTF-8) T=-Tutf8 ;; - ISO-8859-1) + ISO*8859-1 | ISO*8859-15) T=-Tlatin1 ;; IBM-1047) T=-Tcp1047 ;; + KOI8-R) + T=-Tkoi8-r ;; *) case "${LC_ALL-${LC_CTYPE-${LANG}}}" in *.UTF-8) ==== //depot/projects/ia64/etc/rc.d/Makefile#15 (text+ko) ==== @@ -1,11 +1,11 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.17 2003/06/11 23:17:01 bde Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.18 2003/06/20 09:47:09 phk Exp $ .include <bsd.own.mk> FILES= DAEMON LOGIN NETWORKING SERVERS abi accounting addswap adjkerntz amd \ apm apmd archdep atm1 atm2.sh atm3.sh bgfsck bootparams ccd cleanvar \ - cleartmp cron devd devdb devfs dhclient diskless dmesg dumpon fsck \ + cleartmp cron devd devfs dhclient diskless dmesg dumpon fsck \ hostname inetd initdiskless initrandom ip6fw ipfilter ipfs ipfw ipmon \ ipnat ipsec ipxrouted isdnd jail \ kadmind kerberos keyserv kldxref kpasswdd \ ==== //depot/projects/ia64/gnu/usr.bin/send-pr/categories#5 (text+ko) ==== @@ -1,6 +1,7 @@ -# $FreeBSD: src/gnu/usr.bin/send-pr/categories,v 1.14 2002/07/03 00:35:09 des Exp $ +# $FreeBSD: src/gnu/usr.bin/send-pr/categories,v 1.15 2003/06/20 10:48:26 des Exp $ advocacy alpha +amd64 bin conf docs ==== //depot/projects/ia64/gnu/usr.bin/send-pr/send-pr.1#6 (text+ko) ==== @@ -22,7 +22,7 @@ .\" .\" --------------------------------------------------------------------------- .\" -.\" $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.1,v 1.15 2003/03/26 01:45:20 keramida Exp $ +.\" $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.1,v 1.16 2003/06/20 10:48:26 des Exp $ .nh .TH SEND-PR 1 3.113 "February 1993" .SH NAME @@ -179,6 +179,9 @@ .B alpha Alpha processor specific problems. .TP +.B amd64 +AMD64 processor specific problems. +.TP .B bin Corrections or enhancements to system executables. .TP ==== //depot/projects/ia64/include/paths.h#9 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)paths.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/paths.h,v 1.19 2003/05/05 22:49:22 obrien Exp $ + * $FreeBSD: src/include/paths.h,v 1.20 2003/06/20 22:50:33 phk Exp $ */ #ifndef _PATHS_H_ @@ -53,7 +53,6 @@ #define _PATH_CP "/bin/cp" #define _PATH_CSHELL "/bin/csh" #define _PATH_DEFTAPE "/dev/sa0" -#define _PATH_DEVDB "/var/run/dev.db" #define _PATH_DEVNULL "/dev/null" #define _PATH_DEVZERO "/dev/zero" #define _PATH_DRUM "/dev/drum" ==== //depot/projects/ia64/include/stdlib.h#19 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)stdlib.h 8.5 (Berkeley) 5/19/95 - * $FreeBSD: src/include/stdlib.h,v 1.49 2003/06/15 11:01:52 des Exp $ + * $FreeBSD: src/include/stdlib.h,v 1.51 2003/06/22 10:34:49 dwmalone Exp $ */ #ifndef _STDLIB_H_ @@ -258,6 +258,7 @@ int daemon(int, int); char *devname(int, int); +char *devname_r(int, int, char *, int); int getloadavg(double [], int); __const char * getprogname(void); ==== //depot/projects/ia64/lib/libc/compat-43/sigpause.2#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)sigpause.2 8.1 (Berkeley) 6/2/93 -.\" $FreeBSD: src/lib/libc/compat-43/sigpause.2,v 1.12 2002/12/19 09:40:21 ru Exp $ +.\" $FreeBSD: src/lib/libc/compat-43/sigpause.2,v 1.13 2003/06/20 22:41:00 wollman Exp $ .\" .Dd June 2, 1993 .Dt SIGPAUSE 2 @@ -75,6 +75,20 @@ .Xr sigprocmask 2 , .Xr sigsuspend 2 , .Xr sigvec 2 +.Sh STANDARDS +The +.Fn sigpause +function is implemented for compatibility with historic +.Bx 4.3 +applications. +An incompatible interface by the same name, which used a single signal number +rather than a mask, was present in +.At V , +and was copied from there into the +.Sy X/Open System Interfaces +.Pq Tn XSI +option of +.St -p1003.1-2001 . .Sh HISTORY The .Fn sigpause ==== //depot/projects/ia64/lib/libc/gdtoa/glue.c#2 (text+ko) ==== @@ -2,9 +2,12 @@ * Machine-independent glue to integrate David Gay's gdtoa * package into libc. * - * $FreeBSD: src/lib/libc/gdtoa/glue.c,v 1.1 2003/03/12 20:29:58 das Exp $ + * $FreeBSD: src/lib/libc/gdtoa/glue.c,v 1.2 2003/06/21 08:20:14 das Exp $ */ -#include "spinlock.h" +#include <pthread.h> -spinlock_t __gdtoa_locks[2]; +pthread_mutex_t __gdtoa_locks[] = { + PTHREAD_MUTEX_INITIALIZER, + PTHREAD_MUTEX_INITIALIZER +}; ==== //depot/projects/ia64/lib/libc/gen/devname.3#5 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)devname.3 8.2 (Berkeley) 4/29/95 -.\" $FreeBSD: src/lib/libc/gen/devname.3,v 1.15 2002/12/27 12:15:28 schweikh Exp $ +.\" $FreeBSD: src/lib/libc/gen/devname.3,v 1.16 2003/06/20 09:52:27 phk Exp $ .\" .Dd July 18, 1999 .Dt DEVNAME 3 @@ -45,6 +45,8 @@ .In stdlib.h .Ft char * .Fn devname "dev_t dev" "mode_t type" +.Ft char * +.Fn devname_r "dev_t dev" "mode_t type" "char *buf" "int len" .Sh DESCRIPTION The .Fn devname @@ -61,27 +63,25 @@ .Dv S_IFCHR . To find the right name, .Fn devname -first searches the device database created by -.Xr dev_mkdb 8 ; -if that fails, it asks the kernel via the +asks the kernel via the .Va kern.devname sysctl. -If it was still unable to come up with a suitable name, +If it is unable to come up with a suitable name, it will format the information encapsulated in .Fa dev and .Fa type in a human-readable format. +.Pp +.Fn devname +returns the name stored in a static buffer which will be overwritten +on subsequent calls. +.Fn devname_r +takes a buffer and length as argument to avoid this problem. .Sh SEE ALSO .Xr stat 2 , -.Xr dev_mkdb 8 .Sh HISTORY The .Fn devname function appeared in .Bx 4.4 . -.Sh BUGS -The -.Fn devname -function returns a pointer to an internal static object; -thus, subsequent calls will modify the same buffer. ==== //depot/projects/ia64/lib/libc/gen/devname.c#4 (text+ko) ==== @@ -35,70 +35,27 @@ static char sccsid[] = "@(#)devname.c 8.2 (Berkeley) 4/29/95"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/devname.c,v 1.8 2003/06/05 21:55:57 phk Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/devname.c,v 1.9 2003/06/20 09:52:27 phk Exp $"); #include <sys/types.h> #include <sys/sysctl.h> -#include <db.h> #include <err.h> #include <fcntl.h> -#include <paths.h> #include <stdio.h> #include <string.h> #include <sys/param.h> #include <sys/stat.h> -static char * -xdevname(dev, type) - dev_t dev; - mode_t type; -{ - struct { - mode_t type; - dev_t dev; - } bkey; - static DB *db; - static int failure; - DBT data, key; - - if (!db && !failure && - !(db = dbopen(_PATH_DEVDB, O_RDONLY, 0, DB_HASH, NULL))) - failure = 1; - if (failure) - return (NULL); - - /* - * Keys are a mode_t followed by a dev_t. The former is the type of - * the file (mode & S_IFMT), the latter is the st_rdev field. Be - * sure to clear any padding that may be found in bkey. - */ - memset(&bkey, 0, sizeof(bkey)); - bkey.dev = dev; - bkey.type = type; - key.data = &bkey; - key.size = sizeof(bkey); - return ((db->get)(db, &key, &data, 0) ? NULL : (char *)data.data); -} - char * -devname(dev, type) - dev_t dev; - mode_t type; +devname_r(dev_t dev, mode_t type, char *buf, int len) { - static char buf[SPECNAMELEN + 1]; int i; size_t j; char *r; - /* First check the DB file. */ - r = xdevname(dev, type); - if (r != NULL) - return (r); - - /* Then ask the kernel. */ if ((type & S_IFMT) == S_IFCHR) { - j = sizeof(buf); + j = len; i = sysctlbyname("kern.devname", buf, &j, &dev, sizeof (dev)); if (i == 0) return (buf); @@ -109,7 +66,15 @@ r = "#NODEV"; else r = "#%c:%d:0x%x"; - snprintf(buf, SPECNAMELEN + 1, r, + snprintf(buf, len, r, (type & S_IFMT) == S_IFCHR ? 'C' : 'B', major(dev), minor(dev)); return (buf); } + +char * +devname(dev_t dev, mode_t type) +{ + static char buf[SPECNAMELEN + 1]; + + return(devname_r(dev, type, buf, sizeof(buf))); +} ==== //depot/projects/ia64/lib/libc/gen/ttyname.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)ttyname.c 8.2 (Berkeley) 1/27/94"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/ttyname.c,v 1.12 2002/02/01 01:32:19 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/ttyname.c,v 1.14 2003/06/21 08:16:12 phk Exp $"); #include "namespace.h" #include <sys/types.h> @@ -50,7 +50,6 @@ #include <pthread.h> #include "un-namespace.h" -#include <db.h> #include "libc_private.h" static char buf[sizeof(_PATH_DEV) + MAXNAMLEN] = _PATH_DEV; @@ -77,8 +76,6 @@ char * ttyname_r(int fd, char *buf, size_t len) { - struct dirent *dirp; - DIR *dp; struct stat dsb; struct stat sb; char *rval; @@ -96,23 +93,10 @@ if (len <= sizeof(_PATH_DEV)) return (rval); - if ((dp = opendir(_PATH_DEV)) != NULL) { - memcpy(buf, _PATH_DEV, sizeof(_PATH_DEV)); - for (rval = NULL; (dirp = readdir(dp)) != NULL;) { - if (dirp->d_fileno != sb.st_ino) - continue; - minlen = (len - (sizeof(_PATH_DEV) - 1)) < (dirp->d_namlen + 1) ? - (len - (sizeof(_PATH_DEV) - 1)) : (dirp->d_namlen + 1); - memcpy(buf + sizeof(_PATH_DEV) - 1, dirp->d_name, minlen); - if (stat(buf, &dsb) || sb.st_dev != dsb.st_dev || - sb.st_ino != dsb.st_ino) - continue; - rval = buf; - break; - } - (void) closedir(dp); - } - return (rval); + strcpy(buf, _PATH_DEV); + devname_r(sb.st_rdev, S_IFCHR, + buf + strlen(buf), sizeof(buf) - strlen(buf)); + return (buf); } static char * @@ -151,12 +135,6 @@ { struct stat sb; struct termios ttyb; - DB *db; - DBT data, key; - struct { - mode_t type; - dev_t dev; - } bkey; /* Must be a terminal. */ if (tcgetattr(fd, &ttyb) < 0) @@ -165,44 +143,8 @@ if (_fstat(fd, &sb) || !S_ISCHR(sb.st_mode)) return (NULL); - if ( (db = dbopen(_PATH_DEVDB, O_RDONLY, 0, DB_HASH, NULL)) ) { - memset(&bkey, 0, sizeof(bkey)); - bkey.type = S_IFCHR; - bkey.dev = sb.st_rdev; - key.data = &bkey; - key.size = sizeof(bkey); - if (!(db->get)(db, &key, &data, 0)) { - bcopy(data.data, - buf + sizeof(_PATH_DEV) - 1, data.size); - (void)(db->close)(db); - return (buf); - } - (void)(db->close)(db); - } - return (oldttyname(fd, &sb)); -} - -static char * -oldttyname(int fd, struct stat *sb) -{ - struct dirent *dirp; - struct stat dsb; - DIR *dp; - - if ((dp = opendir(_PATH_DEV)) == NULL) - return (NULL); - - while ( (dirp = readdir(dp)) ) { - if (dirp->d_fileno != sb->st_ino) - continue; - bcopy(dirp->d_name, buf + sizeof(_PATH_DEV) - 1, - dirp->d_namlen + 1); - if (stat(buf, &dsb) || sb->st_dev != dsb.st_dev || - sb->st_ino != dsb.st_ino) - continue; - (void)closedir(dp); - return (buf); - } - (void)closedir(dp); - return (NULL); + strcpy(buf, _PATH_DEV); + devname_r(sb.st_rdev, S_IFCHR, + buf + strlen(buf), sizeof(buf) - strlen(buf)); + return (buf); } ==== //depot/projects/ia64/lib/libc/sys/ntp_adjtime.2#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/libc/sys/ntp_adjtime.2,v 1.1 2003/04/15 15:42:10 trhodes Exp $ +.\" $FreeBSD: src/lib/libc/sys/ntp_adjtime.2,v 1.2 2003/06/20 21:14:59 imp Exp $ .\" .Dd April 1, 2003 .Dt NTP_ADJTIME 2 @@ -114,7 +114,10 @@ .Fa tp argument with the current clock state. .Sh RETURN VALUES -.Rv -std ntp_adjtime +Upon successful completion the clock state is returned. +Otherwise a -1 is returned and the global variable +.Va errno +is set to indicate the error. .Pp Possible states of the clock are: .Pp ==== //depot/projects/ia64/lib/libc/sys/ntp_gettime.2#2 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/ntp_gettime.2,v 1.1 2003/04/17 18:39:30 trhodes Exp $ +.\" $FreeBSD: src/lib/libc/sys/ntp_gettime.2,v 1.2 2003/06/21 20:27:54 imp Exp $ .\" -.Dd April 1, 2003 +.Dd June 21, 2003 .Dt NTP_GETTIME 2 .Os .Sh NAME @@ -57,7 +57,7 @@ struct timespec time; /* current time (ns) (ro) */ long maxerror; /* maximum error (us) (ro) */ long esterror; /* estimated error (us) (ro) */ - long tai; /* TAI offset */ + long tai; /* TAI-UTC offset */ int time_state; /* time status */ }; .Ed @@ -71,9 +71,14 @@ .It Va esterror Estimated error in microseconds (read-only). .It Va tai -Temps Atomique International (French for International Atomic Time), -measures real time. -Used for acute time measurements. +Offset in seconds between the TAI and UTC time scales. +This offset is published twice a year and is an integral number of +seconds between TAI (which does not have leap seconds) and UTC (which +does). +.Xr ntpd 8 +or some other agent maintains this value. +A value of 0 means unknown. +As of the date of the manual page, the offset is 32 seconds. .It Va time_state Current time status. .El @@ -86,9 +91,11 @@ .It Dv TIME_OK Everything okay, no leap second warning. .It Dv TIME_INS -Insert leap second warning. +Positive leap second warning. +At the end of the day, an additional second will be inserted after 23:59:59. .It Dv TIME_DEL -Delete leap second warning. +Negative leap second warning. +At the end of the day, 23:59:59 is skipped. .It Dv TIME_OOP Leap second in progress. .It Dv TIME_WAIT @@ -98,7 +105,10 @@ .El .Sh SEE ALSO .Xr ntp_adjtime 2 , -.Xr ntpd 8 +.Xr ntpd 8 , +.Dq Li http://www.bipm.fr/enus/5_Scientific/c_time/time_1.html , +.Dq Li http://www.boulder.nist.gov/timefreq/general/faq.htm , +.Dq Li ftp://time.nist.gov/pub/leap-seconds.list .Sh AUTHORS This manual page was written by .An Tom Rhodes Aq trhodes@FreeBSD.org . ==== //depot/projects/ia64/lib/libpthread/Makefile#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libpthread/Makefile,v 1.42 2003/05/30 00:21:51 kan Exp $ +# $FreeBSD: src/lib/libpthread/Makefile,v 1.43 2003/06/23 04:28:30 marcel 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 @@ -30,8 +30,9 @@ AINC= -I${.CURDIR}/../libc/${MACHINE_ARCH} -I${.CURDIR}/thread PRECIOUSLIB= yes +.include "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc" +.include "${.CURDIR}/support/Makefile.inc" +.include "${.CURDIR}/sys/Makefile.inc" .include "${.CURDIR}/thread/Makefile.inc" -.include "${.CURDIR}/sys/Makefile.inc" -.include "${.CURDIR}/support/Makefile.inc" .include <bsd.lib.mk> ==== //depot/projects/ia64/lib/libpthread/sys/Makefile.inc#5 (text+ko) ==== @@ -1,7 +1,5 @@ -# $FreeBSD: src/lib/libpthread/sys/Makefile.inc,v 1.14 2003/05/30 00:21:52 kan Exp $ +# $FreeBSD: src/lib/libpthread/sys/Makefile.inc,v 1.15 2003/06/23 04:28:31 marcel Exp $ -.PATH: ${.CURDIR}/sys ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} +.PATH: ${.CURDIR}/sys -SRCS+= thr_error.c _atomic_lock.S ksd.c thr_enter_uts.S thr_getcontext.S \ - thr_switch.S lock.c - +SRCS+= lock.c thr_error.c ==== //depot/projects/ia64/libexec/ftpd/ftpcmd.y#16 (text+ko) ==== @@ -45,7 +45,7 @@ static char sccsid[] = "@(#)ftpcmd.y 8.3 (Berkeley) 4/6/94"; #endif static const char rcsid[] = - "$FreeBSD: src/libexec/ftpd/ftpcmd.y,v 1.51 2003/06/16 11:30:23 yar Exp $"; + "$FreeBSD: src/libexec/ftpd/ftpcmd.y,v 1.52 2003/06/21 10:45:38 yar Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -89,10 +89,8 @@ extern int maxtimeout; extern int pdata; extern char *hostname; -extern char remotehost[]; extern char proctitle[]; extern int usedefault; -extern int transflag; extern char tmpline[]; extern int readonly; extern int noepsv; ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/errata/article.sgml#20 (text+ko) ==== @@ -36,7 +36,7 @@ The &os; Project </corpauthor> - <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v 1.41 2003/06/09 22:33:19 bmah Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v 1.42 2003/06/20 21:07:05 bmah Exp $</pubdate> <copyright> <year>2000</year> @@ -184,6 +184,13 @@ Research Projects Agency (DARPA): OpenPAM, NSS support, PAE support, various MAC framework updates, the GEOM disk geometry system.</para> + + <para>An integer overflow could cause kernel panics on PAE-using + machines with certain memory sizes. This bug has been corrected + on both the <literal>RELENG_5_1</literal> and + <literal>HEAD</literal> branches. A workaround for this problem + is to remove some memory, update the system in question, and + reinstall the memory.</para> ]]> </sect1> ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#99 (text+ko) ==== @@ -3,7 +3,7 @@ <corpauthor>The FreeBSD Project</corpauthor> - <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.576 2003/06/17 20:01:49 bmah Exp $</pubdate> >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200306230929.h5N9TjDE013064>