Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/pgoyette-compat]: src Synch with HEAD, resolve conflicts
details: https://anonhg.NetBSD.org/src/rev/85567721b7d4
branches: pgoyette-compat
changeset: 321078:85567721b7d4
user: pgoyette <pgoyette%NetBSD.org@localhost>
date: Thu Mar 22 01:44:39 2018 +0000
description:
Synch with HEAD, resolve conflicts
diffstat:
bin/pax/buf_subs.c | 6 +-
bin/sh/sh.1 | 299 +-
crypto/external/bsd/openssl/lib/libdes/Makefile | 9 +-
distrib/sets/lists/comp/ad.aarch64 | 3 +-
distrib/sets/lists/comp/ad.arm | 3 +-
doc/3RDPARTY | 4 +-
doc/CHANGES | 4 +-
external/bsd/mdocml/include/config.h | 2 +-
external/mit/ctwm/bin/ctwm/Makefile | 4 +-
lib/libc/sys/recv.2 | 6 +-
sbin/gpt/gpt.8 | 11 +-
sbin/gpt/gpt.h | 1 +
sbin/gpt/main.c | 7 +-
sbin/gpt/set.c | 10 +-
sbin/gpt/type.c | 10 +-
sbin/gpt/unset.c | 11 +-
sbin/nvmectl/devlist.c | 6 +-
sbin/nvmectl/identify.c | 6 +-
sbin/nvmectl/logpage.c | 6 +-
sbin/nvmectl/nvmectl.c | 15 +-
sbin/nvmectl/nvmectl.h | 20 +-
sbin/nvmectl/perftest.c | 6 +-
sbin/nvmectl/power.c | 6 +-
sbin/nvmectl/reset.c | 6 +-
sbin/nvmectl/wdc.c | 22 +-
share/man/man4/altq.4 | 25 +-
share/man/man4/ddb.4 | 19 +-
share/man/man8/man8.vax/boot.8 | 8 +-
share/man/man9/altq.9 | 9 +-
share/man/man9/firmload.9 | 12 +-
share/misc/bsd-family-tree | 38 +-
share/mk/bsd.own.mk | 5 +-
sys/arch/aarch64/include/armreg.h | 3 +-
sys/arch/acorn32/eb7500atx/rsbus_io.c | 94 +-
sys/arch/acorn32/podulebus/podulebus_io.c | 94 +-
sys/arch/alpha/alpha/vm_machdep.c | 11 +-
sys/arch/amd64/amd64/amd64_trap.S | 55 +-
sys/arch/amd64/amd64/db_machdep.c | 8 +-
sys/arch/amd64/amd64/locore.S | 9 +-
sys/arch/amd64/amd64/machdep.c | 5 +-
sys/arch/amd64/amd64/vector.S | 56 +-
sys/arch/amd64/conf/ALL | 6 +-
sys/arch/amd64/include/cpu.h | 5 +-
sys/arch/amd64/include/param.h | 6 +-
sys/arch/amd64/include/types.h | 3 +-
sys/arch/arm/arm/arm_generic_dma.c | 41 +
sys/arch/arm/arm32/armv7_generic_dma.c | 40 -
sys/arch/arm/arm32/armv7_generic_space.c | 280 +-
sys/arch/arm/at91/at91_bus_space.c | 110 +-
sys/arch/arm/broadcom/bcm283x_platform.c | 6 +-
sys/arch/arm/broadcom/bcmgen_space.c | 142 +-
sys/arch/arm/broadcom/files.bcm2835 | 4 +-
sys/arch/arm/clps711x/clps711x_space.c | 94 +-
sys/arch/arm/ep93xx/ep93xx_space.c | 110 +-
sys/arch/arm/footbridge/footbridge_com_io.c | 94 +-
sys/arch/arm/footbridge/footbridge_io.c | 94 +-
sys/arch/arm/footbridge/isa/isa_io.c | 184 +-
sys/arch/arm/gemini/gemini_a4x_space.c | 94 +-
sys/arch/arm/gemini/gemini_space.c | 94 +-
sys/arch/arm/imx/files.imx51 | 4 +-
sys/arch/arm/imx/files.imx6 | 4 +-
sys/arch/arm/imx/files.imx7 | 4 +-
sys/arch/arm/imx/imx23_space.c | 92 +-
sys/arch/arm/imx/imx51_axi.c | 6 +-
sys/arch/arm/imx/imx51_ipuv3.c | 6 +-
sys/arch/arm/imx/imx51_usb.c | 6 +-
sys/arch/arm/imx/imx51var.h | 4 +-
sys/arch/arm/imx/imx6_axi.c | 6 +-
sys/arch/arm/imx/imx6_usb.c | 6 +-
sys/arch/arm/imx/imx6var.h | 4 +-
sys/arch/arm/imx/imx7_axi.c | 6 +-
sys/arch/arm/imx/imx7_usb.c | 6 +-
sys/arch/arm/imx/imx7var.h | 4 +-
sys/arch/arm/imx/imx_space.c | 142 +-
sys/arch/arm/include/Makefile | 4 +-
sys/arch/arm/include/aout_machdep.h | 4 +-
sys/arch/arm/include/armreg.h | 163 +-
sys/arch/arm/include/cputypes.h | 214 +
sys/arch/arm/iomd/iomd_io.c | 94 +-
sys/arch/arm/ixp12x0/ixp12x0_io.c | 94 +-
sys/arch/arm/mainbus/mainbus_io.c | 142 +-
sys/arch/arm/marvell/mvsoc_space.c | 187 +-
sys/arch/arm/mpcore/mpcore_a2x_space.c | 92 +-
sys/arch/arm/mpcore/mpcore_a4x_space.c | 94 +-
sys/arch/arm/mpcore/mpcore_space.c | 92 +-
sys/arch/arm/nvidia/files.tegra | 4 +-
sys/arch/arm/nvidia/tegra_platform.c | 8 +-
sys/arch/arm/omap/omap_a2x_space.c | 142 +-
sys/arch/arm/omap/omap_a4x_space.c | 142 +-
sys/arch/arm/omap/omap_nobyteacc_space.c | 142 +-
sys/arch/arm/omap/omap_space.c | 142 +-
sys/arch/arm/s3c2xx0/s3c2xx0_space.c | 94 +-
sys/arch/arm/sa11x0/sa11x0_io.c | 94 +-
sys/arch/arm/samsung/exynos_platform.c | 8 +-
sys/arch/arm/samsung/files.exynos | 4 +-
sys/arch/arm/sunxi/files.sunxi | 5 +-
sys/arch/arm/sunxi/sun4i_a10_ccu.c | 169 +-
sys/arch/arm/sunxi/sunxi_ccu.c | 5 +-
sys/arch/arm/sunxi/sunxi_ccu.h | 48 +-
sys/arch/arm/sunxi/sunxi_ccu_div.c | 19 +-
sys/arch/arm/sunxi/sunxi_ccu_fractional.c | 166 +
sys/arch/arm/sunxi/sunxi_mmc.c | 11 +-
sys/arch/arm/sunxi/sunxi_platform.c | 8 +-
sys/arch/arm/ti/files.ti | 4 +-
sys/arch/arm/ti/ti_platform.c | 8 +-
sys/arch/arm/vexpress/files.vexpress | 4 +-
sys/arch/arm/vexpress/vexpress_platform.c | 8 +-
sys/arch/arm/xscale/becc_space.c | 94 +-
sys/arch/arm/xscale/i80312_space.c | 94 +-
sys/arch/arm/xscale/i80321_space.c | 94 +-
sys/arch/arm/xscale/ixp425_a4x_space.c | 94 +-
sys/arch/arm/xscale/ixp425_pci_space.c | 94 +-
sys/arch/arm/xscale/ixp425_space.c | 94 +-
sys/arch/arm/xscale/pxa2x0_a4x_space.c | 94 +-
sys/arch/arm/xscale/pxa2x0_space.c | 94 +-
sys/arch/arm/zynq/zynq_space.c | 142 +-
sys/arch/epoc32/epoc32/external_io.c | 94 +-
sys/arch/evbarm/adi_brh/obio_space.c | 94 +-
sys/arch/evbarm/conf/files.amlogic | 4 +-
sys/arch/evbarm/conf/files.armadaxp | 4 +-
sys/arch/evbarm/conf/files.awin | 5 +-
sys/arch/evbarm/conf/files.bcm53xx | 5 +-
sys/arch/evbarm/conf/files.beagle | 5 +-
sys/arch/evbarm/conf/files.evbarm | 6 +-
sys/arch/evbarm/conf/files.fdt | 4 +-
sys/arch/evbarm/conf/files.gemini | 5 +-
sys/arch/evbarm/conf/files.goldengate | 5 +-
sys/arch/evbarm/conf/files.hawk | 5 +-
sys/arch/evbarm/conf/files.imx23_olinuxino | 5 +-
sys/arch/evbarm/conf/files.imx31 | 7 +-
sys/arch/evbarm/conf/files.imx7 | 5 +-
sys/arch/evbarm/conf/files.kobo | 5 +-
sys/arch/evbarm/conf/files.n900 | 5 +-
sys/arch/evbarm/conf/files.netwalker | 5 +-
sys/arch/evbarm/conf/files.nitrogen6 | 5 +-
sys/arch/evbarm/conf/files.osk5912 | 5 +-
sys/arch/evbarm/conf/files.tisdp24xx | 5 +-
sys/arch/evbarm/conf/files.zynq | 5 +-
sys/arch/evbarm/hdl_g/obio_space.c | 94 +-
sys/arch/evbarm/ifpga/ifpga_io.c | 184 +-
sys/arch/evbarm/iq80310/obio_space.c | 94 +-
sys/arch/evbarm/iq80321/obio_space.c | 94 +-
sys/arch/evbarm/lubbock/sm_obio_space.c | 94 +-
sys/arch/evbarm/tsarm/isa/isa_io.c | 184 +-
sys/arch/hpcarm/hpcarm/hpc_machdep.c | 6 +-
sys/arch/i386/conf/ALL | 6 +-
sys/arch/i386/conf/files.i386 | 3 +-
sys/arch/i386/i386/i386_trap.S | 14 +-
sys/arch/i386/i386/i386_trap_ipkdb.S | 158 -
sys/arch/i386/i386/ipkdb_glue.c | 151 -
sys/arch/i386/i386/machdep.c | 14 +-
sys/arch/i386/i386/vector.S | 8 +-
sys/arch/i386/include/ipkdb.h | 53 -
sys/arch/i386/stand/efiboot/boot.c | 8 +-
sys/arch/i386/stand/efiboot/devopen.c | 4 +-
sys/arch/i386/stand/efiboot/efidisk.c | 15 +-
sys/arch/i386/stand/lib/biosdisk.c | 28 +-
sys/arch/ia64/acpi/acpi_machdep.c | 7 +-
sys/arch/ia64/include/acpi_machdep.h | 4 +-
sys/arch/iyonix/iyonix/obio_space.c | 94 +-
sys/arch/macppc/conf/GENERIC | 41 +-
sys/arch/macppc/dev/uni-n.c | 45 +-
sys/arch/macppc/include/cpu.h | 3 +-
sys/arch/macppc/pci/uninorth.c | 19 +-
sys/arch/sgimips/conf/GENERIC32_IP3x | 6 +-
sys/arch/sgimips/dev/crmfb.c | 54 +-
sys/arch/shark/isa/isa_io.c | 280 +-
sys/arch/sparc/sparc/locore.s | 161 +-
sys/arch/vax/boot/boot/Makefile | 4 +-
sys/arch/vax/boot/boot/devopen.c | 37 +-
sys/arch/vax/boot/boot/hp.c | 10 +-
sys/arch/vax/boot/boot/if_de.c | 12 +-
sys/arch/vax/boot/boot/if_qe.c | 67 +-
sys/arch/vax/boot/boot/ra.c | 31 +-
sys/arch/vax/boot/boot/vaxstand.h | 3 +-
sys/arch/vax/boot/common/srt0.S | 6 +-
sys/arch/x86/acpi/acpi_machdep.c | 9 +-
sys/arch/x86/conf/files.x86 | 2 +-
sys/arch/x86/include/acpi_machdep.h | 4 +-
sys/arch/x86/include/cpu_ucode.h | 2 +-
sys/arch/x86/pci/imcsmb/imc.c | 6 +-
sys/arch/x86/x86/cpu.c | 15 +-
sys/arch/x86/x86/cpu_ucode.c | 6 +-
sys/arch/x86/x86/cpu_ucode_amd.c | 4 +-
sys/arch/x86/x86/cpu_ucode_intel.c | 4 +-
sys/arch/x86/x86/db_memrw.c | 33 +-
sys/arch/x86/x86/vm_machdep.c | 59 +-
sys/arch/xen/conf/files.xen | 3 +-
sys/compat/common/Makefile.sysio | 2 +-
sys/compat/common/compat_mod.c | 4 +-
sys/compat/common/uipc_syscalls_43.c | 7 +-
sys/compat/linux/common/linux_socket.c | 15 +-
sys/compat/netbsd32/netbsd32_compat_43.c | 6 +-
sys/compat/sys/cpuio.h | 8 +-
sys/ddb/db_command.c | 34 +-
sys/dev/acpi/acpi_intr.h | 4 +-
sys/dev/acpi/acpi_util.c | 8 +-
sys/dev/acpi/acpica.h | 6 +-
sys/dev/acpi/acpica/OsdInterrupt.c | 14 +-
sys/dev/ccd.c | 7 +-
sys/dev/ccdvar.h | 2 +-
sys/dev/i2c/adadc.c | 12 +-
sys/dev/i2c/fcu.c | 313 +-
sys/dev/i2c/files.i2c | 4 +-
sys/dev/i2c/ihidev.c | 7 +-
sys/dev/ic/ld_nvme.c | 124 +-
sys/dev/ic/nvme.c | 266 +-
sys/dev/ic/nvmevar.h | 10 +-
sys/dev/pci/if_de.c | 6 +-
sys/dev/pci/ixgbe/ixgbe.c | 8 +-
sys/dev/pci/ixgbe/ixgbe_common.c | 4 +-
sys/dev/pci/ixgbe/ixgbe_x550.c | 4 +-
sys/dev/pci/ixgbe/ixv.c | 11 +-
sys/dev/pci/pcidevs | 7 +-
sys/dev/pci/pcidevs.h | 9 +-
sys/dev/pci/pcidevs_data.h | 10143 +++++++++++----------
sys/dev/pcmcia/pcmciadevs | 5 +-
sys/dev/pcmcia/pcmciadevs.h | 8 +-
sys/dev/pcmcia/pcmciadevs_data.h | 11 +-
sys/dev/usb/usbdevs | 5 +-
sys/dev/usb/usbdevs.h | 7 +-
sys/dev/usb/usbdevs_data.h | 988 +-
sys/kern/exec_elf.c | 61 +-
sys/kern/kern_cpu.c | 4 +-
sys/kern/subr_lockdebug.c | 144 +-
sys/kern/uipc_mbuf.c | 39 +-
sys/kern/uipc_socket.c | 11 +-
sys/kern/uipc_socket2.c | 24 +-
sys/kern/uipc_syscalls.c | 25 +-
sys/kern/uipc_usrreq.c | 6 +-
sys/lib/libkern/arch/aarch64/Makefile.inc | 4 +-
sys/modules/compat/Makefile | 13 +-
sys/net/if_tun.c | 20 +-
sys/net/if_vlan.c | 19 +-
sys/net/npf/npf_inet.c | 20 +-
sys/net/npf/npf_sendpkt.c | 16 +-
sys/net/raw_usrreq.c | 31 +-
sys/net/rtsock.c | 5 +-
sys/netatalk/ddp_input.c | 5 +-
sys/netcan/can.c | 5 +-
sys/netinet/ip_carp.c | 16 +-
sys/netinet/ip_mroute.c | 5 +-
sys/netinet/raw_ip.c | 6 +-
sys/netinet/udp_usrreq.c | 6 +-
sys/netinet6/icmp6.c | 7 +-
sys/netinet6/ip6_input.c | 6 +-
sys/netinet6/ip6_mroute.c | 5 +-
sys/netinet6/nd6_nbr.c | 12 +-
sys/netinet6/raw_ip6.c | 7 +-
sys/netinet6/udp6_usrreq.c | 6 +-
sys/netipsec/keysock.c | 11 +-
sys/nfs/nfs_syscalls.c | 6 +-
sys/nfs/nfs_vfsops.c | 7 +-
sys/sys/lockdebug.h | 5 +-
sys/sys/mbuf.h | 46 +-
sys/sys/param.h | 4 +-
sys/sys/socketvar.h | 31 +-
tests/lib/libc/sys/t_recvmmsg.c | 40 +-
usr.sbin/sysinst/arch/sgimips/md.c | 14 +-
259 files changed, 10973 insertions(+), 10269 deletions(-)
diffs (truncated from 33809 to 300 lines):
diff -r 160fe5404287 -r 85567721b7d4 bin/pax/buf_subs.c
--- a/bin/pax/buf_subs.c Wed Mar 21 10:12:48 2018 +0000
+++ b/bin/pax/buf_subs.c Thu Mar 22 01:44:39 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: buf_subs.c,v 1.28 2007/04/29 20:23:34 msaitoh Exp $ */
+/* $NetBSD: buf_subs.c,v 1.28.76.1 2018/03/22 01:44:39 pgoyette Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)buf_subs.c 8.2 (Berkeley) 4/18/94";
#else
-__RCSID("$NetBSD: buf_subs.c,v 1.28 2007/04/29 20:23:34 msaitoh Exp $");
+__RCSID("$NetBSD: buf_subs.c,v 1.28.76.1 2018/03/22 01:44:39 pgoyette Exp $");
#endif
#endif /* not lint */
@@ -493,7 +493,7 @@
int cnt;
/*
- * while there is data to copy copy into the write buffer. when the
+ * while there is data to copy into the write buffer. when the
* write buffer fills, flush it to the archive and continue
*/
while (outcnt > 0) {
diff -r 160fe5404287 -r 85567721b7d4 bin/sh/sh.1
--- a/bin/sh/sh.1 Wed Mar 21 10:12:48 2018 +0000
+++ b/bin/sh/sh.1 Thu Mar 22 01:44:39 2018 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: sh.1,v 1.175.2.1 2018/03/15 09:11:52 pgoyette Exp $
+.\" $NetBSD: sh.1,v 1.175.2.2 2018/03/22 01:44:39 pgoyette Exp $
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -176,18 +176,12 @@
.Dq Ic esac
below (these commands are described later):
.Pp
-.Bl -item -compact -offset indent
-.It
-.Li case $- in *i*)
-.Bl -item -compact -offset indent
-.It
-.Li # commands for interactive use only
-.It
-.Li ...
-.El
-.It
-.Li esac
-.El
+.Bd -literal -offset indent
+case $- in *i*)
+ # commands for interactive use only
+ ...
+esac
+.Ed
.Pp
If command line arguments besides the options have been specified, and
neither
@@ -286,11 +280,11 @@
.Ar command_string
operand instead of, or in addition to, from the standard input.
Special parameter
-.Dv 0 \" $0
+.Dv 0 \" $0 (comments like this for searching sources only)
will be set from the
.Ar command_name
operand if given, and the positional parameters
-.Li ( $1 , $2 ,
+.Dv ( 1 , 2 ,
etc.)
set from the remaining argument operands, if any.
.Fl c
@@ -362,12 +356,12 @@
.It Fl L Em local_lineno
When set, before a function is defined,
causes the variable
-.Ev LINENO
+.Dv LINENO
when used within the function,
to refer to the line number defined such that
first line of the function is line 1.
When reset,
-.Ev LINENO
+.Dv LINENO
in a function refers to the line number within the file
within which the definition of the function occurs.
This option defaults to
@@ -472,7 +466,7 @@
but not the converse.
.It Fl x Em xtrace
Write each command to standard error (preceded by the expanded value of
-.Dq $PS4 )
+.Li $PS4 )
before it is executed.
Unless
.Fl X
@@ -1004,10 +998,10 @@
They each are executed in a different way.
.Pp
When a shell function is executed, all of the shell positional parameters
-(except
-.Li $0 ,
-which remains unchanged) are set to the arguments of the shell
-function.
+(note: excluding
+.Li 0 , \" $0
+which is a special, not positional, parameter, and remains unchanged)
+are set to the arguments of the shell function.
The variables which are explicitly placed in the environment of
the command (by placing assignments to them before the function name) are
made local to the function and are set to the values given,
@@ -1016,7 +1010,8 @@
The positional parameters, and local variables, are restored to
their original values when the command completes.
This all occurs within the current shell, and the function
-can alter variables, or other settings, of the shell.
+can alter variables, or other settings, of the shell, but
+not the positional parameters nor their related special parameters.
.Pp
Shell built-ins are executed internally to the shell, without spawning a
new process.
@@ -1617,13 +1612,13 @@
if
.Ev IFS
is unset.
-.It Dv @
+.It Dv @ \" $@
Expands to the positional parameters, starting from one.
When the expansion occurs within double quotes, each positional
parameter expands as a separate argument.
If there are no positional parameters, the
expansion of @ generates zero arguments, even when
-.Dv @
+.Dv $@
is double-quoted.
What this basically means, for example, is
if
@@ -1666,7 +1661,7 @@
Once set, the value of
.Dq Dv \&!
will be retained until another background command is started.
-.It Dv 0 No (zero)
+.It Dv 0 No (zero) \" $0
Expands to the name of the shell or shell script.
.El
.\"
@@ -1838,7 +1833,7 @@
If parameter is
.Dv *
or
-.Dv @ ,
+.Dv @ , \" $@
the result of the expansion is unspecified.
Enclosing the full parameter expansion string in double quotes does not
cause the following four varieties of pattern characters to be quoted,
@@ -2875,16 +2870,16 @@
command has run, the values and attributes of the variables might
be altered, and later, when the function completes, be restored.
.Pp
-Note that the parameters
-.Li $1 ,
-.Li $2 ,
+Note that the positional parameters
+.Dv 1 , \" $1
+.Dv 2 , \" $2
\&... (see
.Sx Positional Parameters ) ,
+and the special parameters
+.Dv \&# , \" $#
+.Dv \&* \" $*
and
-.Li $# ,
-.Li $*
-and
-.Li $@
+.Dv \&@ \" $@
(see
.Sx Special Parameters ) ,
are always made local in all functions, and are reset inside the
@@ -2894,7 +2889,7 @@
however retains the value it had outside the function,
as do all the other special parameters.
.Pp
-The only other special parameter that can be made local is
+The only special parameter that can optionally be made local is
.Dq Li \- .
Making
.Dq Li \-
@@ -2935,7 +2930,7 @@
See the section
.Sx LINENO
below for details of the effects of making the variable
-.Ev LINENO
+.Dv LINENO
local.
.It Ic pwd Op Fl \&LP
Print the current directory.
@@ -3171,7 +3166,7 @@
If
.Ar signal
is
-.Li 0
+.Li 0 \" $0
or its equivalent,
.Li EXIT ,
the action is executed when the shell exits.
@@ -3281,62 +3276,65 @@
For aliases the alias expansion is
printed; for commands and tracked aliases the complete pathname of the
command is printed.
-.It Ic ulimit Oo Fl H \*(Ba Fl S Oc Op Fl a \*(Ba Fl btfdscmlrpnv Op Ar value
+.It Ic ulimit Oo Fl H Ns \*(Ba Ns Fl S Oc Op Fl a \*(Ba Fl btfdscmlrpnv Op Ar value
Inquire about or set the hard or soft limits on processes or set new
limits.
The choice between hard limit (which no process is allowed to
violate, and which may not be raised once it has been lowered) and soft
limit (which causes processes to be signaled but not necessarily killed,
and which may be raised) is made with these flags:
+.Pp
.Bl -tag -width Fl
.It Fl H
set or inquire about hard limits
.It Fl S
set or inquire about soft limits.
+.El
+.Pp
If neither
.Fl H
nor
.Fl S
is specified, the soft limit is displayed or both limits are set.
If both are specified, the last one wins.
-.El
.Pp
The limit to be interrogated or set, then, is chosen by specifying
any one of these flags:
+.Pp
.Bl -tag -width Fl
.It Fl a
show all the current limits
.It Fl b
-show or set the limit on the socket buffer size of a process (in bytes)
+the socket buffer size of a process (bytes)
.It Fl c
-show or set the limit on the largest core dump size that can be produced
-(in 512-byte blocks)
+the largest core dump size that can be produced
+(512-byte blocks)
.It Fl d
-show or set the limit on the data segment size of a process (in kilobytes)
+the data segment size of a process (kilobytes)
.It Fl f
-show or set the limit on the largest file that can be created
-(in 512-byte blocks)
+the largest file that can be created
+(512-byte blocks)
.It Fl l
-show or set the limit on how much memory a process can lock with
+how much memory a process can lock with
.Xr mlock 2
-(in kilobytes)
+(kilobytes)
.It Fl m
-show or set the limit on the total physical memory that can be
-in use by a process (in kilobytes)
+the total physical memory that can be
+in use by a process (kilobytes)
.It Fl n
-show or set the limit on the number of files a process can have open at once
+the number of files a process can have open at once
.It Fl p
-show or set the limit on the number of processes this user can
+the number of processes this user can
have at one time
.It Fl r
-show or set the limit on the number of threads this user can
+the number of threads this user can
have at one time
.It Fl s
-show or set the limit on the stack size of a process (in kilobytes)
+the stack size of a process (kilobytes)
.It Fl t
-show or set the limit on CPU time (in seconds)
+CPU time (seconds)
.It Fl v
-show or set the limit on how large a process address space can be
+how large a process address space can be
.El
.Pp
If none of these is specified, it is the limit on file size that is shown
@@ -3485,7 +3483,10 @@
wait 100
.Ed
.El
+.\"
+.\"
.Ss Job Control
Home |
Main Index |
Thread Index |
Old Index