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
details: https://anonhg.NetBSD.org/src/rev/b3c4b0e119e1
branches: pgoyette-compat
changeset: 321029:b3c4b0e119e1
user: pgoyette <pgoyette%NetBSD.org@localhost>
date: Thu Mar 15 09:11:52 2018 +0000
description:
Synch with HEAD
diffstat:
Makefile | 3 +-
UPDATING | 7 +-
bin/sh/sh.1 | 1058 +-
crypto/external/bsd/heimdal/Makefile.rules.inc | 3 +-
crypto/external/bsd/openssl/dist/crypto/bn/asm/mips.pl | 6 +-
crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c | 6 +-
crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c | 4 +-
crypto/external/bsd/openssl/dist/e_os.h | 3 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/Makefile | 14 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/aes.inc | 2 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/aesv8-armx.S | 719 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/arm64cpuid.S | 101 +
crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/armv8-mont.S | 1404 +++
crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/bf.inc | 2 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/bn.inc | 2 +
crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/chacha-armv8.S | 1968 +++++
crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/chacha.inc | 5 +
crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/crypto.inc | 6 +
crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/des.inc | 2 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/ec.inc | 4 +
crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/ecp_nistz256-armv8.S | 3824 ++++++++++
crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/ghashv8-armx.S | 276 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/modes.inc | 2 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/poly1305-armv8.S | 864 ++
crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/poly1305.inc | 6 +
crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/rc4.inc | 1 -
crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/sha.inc | 7 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/sha1-armv8.S | 672 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/sha512-armv8.S | 1151 +++
crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/vpaes-armv8.S | 1178 +++
crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc | 11 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/arm/arm.inc | 20 +
crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc | 13 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/arm/modes.inc | 4 +
crypto/external/bsd/openssl/lib/libcrypto/arch/hppa/crypto.inc | 3 +
crypto/external/bsd/openssl/lib/libcrypto/arch/ia64/crypto.inc | 3 +
crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/aes-m68k.S | 91 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/mips/aes.inc | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/mips/bn.inc | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/mips/mips64.S | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/mips/poly1305.inc | 2 +
crypto/external/bsd/openssl/lib/libcrypto/arch/mips/sha.inc | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/vax/bn_asm_vax.S | 9 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/vax/crypto.inc | 5 +
crypto/external/bsd/openssl/lib/libcrypto/man.inc | 3 +-
distrib/i386/ramdisks/common/Makefile.ramdisk | 5 +-
distrib/notes/common/main | 3 +-
distrib/sets/lists/debug/ad.mips | 3 +-
distrib/sets/lists/debug/mi | 4 +-
distrib/sets/lists/tests/mi | 5 +-
distrib/sets/lists/xbase/shl.mi | 8 +-
distrib/sets/lists/xcomp/mi | 61 +-
distrib/sets/lists/xcomp/shl.mi | 5 +-
distrib/sets/lists/xdebug/md.amd64 | 6 +-
distrib/sets/lists/xdebug/md.i386 | 6 +-
distrib/sets/lists/xdebug/mi | 5 +-
distrib/sets/lists/xdebug/shl.mi | 5 +-
distrib/sets/lists/xserver/md.amd64 | 6 +-
distrib/sets/lists/xserver/md.i386 | 6 +-
doc/BRANCHES | 24 +-
doc/CHANGES | 8 +-
etc/namedb/bind.keys | 39 +-
external/bsd/cron/dist/crontab.c | 14 +-
external/bsd/flex/dist/src/libmain.c | 6 +-
external/bsd/flex/dist/src/libyywrap.c | 6 +-
external/bsd/unbound/sbin/Makefile.inc | 3 +-
external/gpl2/groff/bin/eqn/Makefile | 4 +-
external/gpl2/groff/bin/pic/Makefile | 4 +-
external/gpl2/groff/bin/refer/Makefile | 4 +-
external/gpl3/gcc.old/Makefile.hooks | 5 +-
external/gpl3/gcc/Makefile.hooks | 5 +-
external/mit/xorg/bin/bdftopcf/Makefile | 21 +-
external/mit/xorg/bin/ico/Makefile | 4 +-
external/mit/xorg/bin/xeyes/Makefile | 3 +-
external/mit/xorg/bin/xfs/Makefile | 6 +-
external/mit/xorg/bin/xrefresh/Makefile | 4 +-
external/mit/xorg/bin/xset/Makefile | 4 +-
external/mit/xorg/bin/xterm/Makefile | 11 +-
external/mit/xorg/bin/xwd/Makefile | 4 +-
external/mit/xorg/bin/xwud/Makefile | 4 +-
external/mit/xorg/include/Makefile | 11 +-
external/mit/xorg/include/bigreqsproto/Makefile | 17 -
external/mit/xorg/include/compositeproto/Makefile | 15 -
external/mit/xorg/include/damageproto/Makefile | 15 -
external/mit/xorg/include/dri2proto/Makefile | 15 -
external/mit/xorg/include/dri3proto/Makefile | 15 -
external/mit/xorg/include/evieext/Makefile | 18 -
external/mit/xorg/include/fixesproto/Makefile | 19 -
external/mit/xorg/include/fontcacheproto/Makefile | 15 -
external/mit/xorg/include/fontsproto/Makefile | 15 -
external/mit/xorg/include/glproto/Makefile | 18 -
external/mit/xorg/include/glproto/internal/Makefile | 13 -
external/mit/xorg/include/inputproto/Makefile | 21 -
external/mit/xorg/include/kbproto/Makefile | 15 -
external/mit/xorg/include/presentproto/Makefile | 15 -
external/mit/xorg/include/randrproto/Makefile | 15 -
external/mit/xorg/include/recordproto/Makefile | 18 -
external/mit/xorg/include/renderproto/Makefile | 15 -
external/mit/xorg/include/resourceproto/Makefile | 15 -
external/mit/xorg/include/scrnsaverproto/Makefile | 15 -
external/mit/xorg/include/trapproto/Makefile | 16 -
external/mit/xorg/include/videoproto/Makefile | 15 -
external/mit/xorg/include/xcmiscproto/Makefile | 17 -
external/mit/xorg/include/xextproto/Makefile | 47 -
external/mit/xorg/include/xf86bigfontproto/Makefile | 18 -
external/mit/xorg/include/xf86dgaproto/Makefile | 22 -
external/mit/xorg/include/xf86driproto/Makefile | 18 -
external/mit/xorg/include/xf86miscproto/Makefile | 15 -
external/mit/xorg/include/xf86vidmodeproto/Makefile | 18 -
external/mit/xorg/include/xineramaproto/Makefile | 15 -
external/mit/xorg/include/xorgproto/GL/Makefile | 19 +
external/mit/xorg/include/xorgproto/GL/internal/Makefile | 13 +
external/mit/xorg/include/xorgproto/Makefile | 42 +
external/mit/xorg/include/xorgproto/X11/Makefile | 47 +
external/mit/xorg/include/xorgproto/X11/PM/Makefile | 14 +
external/mit/xorg/include/xorgproto/X11/dri/Makefile | 16 +
external/mit/xorg/include/xorgproto/X11/extensions/Makefile | 110 +
external/mit/xorg/include/xorgproto/X11/fonts/Makefile | 18 +
external/mit/xorg/include/xproto/Makefile | 29 -
external/mit/xorg/include/xproxymanagementprotocol/Makefile | 16 -
external/mit/xorg/lib/Makefile | 4 +-
external/mit/xorg/lib/libXfont2/Makefile | 128 +
external/mit/xorg/lib/libXfontcache/Makefile | 27 -
external/mit/xorg/lib/libXfontcache/shlib_version | 4 -
external/mit/xorg/lib/libdrm/Makefile.defines | 12 +-
external/mit/xorg/lib/libdrm_amdgpu/Makefile | 7 +-
external/mit/xorg/lib/libxcb/files/config.h | 8 +-
external/mit/xorg/lib/libxcb/files/dri3.c | 480 +-
external/mit/xorg/lib/libxcb/files/dri3.h | 325 +-
external/mit/xorg/lib/libxcb/files/present.h | 8 +-
external/mit/xorg/lib/libxcb/files/randr.c | 274 +-
external/mit/xorg/lib/libxcb/files/randr.h | 349 +-
external/mit/xorg/lib/libxcb/files/res.c | 6 +-
external/mit/xorg/lib/libxcb/files/shm.c | 6 +-
external/mit/xorg/lib/libxcb/files/xinput.c | 410 +-
external/mit/xorg/lib/libxcb/files/xinput.h | 249 +-
external/mit/xorg/lib/libxcb/files/xkb.c | 4 +-
external/mit/xorg/lib/libxcb/files/xproto.c | 26 +-
external/mit/xorg/lib/xkeyboard-config/rules/base | 1 +
external/mit/xorg/lib/xkeyboard-config/rules/base.lst | 62 +-
external/mit/xorg/lib/xkeyboard-config/rules/evdev | 1 +
external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst | 62 +-
external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man | 84 +-
external/mit/xorg/tools/bdftopcf/Makefile | 32 +-
external/mit/xorg/tools/makekeys/Makefile | 15 +-
games/wtf/wtf | 6 +-
lib/csu/common/crt0-common.c | 81 +-
lib/libm/noieee_src/n_exp2.c | 5 +-
lib/libm/src/e_atan2.c | 4 +-
lib/libukfs/ukfs.3 | 6 +-
libexec/ld.elf_so/arch/powerpc/ppc_reloc.c | 30 +-
libexec/ld.elf_so/rtld.c | 6 +-
libexec/ld.elf_so/rtld.h | 4 +-
share/dict/propernames | 1 +
share/man/man3/bitmap.3 | 6 +-
share/man/man4/altq.4 | 6 +-
share/man/man4/lm.4 | 23 +-
share/mk/bsd.README | 4 +-
share/mk/bsd.own.mk | 13 +-
share/mk/bsd.prog.mk | 3 +-
sys/arch/aarch64/include/armreg.h | 112 +-
sys/arch/amiga/conf/files.amiga | 4 +-
sys/arch/arm/omap/omap_gpio.c | 7 +-
sys/arch/arm/sunxi/files.sunxi | 11 +-
sys/arch/arm/sunxi/sunxi_can.c | 644 +
sys/arch/arm/sunxi/sunxi_can.h | 146 +
sys/arch/arm/sunxi/sunxi_lradc.c | 388 +
sys/arch/arm/sunxi/sunxi_lradc.h | 68 +
sys/arch/arm/xscale/files.pxa2x0 | 6 +-
sys/arch/atari/atari/bus.c | 209 +-
sys/arch/atari/atari/pmap_bootstrap.c | 12 +-
sys/arch/emips/stand/common/ace.c | 15 +-
sys/arch/emips/stand/common/devopen.c | 91 +-
sys/arch/evbarm/conf/DUOVERO | 3 +-
sys/arch/evbarm/conf/HPT5325 | 3 +-
sys/arch/evbarm/conf/N900 | 10 +-
sys/arch/evbarm/conf/SUNXI | 10 +-
sys/arch/evbarm/fdt/platform.h | 4 +-
sys/arch/evbarm/gumstix/gxio.c | 8 +-
sys/arch/evbarm/imx31/imx31lk_machdep.c | 6 +-
sys/arch/evbarm/ixdp425/ixdp425_machdep.c | 6 +-
sys/arch/evbarm/osk5912/osk5912_machdep.c | 6 +-
sys/arch/evbmips/loongson/dev/pcib.c | 6 +-
sys/arch/hp300/stand/common/devopen.c | 15 +-
sys/arch/i386/stand/efiboot/Makefile.efiboot | 9 +-
sys/arch/i386/stand/efiboot/TODO.efiboot | 1 -
sys/arch/i386/stand/efiboot/boot.c | 9 +-
sys/arch/i386/stand/efiboot/devopen.c | 13 +-
sys/arch/i386/stand/efiboot/efiboot.c | 14 +-
sys/arch/i386/stand/efiboot/efiboot.h | 8 +-
sys/arch/i386/stand/efiboot/efidev.c | 59 +
sys/arch/i386/stand/efiboot/efidisk.c | 145 +-
sys/arch/i386/stand/efiboot/efidisk.h | 4 +-
sys/arch/i386/stand/efiboot/efidisk_ll.c | 16 +-
sys/arch/i386/stand/lib/biosdisk.c | 105 +-
sys/arch/i386/stand/lib/biosdisk.h | 16 +-
sys/arch/i386/stand/lib/biosdisk_ll.h | 4 +-
sys/arch/luna68k/dev/lcd.c | 9 +-
sys/arch/macppc/conf/POWERMAC_G5 | 2 +
sys/arch/macppc/dev/ki2c.c | 33 +-
sys/arch/macppc/dev/smu.c | 1 +
sys/arch/mips/include/cpu.h | 10 +-
sys/arch/mips/mips/locore.S | 91 +-
sys/arch/mvme68k/conf/Makefile.mvme68k | 6 +-
sys/arch/mvme68k/dev/sbic.c | 8 +-
sys/arch/mvme68k/stand/sboot/le_poll.c | 6 +-
sys/arch/next68k/next68k/nextrom.c | 7 +-
sys/arch/next68k/stand/boot/en.c | 5 +-
sys/arch/sun2/conf/Makefile.sun2 | 10 +-
sys/arch/sun3/conf/GENERIC | 6 +-
sys/arch/sun3/conf/GENERIC3X | 37 +-
sys/arch/sun3/conf/Makefile.sun3 | 8 +-
sys/arch/x86/include/cacheinfo.h | 11 +-
sys/arch/x86/include/specialreg.h | 52 +-
sys/arch/x86/x86/cpu.c | 208 +-
sys/arch/x86/x86/db_memrw.c | 7 +-
sys/arch/x86/x86/identcpu.c | 6 +-
sys/arch/x86/x86/patch.c | 8 +-
sys/arch/x86/x86/svs.c | 5 +-
sys/arch/x86/x86/x86_machdep.c | 28 +-
sys/arch/zaurus/conf/files.zaurus | 2 +-
sys/compat/common/Makefile.sysio | 8 +-
sys/compat/common/compat_mod.c | 24 +-
sys/compat/common/uvm_13.c | 84 +
sys/compat/common/uvm_50.c | 85 +
sys/compat/common/uvm_stats_13.c | 80 -
sys/compat/common/uvm_stats_13.h | 51 -
sys/compat/common/uvm_stats_50.c | 83 -
sys/compat/common/uvm_stats_50.h | 52 -
sys/compat/netbsd32/netbsd32_ioctl.c | 31 +-
sys/compat/netbsd32/netbsd32_ioctl.h | 14 +-
sys/compat/netbsd32/netbsd32_netbsd.c | 75 +-
sys/compat/sys/uvm.h | 74 +
sys/dev/fdt/fdt_regulator.c | 6 +-
sys/dev/fdt/fdt_subr.c | 6 +-
sys/dev/i2c/adadc.c | 259 +
sys/dev/i2c/fcu.c | 200 +
sys/dev/i2c/files.i2c | 12 +-
sys/dev/ic/igsfb.c | 6 +-
sys/dev/ic/nslm7x.c | 5 +-
sys/dev/isa/wbsio.c | 3 +-
sys/dev/isa/wbsioreg.h | 3 +-
sys/dev/pci/ixgbe/if_bypass.c | 86 +-
sys/dev/pci/ixgbe/if_sriov.c | 36 +-
sys/dev/pci/ixgbe/ix_txrx.c | 48 +-
sys/dev/pci/ixgbe/ixgbe.c | 179 +-
sys/dev/pci/ixgbe/ixgbe.h | 36 +-
sys/dev/pci/ixgbe/ixgbe_common.c | 131 +-
sys/dev/pci/ixgbe/ixgbe_common.h | 7 +-
sys/dev/pci/ixgbe/ixgbe_osdep.c | 42 +-
sys/dev/pci/ixgbe/ixgbe_osdep.h | 42 +-
sys/dev/pci/ixgbe/ixgbe_phy.c | 17 +-
sys/dev/pci/ixgbe/ixgbe_sriov.h | 3 +-
sys/dev/pci/ixgbe/ixgbe_type.h | 45 +-
sys/dev/pci/ixgbe/ixgbe_vf.h | 42 +-
sys/dev/pci/ixgbe/ixgbe_x540.c | 3 +
sys/dev/pci/ixgbe/ixgbe_x550.c | 17 +-
sys/dev/pci/ixgbe/ixv.c | 92 +-
sys/dev/sdmmc/if_bwfm_sdio.c | 38 +-
sys/dev/sdmmc/sdmmc.c | 5 +-
sys/dev/wscons/mra.c | 6 +-
sys/dev/wsfb/genfb.c | 9 +-
sys/kern/kern_proc.c | 50 +-
sys/kern/subr_disk.c | 6 +-
sys/kern/uipc_mbuf.c | 14 +-
sys/lib/libsa/cd9660.c | 4 +-
sys/net/if_ipsec.c | 85 +-
sys/net/if_llatbl.c | 62 +-
sys/net/if_llatbl.h | 5 +-
sys/net/npf/npf.h | 4 +-
sys/net/npf/npf_alg_icmp.c | 10 +-
sys/net/npf/npf_handler.c | 26 +-
sys/net/npf/npf_inet.c | 72 +-
sys/net/npf/npf_sendpkt.c | 23 +-
sys/netinet/icmp6.h | 14 +-
sys/netinet/if_arp.c | 96 +-
sys/netinet/in.c | 67 +-
sys/netinet/in_proto.c | 8 +-
sys/netinet/ip_reass.c | 8 +-
sys/netinet/tcp_output.c | 6 +-
sys/netinet6/frag6.c | 11 +-
sys/netinet6/in6.c | 72 +-
sys/netinet6/in6_gif.c | 10 +-
sys/netinet6/in6_proto.c | 6 +-
sys/netinet6/ip6_input.c | 100 +-
sys/netinet6/nd6.c | 43 +-
sys/netinet6/nd6.h | 17 +-
sys/netinet6/nd6_nbr.c | 204 +-
sys/netipsec/ipsec_mbuf.c | 8 +-
sys/netipsec/ipsecif.c | 20 +-
sys/netipsec/xform_ipcomp.c | 6 +-
sys/sys/bitops.h | 4 +-
sys/sys/mbuf.h | 4 +-
sys/sys/param.h | 4 +-
sys/uvm/uvm_swap.c | 165 +-
sys/uvm/uvm_swap.h | 14 +-
tests/kernel/Makefile | 3 +-
tests/kernel/t_zombie.c | 276 +
tests/lib/csu/Makefile | 8 +-
tests/lib/csu/h_ifunc_static.c | 72 +
tests/lib/csu/t_ifunc_static.sh | 56 +
tests/lib/libc/sys/msg.h | 10 +-
tests/lib/libc/sys/t_ptrace_wait.c | 63 +-
tests/lib/libc/sys/t_ptrace_wait.h | 15 +-
tests/lib/libc/sys/t_ptrace_x86_wait.h | 30 +-
tests/libexec/ld.elf_so/h_ifunc.c | 6 +-
tests/libexec/ld.elf_so/helper_ifunc_dso/h_helper_ifunc.c | 22 +-
tests/libexec/ld.elf_so/t_ifunc.c | 34 +-
tests/net/if_ipsec/t_ipsec.sh | 6 +-
tests/net/ndp/t_dad.sh | 37 +-
tools/compat/regex.h | 2 +-
usr.bin/cvslatest/cvslatest.c | 54 +-
usr.bin/printf/printf.1 | 32 +-
usr.bin/tail/tail.c | 4 +-
usr.sbin/cpuctl/arch/i386.c | 79 +-
usr.sbin/dumpfs/dumpfs.c | 7 +-
usr.sbin/ifwatchd/ifwatchd.c | 16 +-
usr.sbin/vnconfig/vnconfig.c | 14 +-
usr.sbin/ypbind/ypbind.c | 10 +-
320 files changed, 19969 insertions(+), 4360 deletions(-)
diffs (truncated from 34372 to 300 lines):
diff -r 63eb46e2423e -r b3c4b0e119e1 Makefile
--- a/Makefile Thu Mar 15 07:29:02 2018 +0000
+++ b/Makefile Thu Mar 15 09:11:52 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.321 2017/12/06 19:34:00 uwe Exp $
+# $NetBSD: Makefile,v 1.321.2.1 2018/03/15 09:11:52 pgoyette Exp $
#
# This is the top-level makefile for building NetBSD. For an outline of
@@ -528,3 +528,4 @@
.include <bsd.obj.mk>
.include <bsd.kernobj.mk>
.include <bsd.subdir.mk>
+.include <bsd.clean.mk>
diff -r 63eb46e2423e -r b3c4b0e119e1 UPDATING
--- a/UPDATING Thu Mar 15 07:29:02 2018 +0000
+++ b/UPDATING Thu Mar 15 09:11:52 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: UPDATING,v 1.291 2018/02/13 04:36:00 mrg Exp $
+$NetBSD: UPDATING,v 1.291.2.1 2018/03/15 09:11:52 pgoyette Exp $
This file (UPDATING) is intended to be a brief reference to recent
changes that might cause problems in the build process, and a guide for
@@ -19,6 +19,11 @@
Recent changes:
^^^^^^^^^^^^^^^
+20180311:
+ bdftopcf was updated and may need cleaning in the
+ src/external/mit/xorg/tools/bdftopcf subdirectory if there are
+ link errors.
+
20180212:
between OpenSSL and GCC updates, many things may fail to build.
any failure that looks like GCC or openssl is best handled by
diff -r 63eb46e2423e -r b3c4b0e119e1 bin/sh/sh.1
--- a/bin/sh/sh.1 Thu Mar 15 07:29:02 2018 +0000
+++ b/bin/sh/sh.1 Thu Mar 15 09:11:52 2018 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: sh.1,v 1.175 2018/01/15 11:27:39 kre Exp $
+.\" $NetBSD: sh.1,v 1.175.2.1 2018/03/15 09:11:52 pgoyette Exp $
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -50,7 +50,7 @@
.Op Cm +o Ar option_name
.Ek
.Bk -words
-.Op Ar command_file Oo Ar argument ... Oc
+.Op Ar command_file Op Ar argument ...
.Ek
.Nm
.Fl c
@@ -65,7 +65,7 @@
.Ek
.Bk -words
.Ar command_string
-.Op Ar command_name Oo Ar argument ... Oc
+.Op Ar command_name Op Ar argument ...
.Ek
.Nm
.Fl s
@@ -196,8 +196,12 @@
.Fl s
was given, then the shell treats the first argument
as the name of a file from which to read commands (a shell script).
-This also becomes $0 and the remaining arguments are set as the
-positional parameters of the shell ($1, $2, etc).
+This also becomes
+.Li $0
+and the remaining arguments are set as the
+positional parameters of the shell
+.Li ( $1 , $2 ,
+etc).
Otherwise, if
.Fl c
was given, then the first argument, which must exist,
@@ -205,14 +209,22 @@
.Nm
commands to execute.
Then if any additional arguments follow the command string,
-those arguments become $0, $1, ...
+those arguments become
+.Li $0 , $1 ,
+\&...
Otherwise, if additional arguments were given
(which implies that
.Fl s
was set)
-those arguments become $1, $2, ...
-If $0 has not been set by the preceding processing, it
-will be set to argv[0] as passed to the shell, which will
+those arguments become
+.Li $1 , $2 ,
+\&...
+If
+.Li $0
+has not been set by the preceding processing, it
+will be set to
+.Va argv\^ Ns [ 0 ]
+as passed to the shell, which will
usually be the name of the shell itself.
If
.Fl s
@@ -220,7 +232,10 @@
.Fl c
nor any additional (non-option) arguments were present,
the shell reads commands from its standard input.
+.\"
+.\"
.Ss Argument List Processing
+.\"
Currently, all of the single letter options that can meaningfully
be set using the
.Ic set
@@ -228,8 +243,8 @@
that can be used as an argument to the
.Fl o
option.
-The set
-.Fl o
+The
+.Ic set Fl o
name is provided next to the single letter option in
the description below.
Some options have only a long name, they are described after
@@ -242,9 +257,9 @@
built-in command.
Other options described are for the command line only.
Specifying a dash
-.Dq -
+.Dq Cm \-
turns the option on, while using a plus
-.Dq +
+.Dq Cm +
disables the option.
The following options can be set from the command line and,
unless otherwise stated, with the
@@ -254,11 +269,8 @@
.\" strlen("quietprofile") == strlen("local_lineno"): pick the latter
.\" to give the indent as the _ in local_lineno, and the fi ligature in
.\" quietprofile combine to make "local_lineno' slightly wider when printed
-.\" (in italics) in a variable width font. Probably should test the actual
-.\" widths and use the wider, but I am not sure if mandoc is up to that...
-.\" (and I don't know how to get at the font that will be used easily anyway!)
-.\" The X's just provide a little extra space.
-.Bl -tag -width \-WXXlocal_linenoXX -offset indent
+.\" (in italics) in a variable width font.
+.Bl -tag -width ".Fl L Em local_lineno" -offset indent
.\"
.It Fl a Em allexport
Automatically export any variable to which a value is assigned
@@ -273,15 +285,19 @@
Read commands from the
.Ar command_string
operand instead of, or in addition to, from the standard input.
-Special parameter 0 will be set from the
+Special parameter
+.Dv 0 \" $0
+will be set from the
.Ar command_name
-operand if given, and the positional parameters ($1, $2, etc.)
+operand if given, and the positional parameters
+.Li ( $1 , $2 ,
+etc.)
set from the remaining argument operands, if any.
.Fl c
is only available at invocation, it cannot be
.Ic set ,
and there is no form using
-.Dq \&+ .
+.Dq Cm \&+ .
.It Fl E Em emacs
Enable the built-in emacs style
command line editor (disables
@@ -442,7 +458,7 @@
.Fl X
option is enabled (regardless of its previous state.)
For example:
-.Bd -compact -literal
+.Bd -literal -compact
set -X 2>/tmp/trace-file
.Ed
will arrange for tracing output to be sent to the file named,
@@ -550,7 +566,7 @@
The following is a list of operators:
.Bl -ohang -offset indent
.It "Control operators:"
-.Dl & && \&( \&) \&; ;; ;& | || <newline>
+.Dl & && \&( \&) \&; ;; ;& \&| || <newline>
.It "Redirection operators:"
.Dl < > >| << >> <& >& <<- <>
.El
@@ -577,17 +593,20 @@
.Ss Double Quotes
Enclosing characters within double quotes preserves the literal
meaning of all characters except dollar sign
-.Pq $ ,
+.Pq Li \&$ ,
backquote
-.Pq ` ,
+.Pq Li \&` ,
and backslash
-.Pq \e .
+.Pq Li \e .
The backslash inside double quotes is historically weird, and serves to
quote only the following characters (and these not in all contexts):
.Dl $ ` \*q \e <newline> ,
where a backslash newline is a line continuation as above.
Otherwise it remains literal.
-.Ss Dollar Single Quotes (\&$'...')
+.\"
+.\"
+.Ss Dollar Single Quotes ( Li \&$'...' )
+.\"
.Bd -filled -offset indent
.Bf Em
Note: this form of quoting is still somewhat experimental,
@@ -600,10 +619,10 @@
.Pp
Enclosing characters in a matched pair of single quotes, with the
first immediately preceded by an unquoted dollar sign
-.Pq \&$
+.Pq Li \&$
provides a quoting mechanism similar to single quotes, except
that within the sequence of characters, any backslash
-.Pq \e ,
+.Pq Li \e ,
is an escape character, which causes the following character to
be treated specially.
Only a subset of the characters that can occur in the string
@@ -614,14 +633,14 @@
.Pp
The following characters are treated literally when following
the escape character (backslash):
-.Dl \e \&' \&"
+.Dl \e \&' \(dq
The sequence
-.Dq \e\e
+.Dq Li \e\e
allows the escape character (backslash) to appear in the string literally.
-.Dq \e'
+.Dq Li \e'
allows a single quote character into the string, such an
escaped single quote does not terminate the quoted string.
-.Dq \e"
+.Dq Li \e\(dq
is for compatibility with C strings, the double quote has
no special meaning in a shell C-style string,
and does not need to be escaped, but may be.
@@ -659,7 +678,7 @@
In addition to those there are 5 forms that need additional
data, which is obtained from the subsequent characters.
An escape
-.Pq \e
+.Pq Li \e
followed by one, two or three, octal digits
.Po So 0 Sc Ns \&.. Ns So 7 Sc Ns Pc
is processed to form an 8 bit character value.
@@ -687,7 +706,9 @@
Consequently, users should ensure that the character
following the hex escape sequence is something other than
a hex digit.
-One way to achieve this is to end the $'...' string immediately
+One way to achieve this is to end the
+.Li $'...'
+string immediately
after the final hex digit, and then, immediately start
another, so
.Dl \&$'\ex33'$'4...'
@@ -700,9 +721,9 @@
in some other shells would be the hex value 0x334 (10, or more, bits).
.Pp
There are two escape sequences beginning with
-.Sq \eu
+.Sq Li \eu
or
-.Sq \eU .
+.Sq Li \eU .
The former is followed by from 1 to 4 hex digits, the latter by
from 1 to 8 hex digits.
Leading zeros can be used to pad the sequences to the maximum
@@ -728,30 +749,30 @@
be an alphabetic character (a letter), or one of the following:
.Dl \&@ \&[ \&\e \&] \&^ \&_ \&?
Other than
-.Sq \ec?
+.Sq Li \ec?
the value obtained is the least significant 5 bits of the
ASCII value of the character following the
-.Sq \ec
+.Sq Li \ec
escape sequence.
That is what is commonly known as the
.Dq control
character obtained from the given character.
The escape sequence
-.Sq \ec?
+.Sq Li \ec?
yields the ASCII DEL character (0x7F).
Home |
Main Index |
Thread Index |
Old Index