PERFORCE change 178939 for review
Alexander Motin
mav at FreeBSD.org
Fri May 28 20:00:50 UTC 2010
http://p4web.freebsd.org/@@178939?ac=10
Change 178939 by mav at mav_mavbook on 2010/05/28 20:00:36
IFC
Affected files ...
.. //depot/projects/scottl-camlock/src/bin/pax/pat_rep.c#3 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/jobs.c#5 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/sh.1#12 integrate
.. //depot/projects/scottl-camlock/src/contrib/bsnmp/gensnmpdef/gensnmpdef.1#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/bsnmp/gensnmptree/gensnmptree.1#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/bsnmp/lib/asn1.3#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/bsnmp/lib/bsnmpagent.3#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/bsnmp/lib/bsnmpclient.3#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/bsnmp/lib/bsnmplib.3#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/bsnmp/snmp_mibII/snmp_mibII.3#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/bsnmp/snmpd/bsnmpd.1#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/bsnmp/snmpd/snmpmod.3#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/ngatm/man/libngatm.3#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/ngatm/man/uniaddr.3#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/ngatm/man/unifunc.3#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/ngatm/man/unimsg.3#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/ngatm/man/unisap.3#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/ngatm/man/unistruct.3#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/ngatm/snmp_atm/snmp_atm.3#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/ngatm/sscop/sscop.1#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/nvi/docs/help#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/nvi/ex/ex_cmd.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/nvi/vi/v_ex.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/nvi/vi/v_txt.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/opie/libopie/readrec.c#2 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/ssh-pkcs11-helper.8#2 integrate
.. //depot/projects/scottl-camlock/src/gnu/usr.bin/dtc/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/compat-43/sigpause.2#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/sys/mount.2#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/sys/ptrace.2#7 integrate
.. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.core.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libthr/thread/thr_condattr.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/msun/man/math.3#3 integrate
.. //depot/projects/scottl-camlock/src/release/amd64/boot_crunch.conf#5 integrate
.. //depot/projects/scottl-camlock/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#10 integrate
.. //depot/projects/scottl-camlock/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#9 integrate
.. //depot/projects/scottl-camlock/src/release/i386/boot_crunch.conf#5 integrate
.. //depot/projects/scottl-camlock/src/release/ia64/boot_crunch.conf#4 integrate
.. //depot/projects/scottl-camlock/src/release/ia64/mkisoimages.sh#3 integrate
.. //depot/projects/scottl-camlock/src/release/pc98/boot_crunch.conf#5 integrate
.. //depot/projects/scottl-camlock/src/release/powerpc/boot_crunch.conf#6 integrate
.. //depot/projects/scottl-camlock/src/release/sparc64/boot_crunch.conf#5 integrate
.. //depot/projects/scottl-camlock/src/release/sun4v/boot_crunch.conf#5 integrate
.. //depot/projects/scottl-camlock/src/sbin/fsck_msdosfs/fsck_msdosfs.8#4 integrate
.. //depot/projects/scottl-camlock/src/share/doc/legal/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/share/doc/legal/intel_iwn/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/share/man/man4/Makefile#27 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/dcons.4#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/ddb.4#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/lindev.4#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/sbp_targ.4#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/uep.4#1 branch
.. //depot/projects/scottl-camlock/src/share/man/man9/BUS_DESCRIBE_INTR.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/atomic.9#4 integrate
.. //depot/projects/scottl-camlock/src/share/mk/bsd.own.mk#8 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/apic_vector.S#13 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/machdep.c#37 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mca.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mp_machdep.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/pmap.c#45 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/apicreg.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/apicvar.h#21 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/clock.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/mca.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/pcpu.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/specialreg.h#18 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/pmap.c#32 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/include/metadata.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/Makefile#13 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/arm/uboot/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/arm/uboot/version#2 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/fdt/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/fdt/dts/bindings-gpio.txt#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/fdt/dts/bindings-mpp.txt#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/fdt/dts/db78100.dts#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/fdt/dts/db88f5182.dts#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/fdt/dts/db88f5281.dts#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/fdt/dts/db88f6281.dts#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/fdt/dts/mpc8555cds.dts#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/fdt/dts/mpc8572ds.dts#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/fdt/dts/sheevaplug.dts#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/fdt/fdt_loader_cmd.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/powerpc/uboot/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/powerpc/uboot/version#3 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/uboot/common/main.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/uboot/common/metadata.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/uboot/lib/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/uboot/lib/disk.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/uboot/lib/glue.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/zfs/zfsimpl.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#91 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#43 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#157 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_xpt.c#32 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_ioctl.c#27 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_ioctl.h#13 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/NOTES#59 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files#78 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/options#44 integrate
.. //depot/projects/scottl-camlock/src/sys/ddb/db_command.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/ddb/db_command.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/ddb/db_thread.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.c#35 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ofw/ofw_bus_subr.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ofw/ofw_bus_subr.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ofw/ofw_fdt.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/ofw/ofw_if.m#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ofw/ofw_standard.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ofw/openfirm.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ofw/openfirm.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sge/if_sge.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/input/uep.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdevs#49 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/part/g_part_vtoc8.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/apic_vector.s#9 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/machdep.c#35 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/mca.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/mp_machdep.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/pmap.c#49 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/apicreg.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/apicvar.h#21 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/clock.h#11 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/mca.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/pcpu.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/specialreg.h#21 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/xen/pmap.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia32/ia32_trap.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/pmap.c#28 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/trap.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/include/proc.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/isa/syscons_isa.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_clock.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_proc.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_resource.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_thread.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_taskqueue.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_trap.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/sys_process.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/uipc_socket.c#33 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_bio.c#27 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/asm.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/pmap.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/swtch.S#7 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/tick.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/uio_machdep.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/rmi/ehcireg.h#4 delete
.. //depot/projects/scottl-camlock/src/sys/mips/rmi/ehcivar.h#4 delete
.. //depot/projects/scottl-camlock/src/sys/mips/rmi/pcibus.c#3 delete
.. //depot/projects/scottl-camlock/src/sys/mips/rmi/perfmon.h#2 delete
.. //depot/projects/scottl-camlock/src/sys/mips/rmi/perfmon_kern.c#2 delete
.. //depot/projects/scottl-camlock/src/sys/mips/rmi/perfmon_percpu.c#2 delete
.. //depot/projects/scottl-camlock/src/sys/mips/rmi/perfmon_utils.h#2 delete
.. //depot/projects/scottl-camlock/src/sys/mips/rmi/perfmon_xlrconfig.h#2 delete
.. //depot/projects/scottl-camlock/src/sys/mips/rmi/xlr_boot1_console.c#2 delete
.. //depot/projects/scottl-camlock/src/sys/modules/Makefile#53 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/iwnfw/Makefile.inc#2 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/linux/Makefile#14 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/usb/uep/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/sys/net/if.c#48 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_var.h#35 integrate
.. //depot/projects/scottl-camlock/src/sys/net/route.c#26 integrate
.. //depot/projects/scottl-camlock/src/sys/net/rtsock.c#28 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/in.c#35 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/in_pcb.c#31 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_options.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_output.c#29 integrate
.. //depot/projects/scottl-camlock/src/sys/netipsec/ipsec_input.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_vfsops.c#27 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_vnops.c#31 integrate
.. //depot/projects/scottl-camlock/src/sys/pc98/cbus/clock.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/pc98/cbus/syscons_cbus.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/aim/mmu_oea.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/aim/mmu_oea64.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/booke/pmap.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/include/metadata.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/ofw/ofw_real.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/mmu_if.m#12 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/pmap_dispatch.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/pmap.c#27 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/pmap.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/_task.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/kernel.h#18 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/param.h#45 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/pcpu.h#18 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/resourcevar.h#11 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/sysent.h#15 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/systm.h#26 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/taskqueue.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/user.h#15 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/pmap.h#16 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_map.c#32 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_mmap.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_object.c#27 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_page.c#30 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_page.h#18 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_pageout.c#24 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vnode_pager.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/x86/isa/clock.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/x86/x86/local_apic.c#1 branch
.. //depot/projects/scottl-camlock/src/tools/build/options/WITH_FDT#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/sockets/unix_close_race/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/sockets/unix_close_race/unix_close_race.c#1 branch
.. //depot/projects/scottl-camlock/src/usr.bin/mail/util.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/dconschat/dconschat.8#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/fdcontrol/fdcontrol.8#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/i2c/i2c.8#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/iostat/iostat.8#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/jail/jail.c#7 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/nfsd/nfsv4.4#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/nfsd/stablerestart.5#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/updating/pkg_updating.1#5 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/smbmsg/smbmsg.8#3 integrate
Differences ...
==== //depot/projects/scottl-camlock/src/bin/pax/pat_rep.c#3 (text+ko) ====
@@ -37,7 +37,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/pax/pat_rep.c,v 1.27 2007/05/25 17:53:37 brian Exp $");
+__FBSDID("$FreeBSD: src/bin/pax/pat_rep.c,v 1.28 2010/05/24 06:33:14 uqs Exp $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -76,7 +76,7 @@
#ifdef NET2_REGEX
static int resub(regexp *, char *, char *, char *);
#else
-static int resub(regex_t *, regmatch_t *, char *, char *, char *);
+static int resub(regex_t *, regmatch_t *, char *, char *, char *, char *);
#endif
/*
@@ -929,7 +929,7 @@
# ifdef NET2_REGEX
if ((res = resub(pt->rcmp,pt->nstr,outpt,endpt)) < 0) {
# else
- if ((res = resub(&(pt->rcmp),pm,pt->nstr,outpt,endpt))
+ if ((res = resub(&(pt->rcmp),pm,inpt,pt->nstr,outpt,endpt))
< 0) {
# endif
if (prnt)
@@ -1071,7 +1071,7 @@
*/
static int
-resub(regex_t *rp, regmatch_t *pm, char *src, char *dest,
+resub(regex_t *rp, regmatch_t *pm, char *orig, char *src, char *dest,
char *destend)
{
char *spt;
@@ -1121,7 +1121,7 @@
*/
if (len > (destend - dpt))
len = destend - dpt;
- if (l_strncpy(dpt, src + pmpt->rm_so, len) != len)
+ if (l_strncpy(dpt, orig + pmpt->rm_so, len) != len)
return(-1);
dpt += len;
}
==== //depot/projects/scottl-camlock/src/bin/sh/jobs.c#5 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.75 2009/12/27 18:04:05 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.76 2010/05/24 10:35:57 jilles Exp $");
#include <fcntl.h>
#include <signal.h>
@@ -91,6 +91,7 @@
STATIC struct job *getjob(char *);
STATIC pid_t dowait(int, struct job *);
STATIC pid_t waitproc(int, int *);
+STATIC void checkzombies(void);
STATIC void cmdtxt(union node *);
STATIC void cmdputs(const char *);
#if JOBS
@@ -400,7 +401,7 @@
struct job *jp;
TRACE(("showjobs(%d) called\n", change));
- while (dowait(0, (struct job *)NULL) > 0);
+ checkzombies();
for (jobno = 1, jp = jobtab ; jobno <= njobs ; jobno++, jp++) {
if (! jp->used)
continue;
@@ -742,6 +743,8 @@
TRACE(("forkshell(%%%d, %p, %d) called\n", jp - jobtab, (void *)n,
mode));
INTOFF;
+ if (mode == FORK_BG)
+ checkzombies();
flushall();
pid = fork();
if (pid == -1) {
@@ -1056,6 +1059,15 @@
return (0);
}
+
+STATIC void
+checkzombies(void)
+{
+ while (njobs > 0 && dowait(0, NULL) > 0)
+ ;
+}
+
+
/*
* Return a string identifying a command (to be printed by the
* jobs command.
==== //depot/projects/scottl-camlock/src/bin/sh/sh.1#12 (text+ko) ====
@@ -30,9 +30,9 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95
-.\" $FreeBSD: src/bin/sh/sh.1,v 1.139 2010/05/09 22:03:18 jilles Exp $
+.\" $FreeBSD: src/bin/sh/sh.1,v 1.141 2010/05/24 15:12:12 jilles Exp $
.\"
-.Dd May 9, 2010
+.Dd May 24, 2010
.Dt SH 1
.Os
.Sh NAME
@@ -665,11 +665,11 @@
performing any searches.
.It
The shell searches each entry in the
-.Ev PATH
-environment variable
+.Va PATH
+variable
in turn for the command.
The value of the
-.Ev PATH
+.Va PATH
variable should be a series of
entries separated by colons.
Each entry consists of a
@@ -1040,13 +1040,9 @@
.Ic set
built-in command can also be used to set or reset them.
.Ss Special Parameters
-A special parameter is a parameter denoted by a special one-character
-name.
-The special parameters recognized by the
-.Nm
-shell of
-.Fx
-are shown in the following list, exactly as they would appear in input
+Special parameters are parameters denoted by a single special character
+or the digit zero.
+They are shown in the following list, exactly as they would appear in input
typed by the user or in the source of a shell script.
.Bl -hang
.It Li $*
@@ -1113,6 +1109,84 @@
.It Li $0
(zero) Expands to the name of the shell or shell script.
.El
+.Ss Special Variables
+The following variables are set by the shell or
+have special meaning to it:
+.Bl -tag -width ".Va HISTSIZE"
+.It Va CDPATH
+The search path used with the
+.Ic cd
+built-in.
+.It Va EDITOR
+The fallback editor used with the
+.Ic fc
+built-in.
+If not set, the default editor is
+.Xr ed 1 .
+.It Va FCEDIT
+The default editor used with the
+.Ic fc
+built-in.
+.It Va HISTSIZE
+The number of previous commands that are accessible.
+.It Va HOME
+The user's home directory,
+used in tilde expansion and as a default directory for the
+.Ic cd
+built-in.
+.It Va IFS
+Input Field Separators.
+This is normally set to
+.Aq space ,
+.Aq tab ,
+and
+.Aq newline .
+See the
+.Sx White Space Splitting
+section for more details.
+.It Va LINENO
+The current line number in the script or function.
+.It Va MAIL
+The name of a mail file, that will be checked for the arrival of new
+mail.
+Overridden by
+.Va MAILPATH .
+.It Va MAILPATH
+A colon
+.Pq Ql \&:
+separated list of file names, for the shell to check for incoming
+mail.
+This variable overrides the
+.Va MAIL
+setting.
+There is a maximum of 10 mailboxes that can be monitored at once.
+.It Va PATH
+The default search path for executables.
+See the
+.Sx Path Search
+section for details.
+.It Va PPID
+The parent process ID of the invoked shell.
+This is set at startup
+unless this variable is in the environment.
+A later change of parent process ID is not reflected.
+A subshell retains the same value of
+.Va PPID .
+.It Va PS1
+The primary prompt string, which defaults to
+.Dq Li "$ " ,
+unless you are the superuser, in which case it defaults to
+.Dq Li "# " .
+.It Va PS2
+The secondary prompt string, which defaults to
+.Dq Li "> " .
+.It Va PS4
+The prefix for the trace output (if
+.Fl x
+is active).
+The default is
+.Dq Li "+ " .
+.El
.Ss Word Expansions
This clause describes the various expansions that are
performed on words.
@@ -1166,7 +1240,7 @@
username is missing (as in
.Pa ~/foobar ) ,
the tilde is replaced with the value of the
-.Ev HOME
+.Va HOME
variable (the current user's home directory).
.Ss Parameter Expansion
The format for parameter expansion is as follows:
@@ -1491,10 +1565,10 @@
.Ql /
characters, it is used as is.
Otherwise, the shell searches the
-.Ev PATH
+.Va PATH
for the file.
If it is not found in the
-.Ev PATH ,
+.Va PATH ,
it is sought in the current working directory.
.It Ic \&[
A built-in equivalent of
@@ -1538,7 +1612,7 @@
Switch to the specified
.Ar directory ,
or to the directory specified in the
-.Ev HOME
+.Va HOME
environment variable if no
.Ar directory
is specified.
@@ -1549,17 +1623,17 @@
or
.Pa .. ,
then the directories listed in the
-.Ev CDPATH
+.Va CDPATH
variable will be
searched for the specified
.Ar directory .
If
-.Ev CDPATH
+.Va CDPATH
is unset, the current directory is searched.
The format of
-.Ev CDPATH
+.Va CDPATH
is the same as that of
-.Ev PATH .
+.Va PATH .
In an interactive shell,
the
.Ic cd
@@ -1567,7 +1641,7 @@
that it actually switched to
if this is different from the name that the user gave.
These may be different either because the
-.Ev CDPATH
+.Va CDPATH
mechanism was used or because a symbolic link was crossed.
.Pp
If the
@@ -1601,7 +1675,7 @@
.Fl p
option is specified, the command search is performed using a
default value of
-.Ev PATH
+.Va PATH
that is guaranteed to find all of the standard utilities.
.Pp
If the
@@ -1760,20 +1834,20 @@
.Ar editor
string is a command name,
subject to search via the
-.Ev PATH
+.Va PATH
variable.
The value in the
-.Ev FCEDIT
+.Va FCEDIT
variable is used as a default when
.Fl e
is not specified.
If
-.Ev FCEDIT
+.Va FCEDIT
is null or unset, the value of the
-.Ev EDITOR
+.Va EDITOR
variable is used.
If
-.Ev EDITOR
+.Va EDITOR
is null or unset,
.Xr ed 1
is used as the editor.
@@ -1807,7 +1881,7 @@
Select the commands to list or edit.
The number of previous commands that can be accessed
are determined by the value of the
-.Ev HISTSIZE
+.Va HISTSIZE
variable.
The value of
.Ar first
@@ -1838,12 +1912,12 @@
.El
.El
.Pp
-The following environment variables affect the execution of
+The following variables affect the execution of
.Ic fc :
-.Bl -tag -width ".Ev HISTSIZE"
-.It Ev FCEDIT
+.Bl -tag -width ".Va HISTSIZE"
+.It Va FCEDIT
Name of the editor to use for history editing.
-.It Ev HISTSIZE
+.It Va HISTSIZE
The number of previous commands that are accessible.
.El
.It Ic fg Op Ar job
@@ -2309,74 +2383,27 @@
.Sh ENVIRONMENT
The following environment variables affect the execution of
.Nm :
-.Bl -tag -width ".Ev HISTSIZE"
-.It Ev CDPATH
-The search path used with the
-.Ic cd
-built-in.
-.It Ev EDITOR
-The fallback editor used with the
-.Ic fc
-built-in.
-If not set, the default editor is
-.Xr ed 1 .
-.It Ev FCEDIT
-The default editor used with the
-.Ic fc
-built-in.
-.It Ev HISTSIZE
-The number of previous commands that are accessible.
-.It Ev HOME
-The starting directory of
-.Nm .
-.It Ev IFS
-Input Field Separators.
-This is normally set to
-.Aq space ,
-.Aq tab ,
-and
-.Aq newline .
-See the
-.Sx White Space Splitting
-section for more details.
-.It Ev MAIL
-The name of a mail file, that will be checked for the arrival of new
-mail.
-Overridden by
-.Ev MAILPATH .
-.It Ev MAILPATH
-A colon
-.Pq Ql \&:
-separated list of file names, for the shell to check for incoming
-mail.
-This environment setting overrides the
-.Ev MAIL
-setting.
-There is a maximum of 10 mailboxes that can be monitored at once.
-.It Ev PATH
-The default search path for executables.
-See the
-.Sx Path Search
-section for details.
-.It Ev PS1
-The primary prompt string, which defaults to
-.Dq Li "$ " ,
-unless you are the superuser, in which case it defaults to
-.Dq Li "# " .
-.It Ev PS2
-The secondary prompt string, which defaults to
-.Dq Li "> " .
-.It Ev PS4
-The prefix for the trace output (if
-.Fl x
-is active).
-The default is
-.Dq Li "+ " .
+.Bl -tag -width ".Ev LANGXXXXXX"
+.It Ev ENV
+Initialization file for interactive shells.
+.It Ev LANG , Ev LC_*
+Locale settings.
+These are inherited by children of the shell,
+and is used in a limited manner by the shell itself.
+.It Ev PWD
+An absolute pathname for the current directory,
+possibly containing symbolic links.
+This is used and updated by the shell.
.It Ev TERM
The default terminal setting for the shell.
This is inherited by children of the shell, and is used in the history
editing modes.
.El
+.Pp
+Additionally, all environment variables are turned into shell variables
+at startup,
+which may affect the shell as described under
+.Sx Special Variables .
.Sh EXIT STATUS
Errors that are detected by the shell, such as a syntax error, will
cause the shell to exit with a non-zero exit status.
==== //depot/projects/scottl-camlock/src/contrib/bsnmp/gensnmpdef/gensnmpdef.1#2 (text+ko) ====
@@ -3,7 +3,7 @@
.\" Hartmut Brandt.
.\" All rights reserved.
.\"
-.\" Author: Harti Brandt <harti at freebsd.org>
+.\" Author: Harti Brandt <harti at FreeBSD.org>
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -78,7 +78,7 @@
.Sh SEE ALSO
.Xr snmpd 1
.Sh AUTHORS
-.An Hartmut Brandt Aq harti at freebsd.org
+.An Hartmut Brandt Aq harti at FreeBSD.org
.Sh BUGS
The utility is by no means bullet-proof and may fail for complex
or non-standard MIBs.
==== //depot/projects/scottl-camlock/src/contrib/bsnmp/gensnmptree/gensnmptree.1#3 (text+ko) ====
@@ -6,7 +6,7 @@
.\" Hartmut Brandt
.\" All rights reserved.
.\"
-.\" Author: Harti Brandt <harti at freebsd.org>
+.\" Author: Harti Brandt <harti at FreeBSD.org>
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -243,4 +243,4 @@
.Sh SEE ALSO
.Xr bsnmpd 1
.Sh AUTHORS
-.An Hartmut Brandt Aq harti at freebsd.org
+.An Hartmut Brandt Aq harti at FreeBSD.org
==== //depot/projects/scottl-camlock/src/contrib/bsnmp/lib/asn1.3#2 (text+ko) ====
@@ -6,7 +6,7 @@
.\" Fraunhofer Institute for Open Communication Systems (FhG Fokus).
.\" All rights reserved.
.\"
-.\" Author: Harti Brandt <harti at freebsd.org>
+.\" Author: Harti Brandt <harti at FreeBSD.org>
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -489,4 +489,4 @@
This implementation conforms to the applicable IETF RFCs and ITU-T
recommendations.
.Sh AUTHORS
-.An Hartmut Brandt Aq harti at freebsd.org
+.An Hartmut Brandt Aq harti at FreeBSD.org
==== //depot/projects/scottl-camlock/src/contrib/bsnmp/lib/bsnmpagent.3#2 (text+ko) ====
@@ -6,7 +6,7 @@
.\" Fraunhofer Institute for Open Communication Systems (FhG Fokus).
.\" All rights reserved.
.\"
-.\" Author: Harti Brandt <harti at freebsd.org>
+.\" Author: Harti Brandt <harti at FreeBSD.org>
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -441,4 +441,4 @@
This implementation conforms to the applicable IETF RFCs and ITU-T
recommendations.
.Sh AUTHORS
-.An Hartmut Brandt Aq harti at freebsd.org
+.An Hartmut Brandt Aq harti at FreeBSD.org
==== //depot/projects/scottl-camlock/src/contrib/bsnmp/lib/bsnmpclient.3#2 (text+ko) ====
@@ -6,7 +6,7 @@
.\" Fraunhofer Institute for Open Communication Systems (FhG Fokus).
.\" All rights reserved.
.\"
-.\" Author: Harti Brandt <harti at freebsd.org>
+.\" Author: Harti Brandt <harti at FreeBSD.org>
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -654,5 +654,5 @@
This implementation conforms to the applicable IETF RFCs and ITU-T
recommendations.
.Sh AUTHORS
-.An Hartmut Brandt Aq harti at freebsd.org
+.An Hartmut Brandt Aq harti at FreeBSD.org
.An Kendy Kutzner Aq kutzner at fokus.gmd.de
==== //depot/projects/scottl-camlock/src/contrib/bsnmp/lib/bsnmplib.3#2 (text+ko) ====
@@ -6,7 +6,7 @@
.\" Fraunhofer Institute for Open Communication Systems (FhG Fokus).
.\" All rights reserved.
.\"
-.\" Author: Harti Brandt <harti at freebsd.org>
+.\" Author: Harti Brandt <harti at FreeBSD.org>
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -302,4 +302,4 @@
This implementation conforms to the applicable IETF RFCs and ITU-T
recommendations.
.Sh AUTHORS
-.An Hartmut Brandt Aq harti at freebsd.org
+.An Hartmut Brandt Aq harti at FreeBSD.org
==== //depot/projects/scottl-camlock/src/contrib/bsnmp/snmp_mibII/snmp_mibII.3#2 (text+ko) ====
@@ -6,7 +6,7 @@
.\" Fraunhofer Institute for Open Communication Systems (FhG Fokus).
.\" All rights reserved.
.\"
-.\" Author: Harti Brandt <harti at freebsd.org>
+.\" Author: Harti Brandt <harti at FreeBSD.org>
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -363,4 +363,4 @@
.Sh STANDARDS
This implementation conforms to the applicable IETF RFCs.
.Sh AUTHORS
-.An Hartmut Brandt Aq harti at freebsd.org
+.An Hartmut Brandt Aq harti at FreeBSD.org
==== //depot/projects/scottl-camlock/src/contrib/bsnmp/snmpd/bsnmpd.1#2 (text+ko) ====
@@ -6,7 +6,7 @@
.\" Fraunhofer Institute for Open Communication Systems (FhG Fokus).
.\" All rights reserved.
.\"
-.\" Author: Harti Brandt <harti at freebsd.org>
+.\" Author: Harti Brandt <harti at FreeBSD.org>
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -271,6 +271,6 @@
.Nm
conforms to the applicable IETF RFCs.
.Sh AUTHORS
-.An Hartmut Brandt Aq harti at freebsd.org
+.An Hartmut Brandt Aq harti at FreeBSD.org
.Sh BUGS
Sure.
==== //depot/projects/scottl-camlock/src/contrib/bsnmp/snmpd/snmpmod.3#3 (text+ko) ====
@@ -6,7 +6,7 @@
.\" Fraunhofer Institute for Open Communication Systems (FhG Fokus).
.\" All rights reserved.
.\"
-.\" Author: Harti Brandt <harti at freebsd.org>
+.\" Author: Harti Brandt <harti at FreeBSD.org>
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -926,4 +926,4 @@
This implementation conforms to the applicable IETF RFCs and ITU-T
recommendations.
.Sh AUTHORS
-.An Hartmut Brandt Aq harti at freebsd.org
+.An Hartmut Brandt Aq harti at FreeBSD.org
==== //depot/projects/scottl-camlock/src/contrib/ngatm/man/libngatm.3#2 (text+ko) ====
@@ -6,7 +6,7 @@
.\" Fraunhofer Institute for Open Communication Systems (FhG Fokus).
.\" All rights reserved.
.\"
-.\" Author: Hartmut Brandt <harti at freebsd.org>
+.\" Author: Hartmut Brandt <harti at FreeBSD.org>
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -72,4 +72,4 @@
This implementation conforms to the applicable ITU-T
recommendations and ATM Forum standards.
.Sh AUTHORS
-.An Hartmut Brandt Aq harti at freebsd.org
+.An Hartmut Brandt Aq harti at FreeBSD.org
==== //depot/projects/scottl-camlock/src/contrib/ngatm/man/uniaddr.3#2 (text+ko) ====
@@ -6,7 +6,7 @@
.\" Fraunhofer Institute for Open Communication Systems (FhG Fokus).
.\" All rights reserved.
.\"
-.\" Author: Hartmut Brandt <harti at freebsd.org>
+.\" Author: Hartmut Brandt <harti at FreeBSD.org>
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -126,4 +126,4 @@
.Sh SEE ALSO
.Xr libngatm 3
.Sh AUTHORS
-.An Hartmut Brandt Aq harti at freebsd.org
+.An Hartmut Brandt Aq harti at FreeBSD.org
==== //depot/projects/scottl-camlock/src/contrib/ngatm/man/unifunc.3#2 (text+ko) ====
@@ -6,7 +6,7 @@
.\" Fraunhofer Institute for Open Communication Systems (FhG Fokus).
.\" All rights reserved.
.\"
-.\" Author: Hartmut Brandt <harti at freebsd.org>
+.\" Author: Hartmut Brandt <harti at FreeBSD.org>
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -252,4 +252,4 @@
recommendations and ATM Forum standards with the exception of some limitations
(see the Configuration section).
.Sh AUTHORS
-.An Hartmut Brandt Aq harti at freebsd.org
+.An Hartmut Brandt Aq harti at FreeBSD.org
==== //depot/projects/scottl-camlock/src/contrib/ngatm/man/unimsg.3#2 (text+ko) ====
@@ -27,7 +27,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" Author: Hartmut Brandt <harti at freebsd.org>
+.\" Author: Hartmut Brandt <harti at FreeBSD.org>
.\"
.\" $Begemot: libunimsg/man/unimsg.3,v 1.4 2005/06/15 11:37:10 brandt_h Exp $
.\"
@@ -246,4 +246,4 @@
.Xr libunimsg 3 ,
.Xr mbuf 9
.Sh AUTHORS
-.An Hartmut Brandt Aq harti at freebsd.org
+.An Hartmut Brandt Aq harti at FreeBSD.org
==== //depot/projects/scottl-camlock/src/contrib/ngatm/man/unisap.3#2 (text+ko) ====
@@ -27,7 +27,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" Author: Hartmut Brandt <harti at freebsd.org>
+.\" Author: Hartmut Brandt <harti at FreeBSD.org>
.\"
.\" $Begemot: libunimsg/man/unisap.3,v 1.5 2005/06/15 11:37:11 brandt_h Exp $
.\"
@@ -262,4 +262,4 @@
.Sh SEE ALSO
.Xr libunimsg 3
.Sh AUTHORS
-.An Hartmut Brandt Aq harti at freebsd.org
+.An Hartmut Brandt Aq harti at FreeBSD.org
==== //depot/projects/scottl-camlock/src/contrib/ngatm/man/unistruct.3#2 (text+ko) ====
@@ -6,7 +6,7 @@
.\" Fraunhofer Institute for Open Communication Systems (FhG Fokus).
.\" All rights reserved.
.\"
-.\" Author: Hartmut Brandt <harti at freebsd.org>
+.\" Author: Hartmut Brandt <harti at FreeBSD.org>
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -320,4 +320,4 @@
recommendations and ATM Forum standards with the exception of some limitations
(see the Configuration section).
.Sh AUTHORS
-.An Hartmut Brandt Aq harti at freebsd.org
+.An Hartmut Brandt Aq harti at FreeBSD.org
==== //depot/projects/scottl-camlock/src/contrib/ngatm/snmp_atm/snmp_atm.3#2 (text+ko) ====
@@ -6,7 +6,7 @@
.\" Hartmut Brandt.
.\" All rights reserved.
.\"
-.\" Author: Hartmut Brandt <harti at freebsd.org>
+.\" Author: Hartmut Brandt <harti at FreeBSD.org>
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -215,4 +215,4 @@
.Xr snmpmod 3 ,
.Xr snmp_netgraph 3
.Sh AUTHORS
-.An Hartmut Brandt Aq harti at freebsd.org
+.An Hartmut Brandt Aq harti at FreeBSD.org
==== //depot/projects/scottl-camlock/src/contrib/ngatm/sscop/sscop.1#2 (text+ko) ====
@@ -3,7 +3,7 @@
.\" Fraunhofer Institute for Open Communication Systems (FhG Fokus).
.\" All rights reserved.
.\"
-.\" Author: Harti Brandt <harti at freebsd.org>
+.\" Author: Harti Brandt <harti at FreeBSD.org>
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -166,4 +166,4 @@
.Sh STANDARDS
The implemented protocol conforms to ITU-T recommendation Q.2110.
.Sh AUTHORS
-.An Hartmut Brandt Aq harti at freebsd.org
+.An Hartmut Brandt Aq harti at FreeBSD.org
==== //depot/projects/scottl-camlock/src/contrib/nvi/docs/help#2 (text+ko) ====
@@ -129,7 +129,7 @@
^D: scroll lines
!: filter lines through commands or run commands
#: display numbered lines
- &: repeat the last subsitution
+ &: repeat the last substitution
*: execute a buffer
<: shift lines left
=: display line number
==== //depot/projects/scottl-camlock/src/contrib/nvi/ex/ex_cmd.c#2 (text+ko) ====
@@ -68,7 +68,7 @@
{"&", ex_subagain, E_ADDR2,
"s",
"[line [,line]] & [cgr] [count] [#lp]",
- "repeat the last subsitution"},
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list