Date: Tue, 8 Apr 2008 17:38:52 GMT From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 139599 for review Message-ID: <200804081738.m38HcqJt057672@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=139599 Change 139599 by sam@sam_ebb on 2008/04/08 17:38:17 IFC @ 139598 Affected files ... .. //depot/projects/vap/bin/ls/ls.1#3 integrate .. //depot/projects/vap/bin/ls/ls.c#3 integrate .. //depot/projects/vap/bin/ls/ls.h#3 integrate .. //depot/projects/vap/bin/ls/print.c#3 integrate .. //depot/projects/vap/bin/ls/util.c#3 integrate .. //depot/projects/vap/etc/rc.d/ppp#5 integrate .. //depot/projects/vap/lib/libc/include/libc_private.h#3 integrate .. //depot/projects/vap/lib/libc/sys/Makefile.inc#6 integrate .. //depot/projects/vap/lib/libc/sys/Symbol.map#6 integrate .. //depot/projects/vap/lib/libc/sys/fcntl.c#1 branch .. //depot/projects/vap/lib/libstand/nfs.c#3 integrate .. //depot/projects/vap/libexec/rtld-elf/mips/reloc.c#1 branch .. //depot/projects/vap/libexec/rtld-elf/mips/rtld_machdep.h#1 branch .. //depot/projects/vap/libexec/rtld-elf/mips/rtld_start.S#1 branch .. //depot/projects/vap/libexec/rtld-elf/rtld.c#3 integrate .. //depot/projects/vap/libexec/rtld-elf/rtld.h#3 integrate .. //depot/projects/vap/release/doc/en_US.ISO8859-1/relnotes/article.sgml#8 integrate .. //depot/projects/vap/release/ia64/mkisoimages.sh#3 integrate .. //depot/projects/vap/sbin/ddb/ddb.8#3 integrate .. //depot/projects/vap/sbin/ddb/ddb.c#3 integrate .. //depot/projects/vap/sbin/fsck_ffs/main.c#4 integrate .. //depot/projects/vap/sbin/gpt/gpt.c#4 integrate .. //depot/projects/vap/share/man/man4/asmc.4#3 integrate .. //depot/projects/vap/share/man/man4/bpf.4#4 integrate .. //depot/projects/vap/share/man/man9/Makefile#9 integrate .. //depot/projects/vap/share/man/man9/lock.9#9 integrate .. //depot/projects/vap/share/man/man9/sleep.9#3 integrate .. //depot/projects/vap/share/mk/sys.mk#5 integrate .. //depot/projects/vap/sys/amd64/amd64/intr_machdep.c#7 integrate .. //depot/projects/vap/sys/amd64/amd64/pmap.c#11 integrate .. //depot/projects/vap/sys/amd64/linux32/linux.h#5 integrate .. //depot/projects/vap/sys/amd64/linux32/linux32_dummy.c#5 integrate .. //depot/projects/vap/sys/amd64/linux32/linux32_proto.h#7 integrate .. //depot/projects/vap/sys/amd64/linux32/linux32_syscall.h#7 integrate .. //depot/projects/vap/sys/amd64/linux32/linux32_sysent.c#7 integrate .. //depot/projects/vap/sys/amd64/linux32/linux32_sysvec.c#8 integrate .. //depot/projects/vap/sys/amd64/linux32/syscalls.master#7 integrate .. //depot/projects/vap/sys/arm/arm/elf_trampoline.c#4 integrate .. //depot/projects/vap/sys/arm/arm/exception.S#3 integrate .. //depot/projects/vap/sys/arm/arm/intr.c#6 integrate .. //depot/projects/vap/sys/arm/arm/locore.S#7 integrate .. //depot/projects/vap/sys/arm/sa11x0/assabet_machdep.c#6 integrate .. //depot/projects/vap/sys/arm/xscale/i80321/ep80219_machdep.c#4 integrate .. //depot/projects/vap/sys/arm/xscale/i80321/files.ep80219#4 integrate .. //depot/projects/vap/sys/arm/xscale/i80321/files.iq31244#4 integrate .. //depot/projects/vap/sys/arm/xscale/i80321/iq31244_machdep.c#7 integrate .. //depot/projects/vap/sys/arm/xscale/i8134x/crb_machdep.c#5 integrate .. //depot/projects/vap/sys/arm/xscale/i8134x/files.i81342#3 integrate .. //depot/projects/vap/sys/arm/xscale/ixp425/avila_machdep.c#4 integrate .. //depot/projects/vap/sys/arm/xscale/ixp425/files.avila#4 integrate .. //depot/projects/vap/sys/boot/forth/loader.conf#7 integrate .. //depot/projects/vap/sys/compat/linux/linux_file.c#8 integrate .. //depot/projects/vap/sys/compat/linux/linux_file.h#1 branch .. //depot/projects/vap/sys/compat/linux/linux_misc.c#10 integrate .. //depot/projects/vap/sys/compat/linux/linux_stats.c#7 integrate .. //depot/projects/vap/sys/compat/linux/linux_util.c#7 integrate .. //depot/projects/vap/sys/compat/linux/linux_util.h#6 integrate .. //depot/projects/vap/sys/compat/svr4/svr4_sysvec.c#8 integrate .. //depot/projects/vap/sys/conf/Makefile.arm#8 integrate .. //depot/projects/vap/sys/conf/options#18 integrate .. //depot/projects/vap/sys/dev/aac/aac_disk.c#6 integrate .. //depot/projects/vap/sys/dev/acpica/Osd/OsdSynch.c#5 integrate .. //depot/projects/vap/sys/dev/acpica/acpi.c#10 integrate .. //depot/projects/vap/sys/dev/asmc/asmc.c#3 integrate .. //depot/projects/vap/sys/dev/asmc/asmcvar.h#3 integrate .. //depot/projects/vap/sys/dev/bge/if_bge.c#10 integrate .. //depot/projects/vap/sys/dev/de/if_de.c#3 integrate .. //depot/projects/vap/sys/dev/mii/ip1000phy.c#3 integrate .. //depot/projects/vap/sys/dev/mii/ip1000phyreg.h#3 integrate .. //depot/projects/vap/sys/dev/mii/miidevs#7 integrate .. //depot/projects/vap/sys/dev/usb/ehci_pci.c#7 integrate .. //depot/projects/vap/sys/dev/usb/uhci_pci.c#6 integrate .. //depot/projects/vap/sys/fs/fdescfs/fdesc_vnops.c#8 integrate .. //depot/projects/vap/sys/fs/unionfs/union_subr.c#8 integrate .. //depot/projects/vap/sys/i386/i386/intr_machdep.c#7 integrate .. //depot/projects/vap/sys/i386/i386/pmap.c#10 integrate .. //depot/projects/vap/sys/i386/ibcs2/ibcs2_util.c#5 integrate .. //depot/projects/vap/sys/i386/linux/linux.h#6 integrate .. //depot/projects/vap/sys/i386/linux/linux_dummy.c#5 integrate .. //depot/projects/vap/sys/i386/linux/linux_proto.h#7 integrate .. //depot/projects/vap/sys/i386/linux/linux_syscall.h#7 integrate .. //depot/projects/vap/sys/i386/linux/linux_sysent.c#7 integrate .. //depot/projects/vap/sys/i386/linux/linux_sysvec.c#9 integrate .. //depot/projects/vap/sys/i386/linux/syscalls.master#7 integrate .. //depot/projects/vap/sys/ia64/ia64/interrupt.c#7 integrate .. //depot/projects/vap/sys/kern/kern_cpuset.c#5 integrate .. //depot/projects/vap/sys/kern/kern_intr.c#9 integrate .. //depot/projects/vap/sys/kern/kern_lock.c#11 integrate .. //depot/projects/vap/sys/kern/kern_mbuf.c#9 integrate .. //depot/projects/vap/sys/kern/kern_rwlock.c#7 integrate .. //depot/projects/vap/sys/kern/kern_timeout.c#10 integrate .. //depot/projects/vap/sys/kern/sched_ule.c#12 integrate .. //depot/projects/vap/sys/kern/vfs_lookup.c#10 integrate .. //depot/projects/vap/sys/kern/vfs_syscalls.c#10 integrate .. //depot/projects/vap/sys/modules/asmc/Makefile#3 integrate .. //depot/projects/vap/sys/net/bpf.c#11 integrate .. //depot/projects/vap/sys/net/bpf_zerocopy.c#4 integrate .. //depot/projects/vap/sys/net/bpf_zerocopy.h#2 integrate .. //depot/projects/vap/sys/net/if_loop.c#8 integrate .. //depot/projects/vap/sys/netgraph/ng_base.c#15 integrate .. //depot/projects/vap/sys/netinet/in_pcb.c#11 integrate .. //depot/projects/vap/sys/netinet/tcp.h#6 integrate .. //depot/projects/vap/sys/netinet/tcp_input.c#7 integrate .. //depot/projects/vap/sys/netinet/tcp_output.c#7 integrate .. //depot/projects/vap/sys/netinet6/in6_pcb.c#6 integrate .. //depot/projects/vap/sys/pc98/cbus/sc_machdep.h#3 integrate .. //depot/projects/vap/sys/pc98/cbus/syscons_cbus.c#4 integrate .. //depot/projects/vap/sys/powerpc/include/atomic.h#7 integrate .. //depot/projects/vap/sys/powerpc/powerpc/intr_machdep.c#9 integrate .. //depot/projects/vap/sys/sparc64/sparc64/intr_machdep.c#7 integrate .. //depot/projects/vap/sys/sun4v/sun4v/intr_machdep.c#4 integrate .. //depot/projects/vap/sys/sys/_lockmgr.h#1 branch .. //depot/projects/vap/sys/sys/_stack.h#1 branch .. //depot/projects/vap/sys/sys/cpuset.h#5 integrate .. //depot/projects/vap/sys/sys/interrupt.h#6 integrate .. //depot/projects/vap/sys/sys/lockmgr.h#12 integrate .. //depot/projects/vap/sys/sys/param.h#15 integrate .. //depot/projects/vap/sys/sys/proc.h#13 integrate .. //depot/projects/vap/sys/sys/sleepqueue.h#6 integrate .. //depot/projects/vap/sys/sys/stack.h#4 integrate .. //depot/projects/vap/sys/sys/syscallsubr.h#9 integrate .. //depot/projects/vap/sys/sys/vnode.h#11 integrate .. //depot/projects/vap/sys/ufs/ffs/ffs_softdep.c#11 integrate .. //depot/projects/vap/sys/ufs/ufs/ufs_gjournal.c#3 integrate .. //depot/projects/vap/sys/vm/uma.h#6 integrate .. //depot/projects/vap/sys/vm/uma_core.c#6 integrate .. //depot/projects/vap/sys/vm/vm_map.c#8 integrate .. //depot/projects/vap/sys/vm/vm_page.c#9 integrate .. //depot/projects/vap/sys/vm/vm_phys.c#4 integrate .. //depot/projects/vap/sys/vm/vm_reserv.c#2 integrate .. //depot/projects/vap/sys/vm/vm_reserv.h#2 integrate .. //depot/projects/vap/tools/tools/README#4 integrate .. //depot/projects/vap/usr.bin/gprof/gprof.h#3 integrate .. //depot/projects/vap/usr.bin/xlint/lint1/param.h#3 integrate .. //depot/projects/vap/usr.sbin/btxld/btxld.c#3 integrate .. //depot/projects/vap/usr.sbin/rpc.lockd/lockd.c#4 integrate .. //depot/projects/vap/usr.sbin/rpc.statd/statd.c#3 integrate .. //depot/projects/vap/usr.sbin/sysinstall/devices.c#3 integrate Differences ... ==== //depot/projects/vap/bin/ls/ls.1#3 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.100 2006/10/12 10:08:52 ru Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.102 2008/04/04 05:55:42 ru Exp $ .\" -.Dd October 12, 2006 +.Dd April 4, 2008 .Dt LS 1 .Os .Sh NAME @@ -41,6 +41,7 @@ .Sh SYNOPSIS .Nm .Op Fl ABCFGHILPRSTUWZabcdfghiklmnopqrstuwx1 +.Op Fl D Ar format .Op Ar .Sh DESCRIPTION For each operand that names a @@ -88,6 +89,21 @@ is the numeric value of the character in octal. .It Fl C Force multi-column output; this is the default when output is to a terminal. +.It Fl D Ar format +When printing in the long +.Pq Fl l +format, use +.Ar format +to format the date and time output. +The argument +.Ar format +is a string used by +.Xr strftime 3 . +Depending on the choice of format string, this may result in a +different number of columns in the output. +This option overrides the +.Fl T +option. .It Fl F Display a slash .Pq Ql / @@ -146,12 +162,13 @@ Sort by size (largest file first) before sorting the operands in lexicographical order. .It Fl T -When used with the -.Fl l -(lowercase letter -.Dq ell ) -option, display complete time information for the file, including +When printing in the long +.Pq Fl l +format, display complete time information for the file, including month, day, hour, minute, second, and year. +The +.Fl D +option gives even more control over the output format. .It Fl U Use time when file was created for sorting or printing. .It Fl W @@ -325,7 +342,12 @@ modified, and the pathname. .Pp If the modification time of the file is more than 6 months -in the past or future, then the year of the last modification +in the past or future, and the +.Fl D +or +.Fl T +are not specified, +then the year of the last modification is displayed in place of the hour and minute fields. .Pp If the owner or group names are not a known user or group name, @@ -657,6 +679,7 @@ .Xr getfacl 1 , .Xr sort 1 , .Xr xterm 1 , +.Xr strftime 3 , .Xr termcap 5 , .Xr maclabel 7 , .Xr symlink 7 , ==== //depot/projects/vap/bin/ls/ls.c#3 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.85 2006/03/24 17:09:03 jhb Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.86 2008/04/04 03:57:46 grog Exp $"); #include <sys/types.h> #include <sys/stat.h> @@ -125,10 +125,11 @@ static int f_singlecol; /* use single column output */ int f_size; /* list size in short listing */ int f_slash; /* similar to f_type, but only for dirs */ - int f_sortacross; /* sort across rows, not down columns */ + int f_sortacross; /* sort across rows, not down columns */ int f_statustime; /* use time of last mode change */ static int f_stream; /* stream the output, separate with commas */ static int f_timesort; /* sort by time vice name */ + char *f_timeformat; /* user-specified time format */ static int f_sizesort; int f_type; /* add type character for non-regular files */ static int f_whiteout; /* show whiteout entries */ @@ -179,7 +180,7 @@ fts_options = FTS_PHYSICAL; while ((ch = getopt(argc, argv, - "1ABCFGHILPRSTUWZabcdfghiklmnopqrstuwx")) != -1) { + "1ABCD:FGHILPRSTUWZabcdfghiklmnopqrstuwx")) != -1) { switch (ch) { /* * The -1, -C, -x and -l options all override each other so @@ -198,6 +199,9 @@ case 'C': f_sortacross = f_longform = f_singlecol = 0; break; + case 'D': + f_timeformat = optarg; + break; case 'l': f_longform = 1; f_singlecol = 0; ==== //depot/projects/vap/bin/ls/ls.h#3 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * from: @(#)ls.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD: src/bin/ls/ls.h,v 1.22 2006/03/24 16:38:02 jhb Exp $ + * $FreeBSD: src/bin/ls/ls.h,v 1.23 2008/04/04 03:57:46 grog Exp $ */ #define NO_PRINT 1 @@ -50,8 +50,9 @@ extern int f_sectime; /* print the real time for all files */ extern int f_size; /* list size in short listing */ extern int f_slash; /* append a '/' if the file is a directory */ -extern int f_sortacross; /* sort across rows, not down columns */ +extern int f_sortacross; /* sort across rows, not down columns */ extern int f_statustime; /* use time of last mode change */ +extern char *f_timeformat; /* user-specified time format */ extern int f_notabs; /* don't use tab-separated multi-col output */ extern int f_type; /* add type character for non-regular files */ #ifdef COLORLS ==== //depot/projects/vap/bin/ls/print.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.76 2006/10/18 10:58:27 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.78 2008/04/05 21:26:25 imp Exp $"); #include <sys/param.h> #include <sys/stat.h> @@ -237,7 +237,7 @@ if (chcnt) putchar('\n'); } - + void printcol(const DISPLAY *dp) { @@ -378,17 +378,20 @@ now = time(NULL); #define SIXMONTHS ((365 / 2) * 86400) - if (f_sectime) + if (f_timeformat) /* user specified format */ + format = f_timeformat; + else if (f_sectime) /* mmm dd hh:mm:ss yyyy || dd mmm hh:mm:ss yyyy */ - format = d_first ? "%e %b %T %Y " : "%b %e %T %Y "; + format = d_first ? "%e %b %T %Y" : "%b %e %T %Y"; else if (ftime + SIXMONTHS > now && ftime < now + SIXMONTHS) /* mmm dd hh:mm || dd mmm hh:mm */ - format = d_first ? "%e %b %R " : "%b %e %R "; + format = d_first ? "%e %b %R" : "%b %e %R"; else /* mmm dd yyyy || dd mmm yyyy */ - format = d_first ? "%e %b %Y " : "%b %e %Y "; + format = d_first ? "%e %b %Y" : "%b %e %Y"; strftime(longstring, sizeof(longstring), format, localtime(&ftime)); fputs(longstring, stdout); + fputc(' ', stdout); } static int @@ -625,7 +628,7 @@ snprintf(name, sizeof(name), "%s", p->fts_name); else snprintf(name, sizeof(name), "%s/%s", - p->fts_parent->fts_accpath, p->fts_name); + p->fts_parent->fts_accpath, p->fts_name); /* * We have no way to tell whether a symbolic link has an ACL since * pathconf() and acl_get_file() both follow them. They also don't ==== //depot/projects/vap/bin/ls/util.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ls/util.c,v 1.40 2006/03/24 16:38:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/util.c,v 1.41 2008/04/04 05:55:42 ru Exp $"); #include <sys/types.h> #include <sys/stat.h> @@ -222,9 +222,9 @@ { (void)fprintf(stderr, #ifdef COLORLS - "usage: ls [-ABCFGHILPRSTUWZabcdfghiklmnopqrstuwx1]" + "usage: ls [-ABCFGHILPRSTUWZabcdfghiklmnopqrstuwx1] [-D format]" #else - "usage: ls [-ABCFHILPRSTUWZabcdfghiklmnopqrstuwx1]" + "usage: ls [-ABCFHILPRSTUWZabcdfghiklmnopqrstuwx1] [-D format]" #endif " [file ...]\n"); exit(1); ==== //depot/projects/vap/etc/rc.d/ppp#5 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ppp,v 1.18 2008/03/28 07:57:51 brooks Exp $ +# $FreeBSD: src/etc/rc.d/ppp,v 1.19 2008/04/06 20:39:33 brooks Exp $ # # PROVIDE: ppp @@ -61,7 +61,7 @@ # Check for hard wired unit eval _ppp_unit=\$ppp_${_ppp_profile_cleaned}_unit - if [ -n "_ppp_unit" ]; then + if [ -n "${_ppp_unit}" ]; then _ppp_unit="-unit${_ppp_unit}" fi rc_flags="$rc_flags $_ppp_unit" ==== //depot/projects/vap/lib/libc/include/libc_private.h#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/include/libc_private.h,v 1.17 2007/07/04 23:27:38 peter Exp $ + * $FreeBSD: src/lib/libc/include/libc_private.h,v 1.18 2008/04/04 09:43:03 dfr Exp $ * * Private definitions for libc, libc_r and libpthread. * @@ -192,4 +192,7 @@ extern __ssize_t __sys_freebsd6_pwrite(int, const void *, __size_t, int, __off_t); extern void * __sys_freebsd6_mmap(void *, __size_t, int, int, int, int, __off_t); +/* Without back-compat translation */ +extern int __sys_fcntl(int, int, ...); + #endif /* _LIBC_PRIVATE_H_ */ ==== //depot/projects/vap/lib/libc/sys/Makefile.inc#6 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.3 (Berkeley) 10/24/94 -# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.132 2008/03/29 10:26:29 jeff Exp $ +# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.133 2008/04/04 09:43:03 dfr Exp $ # sys sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/sys ${.CURDIR}/sys @@ -20,7 +20,8 @@ # Sources common to both syscall interfaces: SRCS+= stack_protector.c __error.c .if !defined(WITHOUT_SYSCALL_COMPAT) -SRCS+= ftruncate.c lseek.c mmap.c pread.c pwrite.c truncate.c +SRCS+= fcntl.c ftruncate.c lseek.c mmap.c pread.c pwrite.c truncate.c +PSEUDO+= _fcntl.o .endif # Add machine dependent asm sources: ==== //depot/projects/vap/lib/libc/sys/Symbol.map#6 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/sys/Symbol.map,v 1.13 2008/03/31 12:14:04 kib Exp $ + * $FreeBSD: src/lib/libc/sys/Symbol.map,v 1.14 2008/04/07 13:53:51 deischen Exp $ */ /* @@ -66,11 +66,6 @@ clock_settime; close; connect; - cpuset; - cpuset_getid; - cpuset_setid; - cpuset_getaffinity; - cpuset_setaffinity; dup; dup2; eaccess; @@ -335,6 +330,11 @@ }; FBSD_1.1 { + cpuset; + cpuset_getid; + cpuset_setid; + cpuset_getaffinity; + cpuset_setaffinity; faccessat; fchmodat; fchownat; ==== //depot/projects/vap/lib/libstand/nfs.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libstand/nfs.c,v 1.12 2004/01/21 20:12:23 jhb Exp $"); +__FBSDID("$FreeBSD: src/lib/libstand/nfs.c,v 1.13 2008/04/05 15:03:29 dfr Exp $"); #include <sys/param.h> #include <sys/time.h> @@ -412,9 +412,16 @@ return (ENXIO); } + /* + * This is silly - we should look at dv_type but that value is + * arch dependant and we can't use it here. + */ #ifndef __i386__ if (strcmp(f->f_dev->dv_name, "net") != 0) return(EINVAL); +#else + if (strcmp(f->f_dev->dv_name, "pxe") != 0) + return(EINVAL); #endif if (!(desc = socktodesc(*(int *)(f->f_devdata)))) ==== //depot/projects/vap/libexec/rtld-elf/rtld.c#3 (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.124 2007/05/17 18:00:27 csjp Exp $ + * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.125 2008/04/04 20:59:26 imp Exp $ */ /* @@ -773,12 +773,19 @@ obj->fini = (Elf_Addr) (obj->relocbase + dynp->d_un.d_ptr); break; + /* + * Don't process DT_DEBUG on MIPS as the dynamic section + * is mapped read-only. DT_MIPS_RLD_MAP is used instead. + */ + +#ifndef __mips__ case DT_DEBUG: /* XXX - not implemented yet */ if (!early) dbg("Filling in DT_DEBUG entry"); ((Elf_Dyn*)dynp)->d_un.d_ptr = (Elf_Addr) &r_debug; break; +#endif case DT_FLAGS: if (dynp->d_un.d_val & DF_ORIGIN) { @@ -795,6 +802,27 @@ if (dynp->d_un.d_val & DF_STATIC_TLS) ; break; +#ifdef __mips__ + case DT_MIPS_LOCAL_GOTNO: + obj->local_gotno = dynp->d_un.d_val; + break; + + case DT_MIPS_SYMTABNO: + obj->symtabno = dynp->d_un.d_val; + break; + + case DT_MIPS_GOTSYM: + obj->gotsym = dynp->d_un.d_val; + break; + + case DT_MIPS_RLD_MAP: +#ifdef notyet + if (!early) + dbg("Filling in DT_DEBUG entry"); + ((Elf_Dyn*)dynp)->d_un.d_ptr = (Elf_Addr) &r_debug; +#endif + break; +#endif default: if (!early) { @@ -1165,7 +1193,10 @@ objtmp.dynamic = rtld_dynamic(&objtmp); digest_dynamic(&objtmp, 1); assert(objtmp.needed == NULL); +#if !defined(__mips__) + /* MIPS and SH{3,5} have a bogus DT_TEXTREL. */ assert(!objtmp.textrel); +#endif /* * Temporarily put the dynamic linker entry into the object list, so @@ -2569,11 +2600,14 @@ continue; /* fallthrough */ case STT_TLS: - if (symp->st_shndx != SHN_UNDEF || - ((flags & SYMLOOK_IN_PLT) == 0 && - ELF_ST_TYPE(symp->st_info) == STT_FUNC)) + if (symp->st_shndx != SHN_UNDEF) + break; +#ifndef __mips__ + else if (((flags & SYMLOOK_IN_PLT) == 0) && + (ELF_ST_TYPE(symp->st_info) == STT_FUNC)) break; /* fallthrough */ +#endif default: continue; } @@ -2937,7 +2971,7 @@ #endif #if defined(__i386__) || defined(__amd64__) || defined(__sparc64__) || \ - defined(__arm__) + defined(__arm__) || defined(__mips__) /* * Allocate Static TLS using the Variant II method. @@ -3103,7 +3137,7 @@ free_tls_offset(Obj_Entry *obj) { #if defined(__i386__) || defined(__amd64__) || defined(__sparc64__) || \ - defined(__arm__) + defined(__arm__) || defined(__mips__) /* * If we were the last thing to allocate out of the static TLS * block, we give our space back to the 'allocator'. This is a ==== //depot/projects/vap/libexec/rtld-elf/rtld.h#3 (text+ko) ==== @@ -22,7 +22,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.h,v 1.38 2007/04/03 18:31:20 kan Exp $ + * $FreeBSD: src/libexec/rtld-elf/rtld.h,v 1.39 2008/04/04 20:59:26 imp Exp $ */ #ifndef RTLD_H /* { */ @@ -178,6 +178,11 @@ const Elf_Sym *symtab; /* Symbol table */ const char *strtab; /* String table */ unsigned long strsize; /* Size in bytes of string table */ +#ifdef __mips__ + Elf_Word local_gotno; /* Number of local GOT entries */ + Elf_Word symtabno; /* Number of dynamic symbols */ + Elf_Word gotsym; /* First dynamic symbol in GOT */ +#endif const Elf_Verneed *verneed; /* Required versions. */ Elf_Word verneednum; /* Number of entries in verneed table */ ==== //depot/projects/vap/release/doc/en_US.ISO8859-1/relnotes/article.sgml#8 (text+ko) ==== @@ -20,7 +20,7 @@ <corpauthor>The &os; Project</corpauthor> - <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1083 2008/03/31 05:06:00 bmah Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1084 2008/04/05 18:11:39 bmah Exp $</pubdate> <copyright> <year>2000</year> @@ -165,7 +165,7 @@ kernel bug reports that are rich in debugging information, but are not dependent on kernel symbol tables or precisely synchronized source code. More information can be found in the - &man.textdump.4; manual page.</para> + &man.textdump.4; manual page. &merged;</para> <para>Kernel support for M:N threading has been removed. While the KSE (Kernel Scheduled Entities) project was quite successful @@ -184,6 +184,10 @@ <para>[&arch.amd64;] The &os; kernel now has support for large memory page mappings (<quote>superpages</quote>).</para> + <para>[&arch.amd64;, &arch.i386;, &arch.powerpc;] The ULE + scheduler is now the default process scheduler + in <filename>GENERIC</filename> kernels. &merged;</para> + <sect3 id="boot"> <title>Boot Loader Changes</title> @@ -205,11 +209,11 @@ <title>Hardware Support</title> <para>The &man.cmx.4; driver, a driver for Omnikey CardMan 4040 - PCMCIA smartcard readers, has been added.</para> + PCMCIA smartcard readers, has been added. &merged;</para> <para>The &man.uslcom.4; driver, a driver for Silicon Laboratories CP2101/CP2102-based USB serial adapters, has been - imported from OpenBSD.</para> + imported from OpenBSD. &merged;</para> <sect4 id="mm"> <title>Multimedia Support</title> @@ -271,6 +275,9 @@ <sect3 id="disks"> <title>Disks and Storage</title> + <para>The &man.aac.4; driver now supports volumes larger than + 2TB in size. &merged;</para> + <para>The &man.ata.4; driver now supports a spindown command for disks; after a configurable amount of time, if no requests have been received for a disk, the disk will be spun down @@ -289,12 +296,21 @@ <para>A problem with using &man.mmap.2; on ZFS filesystems has been fixed.</para> + <para>A new kernel-mode NFS lock manager has been added, + improving performance and behavior of NFS locking. A new + &man.clear.locks.8; command has been added to clear locks held + on behalf of an NFS client.</para> + </sect3> </sect2> <sect2 id="userland"> <title>Userland Changes</title> + <para>The &man.adduser.8; utility now supports + a <option>-M</option> option to set the mode of a new user's + home directory. &merged;</para> + <para>BSD-licensed versions of &man.ar.1; and &man.ranlib.1;, based on <filename>libarchive</filename>, have replaced the GNU Binutils versions of these utilities.</para> @@ -316,6 +332,13 @@ command to make it easier to debug crash dumps with kernel modules.</para> + <para>The &man.ls.1; program now supports a <option>-D</option> + option to specify a date format string to be used with the long + format (<option>-l</option>) output.</para> + + <para>&man.nc.1; now supports a <option>-O</option> switch to + disable the use of TCP options.</para> + <para>The &man.procstat.1; utility has been added to display detailed information about processes.</para> @@ -395,7 +418,11 @@ <sect2 id="ports"> <title>Ports/Packages Collection Infrastructure</title> - <para></para> + <para>The pkg_sign and pkg_check utilities for cryptographically + signing &os; packages have been removed. They were only useful + for packages compressed using &man.gzip.1;; however + &man.bzip2.1; compression has been the norm for some time + now.</para> </sect2> ==== //depot/projects/vap/release/ia64/mkisoimages.sh#3 (text+ko) ==== @@ -4,7 +4,7 @@ # Author: Jordan K Hubbard # Date: 22 June 2001 # -# $FreeBSD: src/release/ia64/mkisoimages.sh,v 1.11 2005/01/30 21:10:52 kensmith Exp $ +# $FreeBSD: src/release/ia64/mkisoimages.sh,v 1.12 2008/04/08 02:57:59 marcel Exp $ # # This script is used by release/Makefile to build the (optional) ISO images # for a FreeBSD release. It is considered architecture dependent since each @@ -67,7 +67,7 @@ # To create a bootable CD under EFI, the boot image should be an EFI # system partition. if [ $bootable = yes ]; then - EFISZ=32768 + EFISZ=40960 MNT=/mnt dd if=/dev/zero of=$BASE/$EFIPART count=$EFISZ md=`mdconfig -a -t vnode -f $BASE/$EFIPART` ==== //depot/projects/vap/sbin/ddb/ddb.8#3 (text+ko) ==== @@ -23,21 +23,21 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/ddb/ddb.8,v 1.3 2008/03/05 17:51:06 brooks Exp $ +.\" $FreeBSD: src/sbin/ddb/ddb.8,v 1.4 2008/04/04 07:31:43 ru Exp $ .\" -.Dd 25 December, 2007 +.Dd April 4, 2008 .Dt DDB 8 .Os .Sh NAME .Nm ddb -.Nd Configure DDB kernel debugger properties +.Nd "configure DDB kernel debugger properties" .Sh SYNOPSIS .Nm .Cm script .Ar scriptname .Nm .Cm script -.Ar scriptname=script +.Ar scriptname Ns = Ns Ar script .Nm .Cm scripts .Nm @@ -46,9 +46,10 @@ .Nm .Ar pathname .Sh DESCRIPTION +The .Nm -configures certain aspects of the -.Xr DDB 4 +utility configures certain aspects of the +.Xr ddb 4 kernel debugger from user space that are not configured at compile-time or easily via .Xr sysctl 8 @@ -64,24 +65,26 @@ .Nm utility. Whitespace at the beginning of lines will be ignored as will lines where the -first non-whitespace character is #. +first non-whitespace character is +.Ql # . .Sh SCRIPTING +The .Nm -can be used to configure aspects of -.Xr DDB 4 +utility can be used to configure aspects of +.Xr ddb 4 scripting from user space; scripting support is described in more detail in -.Xr DDB 4 . +.Xr ddb 4 . Each of the debugger commands is available from the command line: .Bl -tag -width indent .It Cm script Ar scriptname Print the script named .Ar scriptname . -.It Cm script Ar scriptname=scriptvalue +.It Cm script Ar scriptname Ns = Ns Ar script Define a script named -.Ar scriptname ; -as many scripts contain characters interpreted in special ways by the shell, +.Ar scriptname . +As many scripts contain characters interpreted in special ways by the shell, it is advisable to enclose -.Ar scriptvalue +.Ar script in quotes. .It Cm scripts List currently defined scripts. @@ -89,6 +92,8 @@ Delete the script named .Ar scriptname . .El +.Sh EXIT STATUS +.Ex -std .Sh EXAMPLES The following example defines a script that will execute when the kernel debugger is entered as a result of a break signal: @@ -97,24 +102,22 @@ .Ed .Pp The following example will delete the script: -.Bd -literal -offset indent -ddb unscript kdb.enter.break -.Ed +.Pp +.Dl "ddb unscript kdb.enter.break" .Pp For further examples, see the .Xr ddb 4 and .Xr textdump 4 -man pages. -.Sh EXIT STATUS -.Ex -std +manual pages. .Sh SEE ALSO .Xr ddb 4 , .Xr textdump 4 , .Xr sysctl 8 .Sh HISTORY +The .Nm -first appeared in +utility first appeared in .Fx 8.0 . .Sh AUTHORS .An Robert N M Watson ==== //depot/projects/vap/sbin/ddb/ddb.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sbin/ddb/ddb.c,v 1.2 2008/03/05 17:51:06 brooks Exp $"); +__FBSDID("$FreeBSD: src/sbin/ddb/ddb.c,v 1.3 2008/04/04 07:31:43 ru Exp $"); #include <err.h> #include <stdio.h> @@ -43,11 +43,11 @@ usage(void) { - fprintf(stderr, "usage:\n"); - fprintf(stderr, "ddb script scriptname\n"); - fprintf(stderr, "ddb script scriptname=script\n"); - fprintf(stderr, "ddb scripts\n"); - fprintf(stderr, "ddb unscript scriptname\n"); + fprintf(stderr, "usage: ddb script scriptname\n"); + fprintf(stderr, " ddb script scriptname=script\n"); + fprintf(stderr, " ddb scripts\n"); + fprintf(stderr, " ddb unscript scriptname\n"); + fprintf(stderr, " ddb pathname\n"); exit(EX_USAGE); } ==== //depot/projects/vap/sbin/fsck_ffs/main.c#4 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/main.c,v 1.49 2008/03/05 08:25:49 rodrigc Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/main.c,v 1.50 2008/04/04 01:50:58 rodrigc Exp $"); #include <sys/param.h> #include <sys/stat.h> @@ -541,6 +541,10 @@ build_iovec(&iov, &iovlen, "errmsg", errmsg, sizeof(errmsg)); build_iovec(&iov, &iovlen, "update", NULL, 0); + /* + * XX: We need the following line until we clean up + * nmount parsing of root mounts and NFS root mounts. + */ build_iovec(&iov, &iovlen, "ro", NULL, 0); if (nmount(iov, iovlen, fflags) == 0) { return (0); ==== //depot/projects/vap/sbin/gpt/gpt.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sbin/gpt/gpt.c,v 1.19 2008/01/30 13:29:10 jhb Exp $"); +__FBSDID("$FreeBSD: src/sbin/gpt/gpt.c,v 1.20 2008/04/07 18:23:28 jhb Exp $"); #include <sys/param.h> #include <sys/types.h> @@ -317,6 +317,13 @@ return (0); } break; + case 'z': + if (strcmp(s, "zfs") == 0) { + uuid_t zfs = GPT_ENT_TYPE_FREEBSD_ZFS; + *uuid = zfs; + return (0); + } + break; } return (EINVAL); } ==== //depot/projects/vap/share/man/man4/asmc.4#3 (text+ko) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2007 Rui Paulo <rpaulo@FreeBSD.org> +.\" Copyright (c) 2007, 2008 Rui Paulo <rpaulo@FreeBSD.org> .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -23,9 +23,9 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/asmc.4,v 1.3 2007/11/13 11:31:53 ru Exp $ +.\" $FreeBSD: src/share/man/man4/asmc.4,v 1.4 2008/04/07 11:27:16 rpaulo Exp $ .\" -.Dd November 10, 2007 +.Dd April 7, 2008 .Dt ASMC 4 .Os .Sh NAME @@ -121,7 +121,7 @@ the following way: .Bd -literal -offset indent notify 0 { - match "system" "ISA"; + match "system" "ACPI"; match "subsystem" "asmc"; action "/usr/local/sbin/ataidle -s X Y"; }; ==== //depot/projects/vap/share/man/man4/bpf.4#4 (text+ko) ==== @@ -47,7 +47,7 @@ .\" This document is derived in part from the enet man page (enet.4) .\" distributed with 4.3BSD Unix. .\" -.\" $FreeBSD: src/share/man/man4/bpf.4,v 1.49 2008/03/24 13:49:17 csjp Exp $ +.\" $FreeBSD: src/share/man/man4/bpf.4,v 1.50 2008/04/07 02:51:00 rwatson Exp $ .\" .Dd February 26, 2007 .Dt BPF 4 @@ -259,14 +259,14 @@ They will return a readable file descriptor when ownership of the next buffer is assigned to user space. .Pp -In the current implementation, the kernel will assign ownership of at most >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200804081738.m38HcqJt057672>