PERFORCE change 127297 for review
Warner Losh
imp at FreeBSD.org
Sun Oct 7 16:34:47 PDT 2007
http://perforce.freebsd.org/chv.cgi?CH=127297
Change 127297 by imp at imp_paco-paco on 2007/10/07 23:34:19
IFC @127292
Affected files ...
.. //depot/projects/arm/src/bin/sh/eval.c#2 integrate
.. //depot/projects/arm/src/bin/sh/sh.1#6 integrate
.. //depot/projects/arm/src/contrib/groff/tmac/doc-common#3 integrate
.. //depot/projects/arm/src/contrib/groff/tmac/doc-syms#3 integrate
.. //depot/projects/arm/src/contrib/groff/tmac/groff_mdoc.man#3 integrate
.. //depot/projects/arm/src/crypto/openssl/ssl/ssl_lib.c#5 integrate
.. //depot/projects/arm/src/etc/mtree/BSD.include.dist#12 integrate
.. //depot/projects/arm/src/etc/mtree/BSD.local.dist#5 integrate
.. //depot/projects/arm/src/etc/mtree/BSD.x11-4.dist#2 integrate
.. //depot/projects/arm/src/etc/mtree/README#2 integrate
.. //depot/projects/arm/src/gnu/usr.bin/groff/tmac/mdoc.local#6 integrate
.. //depot/projects/arm/src/lib/libkse/Makefile#1 branch
.. //depot/projects/arm/src/lib/libkse/arch/amd64/Makefile.inc#1 branch
.. //depot/projects/arm/src/lib/libkse/arch/amd64/amd64/context.S#1 branch
.. //depot/projects/arm/src/lib/libkse/arch/amd64/amd64/enter_uts.S#1 branch
.. //depot/projects/arm/src/lib/libkse/arch/amd64/amd64/pthread_md.c#1 branch
.. //depot/projects/arm/src/lib/libkse/arch/amd64/include/atomic_ops.h#1 branch
.. //depot/projects/arm/src/lib/libkse/arch/amd64/include/pthread_md.h#1 branch
.. //depot/projects/arm/src/lib/libkse/arch/arm/Makefile.inc#1 branch
.. //depot/projects/arm/src/lib/libkse/arch/arm/arm/context.S#1 branch
.. //depot/projects/arm/src/lib/libkse/arch/arm/arm/pthread_md.c#1 branch
.. //depot/projects/arm/src/lib/libkse/arch/arm/include/atomic_ops.h#1 branch
.. //depot/projects/arm/src/lib/libkse/arch/arm/include/pthread_md.h#1 branch
.. //depot/projects/arm/src/lib/libkse/arch/i386/Makefile.inc#1 branch
.. //depot/projects/arm/src/lib/libkse/arch/i386/i386/pthread_md.c#1 branch
.. //depot/projects/arm/src/lib/libkse/arch/i386/i386/thr_enter_uts.S#1 branch
.. //depot/projects/arm/src/lib/libkse/arch/i386/i386/thr_getcontext.S#1 branch
.. //depot/projects/arm/src/lib/libkse/arch/i386/include/atomic_ops.h#1 branch
.. //depot/projects/arm/src/lib/libkse/arch/i386/include/pthread_md.h#1 branch
.. //depot/projects/arm/src/lib/libkse/arch/ia64/Makefile.inc#1 branch
.. //depot/projects/arm/src/lib/libkse/arch/ia64/ia64/context.S#1 branch
.. //depot/projects/arm/src/lib/libkse/arch/ia64/ia64/enter_uts.S#1 branch
.. //depot/projects/arm/src/lib/libkse/arch/ia64/ia64/pthread_md.c#1 branch
.. //depot/projects/arm/src/lib/libkse/arch/ia64/include/atomic_ops.h#1 branch
.. //depot/projects/arm/src/lib/libkse/arch/ia64/include/pthread_md.h#1 branch
.. //depot/projects/arm/src/lib/libkse/arch/powerpc/Makefile.inc#1 branch
.. //depot/projects/arm/src/lib/libkse/arch/powerpc/include/atomic_ops.h#1 branch
.. //depot/projects/arm/src/lib/libkse/arch/powerpc/include/pthread_md.h#1 branch
.. //depot/projects/arm/src/lib/libkse/arch/powerpc/powerpc/assym.c#1 branch
.. //depot/projects/arm/src/lib/libkse/arch/powerpc/powerpc/assym.s#1 branch
.. //depot/projects/arm/src/lib/libkse/arch/powerpc/powerpc/context.S#1 branch
.. //depot/projects/arm/src/lib/libkse/arch/powerpc/powerpc/enter_uts.S#1 branch
.. //depot/projects/arm/src/lib/libkse/arch/powerpc/powerpc/pthread_md.c#1 branch
.. //depot/projects/arm/src/lib/libkse/arch/sparc64/Makefile.inc#1 branch
.. //depot/projects/arm/src/lib/libkse/arch/sparc64/include/atomic_ops.h#1 branch
.. //depot/projects/arm/src/lib/libkse/arch/sparc64/include/pthread_md.h#1 branch
.. //depot/projects/arm/src/lib/libkse/arch/sparc64/sparc64/assym.s#1 branch
.. //depot/projects/arm/src/lib/libkse/arch/sparc64/sparc64/pthread_md.c#1 branch
.. //depot/projects/arm/src/lib/libkse/arch/sparc64/sparc64/thr_getcontext.S#1 branch
.. //depot/projects/arm/src/lib/libkse/pthread.map#1 branch
.. //depot/projects/arm/src/lib/libkse/support/Makefile.inc#1 branch
.. //depot/projects/arm/src/lib/libkse/support/thr_support.c#1 branch
.. //depot/projects/arm/src/lib/libkse/sys/Makefile.inc#1 branch
.. //depot/projects/arm/src/lib/libkse/sys/lock.c#1 branch
.. //depot/projects/arm/src/lib/libkse/sys/lock.h#1 branch
.. //depot/projects/arm/src/lib/libkse/sys/thr_error.c#1 branch
.. //depot/projects/arm/src/lib/libkse/test/Makefile#1 branch
.. //depot/projects/arm/src/lib/libkse/test/README#1 branch
.. //depot/projects/arm/src/lib/libkse/test/guard_b.c#1 branch
.. //depot/projects/arm/src/lib/libkse/test/guard_b.exp#1 branch
.. //depot/projects/arm/src/lib/libkse/test/guard_s.pl#1 branch
.. //depot/projects/arm/src/lib/libkse/test/hello_b.c#1 branch
.. //depot/projects/arm/src/lib/libkse/test/hello_d.c#1 branch
.. //depot/projects/arm/src/lib/libkse/test/hello_d.exp#1 branch
.. //depot/projects/arm/src/lib/libkse/test/hello_s.c#1 branch
.. //depot/projects/arm/src/lib/libkse/test/join_leak_d.c#1 branch
.. //depot/projects/arm/src/lib/libkse/test/join_leak_d.exp#1 branch
.. //depot/projects/arm/src/lib/libkse/test/mutex_d.c#1 branch
.. //depot/projects/arm/src/lib/libkse/test/mutex_d.exp#1 branch
.. //depot/projects/arm/src/lib/libkse/test/propagate_s.pl#1 branch
.. //depot/projects/arm/src/lib/libkse/test/sem_d.c#1 branch
.. //depot/projects/arm/src/lib/libkse/test/sem_d.exp#1 branch
.. //depot/projects/arm/src/lib/libkse/test/sigsuspend_d.c#1 branch
.. //depot/projects/arm/src/lib/libkse/test/sigsuspend_d.exp#1 branch
.. //depot/projects/arm/src/lib/libkse/test/sigwait_d.c#1 branch
.. //depot/projects/arm/src/lib/libkse/test/sigwait_d.exp#1 branch
.. //depot/projects/arm/src/lib/libkse/test/verify#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/Makefile.inc#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_accept.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_aio_suspend.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_atfork.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_attr_destroy.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_attr_get_np.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_attr_getdetachstate.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_attr_getguardsize.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_attr_getinheritsched.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_attr_getschedparam.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_attr_getschedpolicy.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_attr_getscope.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_attr_getstack.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_attr_getstackaddr.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_attr_getstacksize.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_attr_init.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_attr_setcreatesuspend_np.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_attr_setdetachstate.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_attr_setguardsize.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_attr_setinheritsched.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_attr_setschedparam.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_attr_setschedpolicy.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_attr_setscope.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_attr_setstack.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_attr_setstackaddr.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_attr_setstacksize.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_autoinit.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_barrier.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_barrierattr.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_cancel.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_clean.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_close.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_concurrency.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_cond.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_condattr_destroy.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_condattr_init.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_condattr_pshared.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_connect.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_creat.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_create.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_detach.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_equal.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_execve.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_exit.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_fcntl.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_find_thread.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_fork.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_fsync.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_getprio.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_getschedparam.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_info.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_init.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_join.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_kern.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_kill.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_main_np.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_mattr_init.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_mattr_kind_np.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_mattr_pshared.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_msync.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_multi_np.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_mutex.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_mutex_prioceiling.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_mutex_protocol.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_mutexattr_destroy.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_nanosleep.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_once.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_open.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_pause.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_poll.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_printf.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_priority_queue.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_private.h#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_pselect.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_pspinlock.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_raise.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_read.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_readv.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_resume_np.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_rtld.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_rwlock.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_rwlockattr.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_select.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_self.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_sem.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_seterrno.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_setprio.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_setschedparam.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_sig.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_sigaction.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_sigaltstack.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_sigmask.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_sigpending.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_sigprocmask.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_sigsuspend.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_sigwait.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_single_np.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_sleep.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_spec.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_spinlock.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_stack.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_suspend_np.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_switch_np.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_symbols.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_system.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_tcdrain.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_vfork.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_wait.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_wait4.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_waitpid.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_write.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_writev.c#1 branch
.. //depot/projects/arm/src/lib/libkse/thread/thr_yield.c#1 branch
.. //depot/projects/arm/src/sbin/ifconfig/ifconfig.c#11 integrate
.. //depot/projects/arm/src/share/man/man4/ata.4#9 integrate
.. //depot/projects/arm/src/share/man/man4/uscanner.4#5 integrate
.. //depot/projects/arm/src/share/man/man9/Makefile#14 integrate
.. //depot/projects/arm/src/sys/boot/common/module.c#3 integrate
.. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 integrate
.. //depot/projects/arm/src/sys/dev/ata/ata-all.c#18 integrate
.. //depot/projects/arm/src/sys/dev/ata/ata-chipset.c#39 integrate
.. //depot/projects/arm/src/sys/dev/ata/ata-pci.h#23 integrate
.. //depot/projects/arm/src/sys/dev/usb/usbdevs#37 integrate
.. //depot/projects/arm/src/sys/dev/usb/uscanner.c#12 integrate
.. //depot/projects/arm/src/sys/fs/pseudofs/pseudofs_vnops.c#8 integrate
.. //depot/projects/arm/src/sys/fs/tmpfs/tmpfs_vfsops.c#5 integrate
.. //depot/projects/arm/src/sys/kern/kern_mbuf.c#16 integrate
.. //depot/projects/arm/src/sys/kern/uipc_mbuf.c#20 integrate
.. //depot/projects/arm/src/sys/netinet/accf_data.c#2 integrate
.. //depot/projects/arm/src/sys/netinet/accf_http.c#2 integrate
.. //depot/projects/arm/src/sys/netinet/if_ether.c#18 integrate
.. //depot/projects/arm/src/sys/netinet/igmp.c#6 integrate
.. //depot/projects/arm/src/sys/netinet/in.c#11 integrate
.. //depot/projects/arm/src/sys/netinet/in_cksum.c#3 integrate
.. //depot/projects/arm/src/sys/netinet/in_gif.c#8 integrate
.. //depot/projects/arm/src/sys/netinet/in_pcb.c#23 integrate
.. //depot/projects/arm/src/sys/netinet/in_proto.c#9 integrate
.. //depot/projects/arm/src/sys/netinet/in_rmx.c#5 integrate
.. //depot/projects/arm/src/sys/netinet/ip_carp.c#15 integrate
.. //depot/projects/arm/src/sys/netinet/ip_divert.c#13 integrate
.. //depot/projects/arm/src/sys/netinet/ip_dummynet.c#14 integrate
.. //depot/projects/arm/src/sys/netinet/ip_ecn.c#3 integrate
.. //depot/projects/arm/src/sys/netinet/ip_encap.c#5 integrate
.. //depot/projects/arm/src/sys/netinet/ip_fastfwd.c#10 integrate
.. //depot/projects/arm/src/sys/netinet/ip_fw2.c#38 integrate
.. //depot/projects/arm/src/sys/netinet/ip_fw_pfil.c#8 integrate
.. //depot/projects/arm/src/sys/netinet/ip_gre.c#6 integrate
.. //depot/projects/arm/src/sys/netinet/ip_icmp.c#10 integrate
.. //depot/projects/arm/src/sys/netinet/ip_id.c#3 integrate
.. //depot/projects/arm/src/sys/netinet/ip_input.c#22 integrate
.. //depot/projects/arm/src/sys/netinet/ip_ipsec.c#7 integrate
.. //depot/projects/arm/src/sys/netinet/ip_mroute.c#16 integrate
.. //depot/projects/arm/src/sys/netinet/ip_options.c#4 integrate
.. //depot/projects/arm/src/sys/netinet/ip_output.c#25 integrate
.. //depot/projects/arm/src/sys/netinet/raw_ip.c#17 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_pcb.c#22 integrate
.. //depot/projects/arm/src/sys/netinet/sctputil.c#24 integrate
.. //depot/projects/arm/src/sys/netinet/tcp_debug.c#4 integrate
.. //depot/projects/arm/src/sys/netinet/tcp_hostcache.c#7 integrate
.. //depot/projects/arm/src/sys/netinet/tcp_input.c#37 integrate
.. //depot/projects/arm/src/sys/netinet/tcp_output.c#21 integrate
.. //depot/projects/arm/src/sys/netinet/tcp_reass.c#2 integrate
.. //depot/projects/arm/src/sys/netinet/tcp_subr.c#33 integrate
.. //depot/projects/arm/src/sys/netinet/tcp_syncache.c#27 integrate
.. //depot/projects/arm/src/sys/netinet/tcp_timer.c#20 integrate
.. //depot/projects/arm/src/sys/netinet/tcp_timewait.c#4 integrate
.. //depot/projects/arm/src/sys/netinet/tcp_usrreq.c#23 integrate
.. //depot/projects/arm/src/sys/netinet/udp_usrreq.c#25 integrate
.. //depot/projects/arm/src/sys/sparc64/sparc64/pmap.c#16 integrate
.. //depot/projects/arm/src/sys/sys/mbuf.h#25 integrate
.. //depot/projects/arm/src/sys/vm/vm_page.c#33 integrate
.. //depot/projects/arm/src/tools/regression/bin/sh/builtins/case1.0#1 branch
.. //depot/projects/arm/src/usr.sbin/pciconf/pciconf.8#5 integrate
.. //depot/projects/arm/src/usr.sbin/pciconf/pciconf.c#4 integrate
Differences ...
==== //depot/projects/arm/src/bin/sh/eval.c#2 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.53 2006/06/15 07:57:05 stefanf Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.54 2007/10/04 16:14:48 stefanf Exp $");
#include <paths.h>
#include <signal.h>
@@ -367,6 +367,7 @@
setstackmark(&smark);
arglist.lastp = &arglist.list;
oexitstatus = exitstatus;
+ exitstatus = 0;
expandarg(n->ncase.expr, &arglist, EXP_TILDE);
for (cp = n->ncase.cases ; cp && evalskip == 0 ; cp = cp->nclist.next) {
for (patp = cp->nclist.pattern ; patp ; patp = patp->narg.next) {
==== //depot/projects/arm/src/bin/sh/sh.1#6 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95
-.\" $FreeBSD: src/bin/sh/sh.1,v 1.124 2006/10/07 16:51:16 stefanf Exp $
+.\" $FreeBSD: src/bin/sh/sh.1,v 1.125 2007/10/04 16:14:48 stefanf Exp $
.\"
.Dd October 7, 2006
.Dt SH 1
@@ -861,6 +861,10 @@
separated by
.Dq Li \&|
characters.
+The exit code of the
+.Ic case
+command is the exit code of the last command executed in the list or
+zero if no patterns were matched.
.Ss Grouping Commands Together
Commands may be grouped by writing either
.Bd -literal -offset indent
==== //depot/projects/arm/src/contrib/groff/tmac/doc-common#3 (text+ko) ====
@@ -485,6 +485,7 @@
.ds doc-operating-system-FreeBSD-5.5 5.5
.ds doc-operating-system-FreeBSD-6.0 6.0
.ds doc-operating-system-FreeBSD-6.1 6.1
+.ds doc-operating-system-FreeBSD-6.2 6.2
.ds doc-operating-system-FreeBSD-7.0 7.0
.
.ds doc-operating-system-Darwin-8.0.0 8.0.0
==== //depot/projects/arm/src/contrib/groff/tmac/doc-syms#3 (text+ko) ====
@@ -204,13 +204,13 @@
.as doc-str-At-v7 " \*[doc-Tn-font-size]AT&T UNIX\*[doc-str-At]
.ds doc-str-At-V \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V
.as doc-str-At-V " \*[doc-Tn-font-size]UNIX\*[doc-str-At]
-.ds doc-str-At-V.1 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V.1
+.ds doc-str-At-V.1 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V Release\~1
.as doc-str-At-V.1 " \*[doc-Tn-font-size]UNIX\*[doc-str-At]
-.ds doc-str-At-V.2 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V.2
+.ds doc-str-At-V.2 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V Release\~2
.as doc-str-At-V.2 " \*[doc-Tn-font-size]UNIX\*[doc-str-At]
-.ds doc-str-At-V.3 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V.3
+.ds doc-str-At-V.3 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V Release\~3
.as doc-str-At-V.3 " \*[doc-Tn-font-size]UNIX\*[doc-str-At]
-.ds doc-str-At-V.4 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V.4
+.ds doc-str-At-V.4 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V Release\~4
.as doc-str-At-V.4 " \*[doc-Tn-font-size]UNIX\*[doc-str-At]
.
.de At
==== //depot/projects/arm/src/contrib/groff/tmac/groff_mdoc.man#3 (text+ko) ====
@@ -813,9 +813,9 @@
Local, OS-specific additions might be found in the file
.Pa mdoc.local ;
look for strings named
-.Ql volume-ds-XXX
+.Ql volume\-ds\-XXX
(for the former type) and
-.Ql volume-as-XXX
+.Ql volume\-as\-XXX
(for the latter type);
.Ql XXX
then denotes the keyword to be used with the
@@ -848,7 +848,7 @@
local additions might be defined in
.Pa mdoc.local ;
look for strings named
-.Ql operating-system-XXX-YYY ,
+.Ql operating\-system\-XXX\-YYY ,
where
.Ql XXX
is the acronym for the operating system and
@@ -869,7 +869,7 @@
1.0, 1.1, 1.1.5, 1.1.5.1, 2.0, 2.0.5, 2.1, 2.1.5, 2.1.6, 2.1.7, 2.2, 2.2.1,
2.2.2, 2.2.5, 2.2.6, 2.2.7, 2.2.8, 3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 4.0, 4.1,
4.1.1, 4.2, 4.3, 4.4, 4.5, 4.6, 4.6.2, 4.7, 4.8, 4.9, 4.10, 4.11, 5.0, 5.1,
-5.2, 5.2.1, 5.3, 5.4, 6.0, 6.1
+5.2, 5.2.1, 5.3, 5.4, 5.5, 6.0, 6.1, 6.2, 7.0
.It DragonFly
1.0, 1.1, 1.2, 1.3, 1.4, 1.5
.It Darwin
@@ -1202,7 +1202,7 @@
If this is not desirable,
.
.Bd -literal -offset indent
-\&.An -nosplit
+\&.An \-nosplit
.Ed
.Pp
.
@@ -1210,7 +1210,7 @@
To turn splitting back on, write
.
.Bd -literal -offset indent
-\&.An -split
+\&.An \-split
.Ed
.
.Ss "Arguments"
@@ -1580,10 +1580,10 @@
.Sx RETURN VALUES
section.
.Pp
-.Dl Usage: .Rv Oo -std Oc Op Ao function Ac ...
+.Dl Usage: .Rv Oo \-std Oc Op Ao function Ac ...
.Pp
For example,
-.Ql ".Rv -std atexit"
+.Ql ".Rv \-std atexit"
produces:
.
.Bd -ragged -offset -indent
@@ -1610,10 +1610,10 @@
.Sx DIAGNOSTICS
section.
.Pp
-.Dl Usage: .Ex Oo -std Oc Op Ao utility Ac ...
+.Dl Usage: .Ex Oo \-std Oc Op Ao utility Ac ...
.Pp
For example,
-.Ql ".Ex -std cat"
+.Ql ".Ex \-std cat"
produces:
.
.Bd -ragged -offset -indent
@@ -1737,7 +1737,7 @@
Local, OS-specific additions might be found in the file
.Pa mdoc.local ;
look for strings named
-.Ql str-Lb-XXX .
+.Ql str\-Lb\-XXX .
.Ql XXX
then denotes the keyword to be used with the
.Ql .Lb
@@ -1755,16 +1755,16 @@
The
.Ql .Li
literal macro may be used for special characters, variable constants, etc.\&
--- anything which should be displayed as it would be typed.
+\- anything which should be displayed as it would be typed.
.Pp
.Dl Usage: .Li Ao argument Ac ...
.Pp
-.Bl -tag -width ".Li .Li\ cntrl-D\ )\ ," -compact -offset 15n
+.Bl -tag -width ".Li .Li\ cntrl\-D\ )\ ," -compact -offset 15n
.It Li ".Li \een"
.Li \en
.It Li ".Li M1 M2 M3 ;"
.Li M1 M2 M3 ;
-.It Li ".Li cntrl-D ) ,"
+.It Li ".Li cntrl\-D ) ,"
.Li cntrl-D ) ,
.It Li ".Li 1024 ..."
.Li 1024 ...
@@ -1812,7 +1812,7 @@
.Bl -tag -width ".Li .Nm\ groff_mdoc" -compact -offset 15n
.It Li ".Nm groff_mdoc"
.Nm groff_mdoc
-.It Li ".Nm \e-mdoc"
+.It Li ".Nm \e\-mdoc"
.Nm \-mdoc
.It Li ".Nm foo ) ) ,"
.Nm foo ) ) ,
@@ -1930,16 +1930,16 @@
.Pp
.Tn ANSI/ISO C
.Pp
-.Bl -tag -width ".Li -iso9945-1-90" -compact -offset indent
-.It Li -ansiC
+.Bl -tag -width ".Li \-p1003.1g\-2000" -compact -offset indent
+.It Li \-ansiC
.St -ansiC
-.It Li -ansiC-89
+.It Li \-ansiC\-89
.St -ansiC-89
-.It Li -isoC
+.It Li \-isoC
.St -isoC
-.It Li -isoC-90
+.It Li \-isoC\-90
.St -isoC-90
-.It Li -isoC-99
+.It Li \-isoC\-99
.St -isoC-99
.El
.Pp
@@ -1947,30 +1947,30 @@
.Tn POSIX
Part 1: System API
.Pp
-.Bl -tag -width ".Li -p1003.1g-2000" -compact -offset indent
-.It Li -iso9945-1-90
+.Bl -tag -width ".Li \-p1003.1g\-2000" -compact -offset indent
+.It Li \-iso9945\-1\-90
.St -iso9945-1-90
-.It Li -iso9945-1-96
+.It Li \-iso9945\-1\-96
.St -iso9945-1-96
-.It Li -p1003.1
+.It Li \-p1003.1
.St -p1003.1
-.It Li -p1003.1-88
+.It Li \-p1003.1\-88
.St -p1003.1-88
-.It Li -p1003.1-90
+.It Li \-p1003.1\-90
.St -p1003.1-90
-.It Li -p1003.1-96
+.It Li \-p1003.1\-96
.St -p1003.1-96
-.It Li -p1003.1b-93
+.It Li \-p1003.1b\-93
.St -p1003.1b-93
-.It Li -p1003.1c-95
+.It Li \-p1003.1c\-95
.St -p1003.1c-95
-.It Li -p1003.1g-2000
+.It Li \-p1003.1g\-2000
.St -p1003.1g-2000
-.It Li -p1003.1i-95
+.It Li \-p1003.1i\-95
.St -p1003.1i-95
-.It Li -p1003.1-2001
+.It Li \-p1003.1\-2001
.St -p1003.1-2001
-.It Li -p1003.1-2004
+.It Li \-p1003.1\-2004
.St -p1003.1-2004
.El
.Pp
@@ -1978,52 +1978,52 @@
.Tn POSIX
Part 2: Shell and Utilities
.Pp
-.Bl -tag -width ".Li -p1003.1g-2000" -compact -offset indent
-.It Li -iso9945-2-93
+.Bl -tag -width ".Li \-p1003.1g\-2000" -compact -offset indent
+.It Li \-iso9945\-2\-93
.St -iso9945-2-93
-.It Li -p1003.2
+.It Li \-p1003.2
.St -p1003.2
-.It Li -p1003.2-92
+.It Li \-p1003.2\-92
.St -p1003.2-92
-.It Li -p1003.2a-92
+.It Li \-p1003.2a\-92
.St -p1003.2a-92
.El
.Pp
.
X/Open
-.Bl -tag -width ".Li -p1003.1g-2000" -compact -offset indent
+.Bl -tag -width ".Li \-p1003.1g\-2000" -compact -offset indent
.Pp
-.It Li -susv2
+.It Li \-susv2
.St -susv2
-.It Li -svid4
+.It Li \-svid4
.St -svid4
-.It Li -xbd5
+.It Li \-xbd5
.St -xbd5
-.It Li -xcu5
+.It Li \-xcu5
.St -xcu5
-.It Li -xcurses4.2
+.It Li \-xcurses4.2
.St -xcurses4.2
-.It Li -xns5
+.It Li \-xns5
.St -xns5
-.It Li -xns5.2
+.It Li \-xns5.2
.St -xns5.2
-.It Li -xpg3
+.It Li \-xpg3
.St -xpg3
-.It Li -xpg4
+.It Li \-xpg4
.St -xpg4
-.It Li -xpg4.2
+.It Li \-xpg4.2
.St -xpg4.2
-.It Li -xsh5
+.It Li \-xsh5
.St -xsh5
.El
.Pp
.
Miscellaneous
.Pp
-.Bl -tag -width ".Li -p1003.1g-2000" -compact -offset indent
-.It Li -ieee754
+.Bl -tag -width ".Li \-p1003.1g\-2000" -compact -offset indent
+.It Li \-ieee754
.St -ieee754
-.It Li -iso8802-3
+.It Li \-iso8802\-3
.St -iso8802-3
.El
.
@@ -2113,7 +2113,7 @@
.Ss "BSD Macro"
.
.Pp
-.Dl "Usage: .Bx" Bro -alpha | -beta | -devel Brc ...
+.Dl "Usage: .Bx" Bro \-alpha | \-beta | \-devel Brc ...
.Dl " .Bx" Oo Ao version Ac Oo Ao release Ac Oc Oc ...
.Pp
.Bl -tag -width ".Li .Bx\ -devel" -compact -offset 15n
@@ -2384,7 +2384,7 @@
.Dq
.It Li ".Dq string abc ."
.Dq string abc .
-.It Li ".Dq \'^[A-Z]\'"
+.It Li ".Dq \'^[A\-Z]\'"
.Dq \'^[A-Z]\'
.It Li ".Ql man mdoc"
.Ql man mdoc
@@ -2577,7 +2577,7 @@
\&.%A "Matthew Bar"
\&.%A "John Foo"
\&.%T "Implementation Notes on foobar(1)"
-\&.%R "Technical Report ABC-DE-12-345"
+\&.%R "Technical Report ABC\-DE\-12\-345"
\&.%Q "Drofnats College, Nowhere"
\&.%D "April 1991"
\&.Re
@@ -2750,7 +2750,7 @@
.Pp
.Ql .Nd
first prints
-.Ql - ,
+.Ql \- ,
then all its arguments.
.
.It Li ".Sh LIBRARY"
@@ -3157,10 +3157,10 @@
.Ql .Dl
is parsed but not callable.
.Pp
-.Dl % ls -ldg /usr/local/bin
+.Dl % ls \-ldg /usr/local/bin
.Pp
The above was produced by:
-.Li ".Dl % ls -ldg /usr/local/bin" .
+.Li ".Dl % ls \e\-ldg /usr/local/bin" .
.
.It Li .Bd
Begin display.
@@ -3232,7 +3232,7 @@
macros, so one is guaranteed the two types of displays will line up.
The indentation value is normally set to\~6n or about two thirds of an inch
(six constant width characters).
-.It Ar indent-two
+.It Ar indent\-two
Indent two times the default indent value.
.It Ar right
This
@@ -3327,7 +3327,7 @@
A bullet list.
.
.Bd -literal -offset indent
-\&.Bl -bullet -offset indent -compact
+\&.Bl \-bullet \-offset indent \-compact
\&.It
Bullet one goes here.
\&.It
@@ -3351,7 +3351,7 @@
A dash list.
.
.Bd -literal -offset indent
-\&.Bl -dash -offset indent -compact
+\&.Bl \-dash \-offset indent \-compact
\&.It
Dash one goes here.
\&.It
@@ -3375,7 +3375,7 @@
An enumerated list.
.
.Bd -literal -offset indent
-\&.Bl -enum -offset indent -compact
+\&.Bl \-enum \-offset indent \-compact
\&.It
Item one goes here.
\&.It
@@ -3400,10 +3400,10 @@
flag (starting with the second-level list):
.
.Bd -literal -offset indent
-\&.Bl -enum -offset indent -compact
+\&.Bl \-enum \-offset indent \-compact
\&.It
Item one goes here
-\&.Bl -enum -nested -compact
+\&.Bl \-enum \-nested \-compact
\&.It
Item two goes here.
\&.It
@@ -3438,7 +3438,7 @@
without list markers.
.
.Bd -literal -offset indent
-\&.Bl -item -offset indent
+\&.Bl \-item \-offset indent
\&.It
Item one goes here.
Item one goes here.
@@ -3492,7 +3492,7 @@
The raw text:
.
.Bd -literal -offset indent
-\&.Bl -tag -width "PPID" -compact -offset indent
+\&.Bl \-tag \-width "PPID" \-compact \-offset indent
\&.It SL
sleep time of the process (seconds blocked)
\&.It PAGEIN
@@ -3501,10 +3501,10 @@
resulting from references by the process
to pages not loaded in core.
\&.It UID
-numerical user-id of process owner
+numerical user\-id of process owner
\&.It PPID
numerical id of parent of process priority
-(non-positive when in non-interruptible wait)
+(non\-positive when in non\-interruptible wait)
\&.El
.Ed
.Pp
@@ -3519,7 +3519,7 @@
Example:
.
.Bd -literal -offset indent
-\&.Bl -diag
+\&.Bl \-diag
\&.It You can't use Sy here.
The message says all.
\&.El
@@ -3549,7 +3549,7 @@
And the unformatted text which created it:
.
.Bd -literal -offset indent
-\&.Bl -hang -offset indent
+\&.Bl \-hang \-offset indent
\&.It Em Hanged
labels appear similar to tagged lists when the
label is smaller than the label width.
@@ -3583,7 +3583,7 @@
The raw text:
.
.Bd -literal -offset indent
-\&.Bl -ohang -offset indent
+\&.Bl \-ohang \-offset indent
\&.It Sy SL
sleep time of the process (seconds blocked)
\&.It Sy PAGEIN
@@ -3592,10 +3592,10 @@
resulting from references by the process
to pages not loaded in core.
\&.It Sy UID
-numerical user-id of process owner
+numerical user\-id of process owner
\&.It Sy PPID
numerical id of parent of process priority
-(non-positive when in non-interruptible wait)
+(non\-positive when in non\-interruptible wait)
\&.El
.Ed
.Pp
@@ -3628,7 +3628,7 @@
Here is the source text which produced the above example:
.
.Bd -literal -offset indent
-\&.Bl -inset -offset indent
+\&.Bl \-inset \-offset indent
\&.It Em Tag
The tagged list (also called a tagged paragraph)
is the most common type of list used in the
@@ -3693,12 +3693,18 @@
was produced by:
.
.Bd -literal
-\&.Bl -column -offset indent ".Sy String" ".Sy Nroff" ".Sy Troff"
+\&.Bl \-column \-offset indent ".Sy String" ".Sy Nroff" ".Sy Troff"
\&.It Sy String Ta Sy Nroff Ta Sy Troff
\&.It Li <= Ta <= Ta \e*(<=
\&.It Li >= Ta >= Ta \e*(>=
\&.El
.Ed
+.Pp
+.
+Don't abuse this list type!
+For more complicated cases it might be far better and easier to use
+.Xr tbl 1 ,
+the table preprocessor.
.El
.Pp
.
@@ -3720,7 +3726,7 @@
Example:
.
.Bd -literal -offset indent
-\&.Bl -tag -width ".Fl test Ao Ar string Ac"
+\&.Bl \-tag \-width ".Fl test Ao Ar string Ac"
\&.It Fl test Ao Ar string Ac
This is a longer sentence to show how the
\&.Fl width
@@ -4029,19 +4035,19 @@
.Xr groff 1 ,
resulting in multiple pages instead of a single, very long page:
.Pp
-.Dl groff -Tlatin1 -rcR=0 -mdoc foo.man > foo.txt
+.Dl groff \-Tlatin1 \-rcR=0 \-mdoc foo.man > foo.txt
.Pp
For double-sided printing, set register
.Ql D
to\~1:
.Pp
-.Dl groff -Tps -rD1 -mdoc foo.man > foo.ps
+.Dl groff \-Tps \-rD1 \-mdoc foo.man > foo.ps
.Pp
To change the document font size to 11pt or 12pt, set register
.Ql S
accordingly:
.Pp
-.Dl groff -Tdvi -rS11 -mdoc foo.man > foo.dvi
+.Dl groff \-Tdvi \-rS11 \-mdoc foo.man > foo.dvi
.Pp
Register
.Ql S
@@ -4055,7 +4061,7 @@
.Ql LT ,
respectively:
.Pp
-.Dl groff -Tutf8 -rLL=100n -rLT=100n -mdoc foo.man | less
+.Dl groff \-Tutf8 \-rLL=100n \-rLT=100n \-mdoc foo.man | less
.Pp
If not set, both registers default to 78n for TTY devices and 6.5i
otherwise.
==== //depot/projects/arm/src/crypto/openssl/ssl/ssl_lib.c#5 (text+ko) ====
@@ -1201,7 +1201,6 @@
char *SSL_get_shared_ciphers(const SSL *s,char *buf,int len)
{
char *p;
- const char *cp;
STACK_OF(SSL_CIPHER) *sk;
SSL_CIPHER *c;
int i;
@@ -1214,20 +1213,21 @@
sk=s->session->ciphers;
for (i=0; i<sk_SSL_CIPHER_num(sk); i++)
{
- /* Decrement for either the ':' or a '\0' */
- len--;
+ int n;
+
c=sk_SSL_CIPHER_value(sk,i);
- for (cp=c->name; *cp; )
+ n=strlen(c->name);
+ if (n+1 > len)
{
- if (len-- <= 0)
- {
- *p='\0';
- return(buf);
- }
- else
- *(p++)= *(cp++);
+ if (p != buf)
+ --p;
+ *p='\0';
+ return buf;
}
+ strcpy(p,c->name);
+ p+=n;
*(p++)=':';
+ len-=n+1;
}
p[-1]='\0';
return(buf);
==== //depot/projects/arm/src/etc/mtree/BSD.include.dist#12 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.119 2007/09/23 07:34:21 pjd Exp $
+# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.120 2007/10/03 05:51:20 ru Exp $
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
@@ -24,52 +24,52 @@
ext
pb_ds
detail
- pairing_heap_
+ basic_tree_policy
+ ..
+ bin_search_tree_
+ ..
+ binary_heap_
..
- splay_tree_
+ binomial_heap_
..
- list_update_map_
+ binomial_heap_base_
..
- basic_tree_policy
+ cc_hash_table_map_
..
- trie_policy
+ eq_fn
..
gp_hash_table_map_
..
- tree_policy
+ hash_fn
..
- binomial_heap_base_
+ left_child_next_sibling_heap_
..
- resize_policy
+ list_update_map_
..
- bin_search_tree_
+ list_update_policy
..
- binomial_heap_
+ ov_tree_map_
..
- thin_heap_
+ pairing_heap_
..
pat_trie_
..
- cc_hash_table_map_
+ rb_tree_map_
..
rc_binomial_heap_
..
- left_child_next_sibling_heap_
+ resize_policy
..
- unordered_iterator
+ splay_tree_
..
- binary_heap_
+ thin_heap_
..
- ov_tree_map_
+ tree_policy
..
- hash_fn
+ trie_policy
..
- eq_fn
- ..
- rb_tree_map_
+ unordered_iterator
..
- list_update_policy
- ..
..
..
..
@@ -106,10 +106,10 @@
..
pbio
..
+ powermac_nvram
+ ..
ppbus
..
- powermac_nvram
- ..
smbus
..
speaker
==== //depot/projects/arm/src/etc/mtree/BSD.local.dist#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.125 2006/11/12 12:02:34 ache Exp $
+# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.126 2007/10/03 05:51:20 ru Exp $
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
@@ -471,11 +471,11 @@
LC_MESSAGES
..
..
- sr at Latn
+ sq
LC_MESSAGES
..
..
- sq
+ sr at Latn
LC_MESSAGES
..
..
==== //depot/projects/arm/src/etc/mtree/BSD.x11-4.dist#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.x11-4.dist,v 1.31 2006/03/14 18:23:35 marcus Exp $
+# $FreeBSD: src/etc/mtree/BSD.x11-4.dist,v 1.32 2007/10/03 05:51:20 ru Exp $
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list