Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/pgoyette-compat]: src Sync with head
details: https://anonhg.NetBSD.org/src/rev/55087b0a3ead
branches: pgoyette-compat
changeset: 830873:55087b0a3ead
user: pgoyette <pgoyette%NetBSD.org@localhost>
date: Sat Oct 20 06:58:15 2018 +0000
description:
Sync with head
diffstat:
bin/sh/alias.c | 62 +-
bin/sh/eval.c | 8 +-
bin/sh/mkinit.sh | 34 +-
bin/sh/shell.h | 17 +-
bin/sh/show.c | 19 +-
common/lib/libc/string/memmem.c | 38 +-
common/lib/libprop/prop_kern.c | 6 +-
crypto/dist/ipsec-tools/NEWS | 20 +-
crypto/dist/ipsec-tools/README | 3 +-
crypto/dist/ipsec-tools/netbsd-import.sh | 104 -
crypto/dist/ipsec-tools/src/libipsec/Makefile.am | 9 +-
crypto/dist/ipsec-tools/src/libipsec/test-policy-priority.c | 174 -
crypto/dist/ipsec-tools/src/libipsec/test-policy.c | 332 -
crypto/dist/ipsec-tools/src/racoon/isakmp_frag.c | 77 +-
crypto/dist/ipsec-tools/src/racoon/logger.c | 6 +-
crypto/dist/ipsec-tools/src/racoon/racoon.conf.5 | 5 +-
crypto/dist/ipsec-tools/src/setkey/Makefile.am | 3 +-
crypto/dist/ipsec-tools/src/setkey/extern.h | 49 +-
crypto/dist/ipsec-tools/src/setkey/parse.y | 23 +-
crypto/dist/ipsec-tools/src/setkey/scriptdump.pl | 55 -
crypto/dist/ipsec-tools/src/setkey/setkey.c | 191 +-
crypto/dist/ipsec-tools/src/setkey/test-pfkey.c | 590 -
crypto/dist/ipsec-tools/src/setkey/token.l | 29 +-
crypto/external/bsd/openssh/dist/log.c | 6 +-
crypto/external/bsd/openssh/dist/monitor_wrap.c | 6 +-
crypto/external/bsd/openssh/dist/packet.c | 6 +-
crypto/external/bsd/openssh/dist/serverloop.c | 8 +-
crypto/external/bsd/openssl/dist/test/hmactest.c | 12 +-
crypto/external/bsd/openssl/dist/test/testutil/format_output.c | 16 +-
crypto/external/bsd/openssl/dist/test/testutil/main.c | 2 +-
crypto/external/bsd/openssl/dist/test/testutil/output.h | 34 +-
crypto/external/bsd/openssl/dist/test/testutil/tests.c | 1 +
crypto/external/bsd/openssl/include/openssl/opensslconf.h | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/Makefile | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/arm/arm_asm.h | 2 +-
crypto/external/bsd/openssl/lib/libcrypto/crypto.map | 4 +
crypto/external/bsd/openssl/lib/libcrypto/man.inc | 5 +-
crypto/external/bsd/openssl/lib/libssl/Makefile | 4 +-
distrib/alpha/instkernel/ramdisk/list | 4 +-
distrib/amd64/ramdisks/common/list.ramdisk | 4 +-
distrib/amd64/uefi-installimage/Makefile.bootimage | 11 +-
distrib/common/bootimage/Makefile.bootimage | 11 +-
distrib/sets/Makefile | 15 +-
distrib/sets/lists/base/ad.aarch64 | 5 +-
distrib/sets/lists/base/md.amd64 | 6 +-
distrib/sets/lists/base/md.i386 | 6 +-
distrib/sets/lists/base/mi | 5 +-
distrib/sets/lists/comp/ad.m68k | 4 +-
distrib/sets/lists/comp/mi | 5 +-
distrib/sets/lists/debug/ad.aarch64 | 5 +-
distrib/sets/lists/debug/md.amd64 | 3 +-
distrib/sets/lists/debug/md.i386 | 3 +-
distrib/sets/lists/debug/mi | 3 +-
distrib/sets/lists/man/mi | 5 +-
distrib/sparc64/instfs/list | 4 +-
distrib/utils/embedded/conf/evbarm.conf | 16 +-
distrib/utils/embedded/files/resize_disklabel | 8 +-
distrib/utils/x_gzip/Makefile | 10 +-
doc/3RDPARTY | 14 +-
doc/CHANGES | 22 +-
doc/TODO.8 | 10 -
doc/TODO.kaslr | 4 +-
doc/TODO.kqueue | 43 -
etc/Makefile | 11 +-
etc/defaults/rc.conf | 8 +-
etc/etc.aarch64/MAKEDEV.conf | 6 +-
etc/etc.evbarm/MAKEDEV.conf | 6 +-
etc/mtree/NetBSD.dist.base | 4 +-
etc/rc.d/cleartmp | 9 +-
etc/rc.d/resize_root | 3 +-
etc/rc.d/swap1 | 39 +-
etc/security | 4 +-
external/bsd/acpica/bin/iasl/Makefile | 4 +-
external/bsd/bind/dist/lib/isc/unix/socket.c | 5 +-
external/bsd/file/dist/AUTHORS | 2 +-
external/bsd/file/dist/COPYING | 4 +-
external/bsd/file/dist/ChangeLog | 70 +-
external/bsd/file/dist/Makefile.in | 115 +-
external/bsd/file/dist/NEWS | 2 +-
external/bsd/file/dist/README | 87 +-
external/bsd/file/dist/aclocal.m4 | 443 +-
external/bsd/file/dist/compile | 2 +-
external/bsd/file/dist/config.guess | 469 +-
external/bsd/file/dist/config.h.in | 13 +-
external/bsd/file/dist/config.sub | 120 +-
external/bsd/file/dist/configure | 363 +-
external/bsd/file/dist/configure.ac | 11 +-
external/bsd/file/dist/depcomp | 5 +-
external/bsd/file/dist/doc/Makefile.in | 78 +-
external/bsd/file/dist/doc/file.1 | 20 +-
external/bsd/file/dist/doc/libmagic.3 | 23 +-
external/bsd/file/dist/doc/magic.5 | 30 +-
external/bsd/file/dist/install-sh | 712 +-
external/bsd/file/dist/ltmain.sh | 24 +-
external/bsd/file/dist/magic/Header | 2 +-
external/bsd/file/dist/magic/Makefile.am | 9 +-
external/bsd/file/dist/magic/Makefile.in | 87 +-
external/bsd/file/dist/magic/magdir/amigaos | 21 +-
external/bsd/file/dist/magic/magdir/animation | 10 +-
external/bsd/file/dist/magic/magdir/archive | 5 +-
external/bsd/file/dist/magic/magdir/audio | 48 +-
external/bsd/file/dist/magic/magdir/biosig | 154 +
external/bsd/file/dist/magic/magdir/cad | 33 +-
external/bsd/file/dist/magic/magdir/cafebabe | 12 +-
external/bsd/file/dist/magic/magdir/coff | 6 +-
external/bsd/file/dist/magic/magdir/compress | 4 +-
external/bsd/file/dist/magic/magdir/console | 86 +-
external/bsd/file/dist/magic/magdir/database | 14 +-
external/bsd/file/dist/magic/magdir/dataone | 47 +
external/bsd/file/dist/magic/magdir/dbpf | 8 +-
external/bsd/file/dist/magic/magdir/dump | 14 +-
external/bsd/file/dist/magic/magdir/elf | 11 +-
external/bsd/file/dist/magic/magdir/fsav | 8 +-
external/bsd/file/dist/magic/magdir/glibc | 21 +
external/bsd/file/dist/magic/magdir/hardware | 12 +
external/bsd/file/dist/magic/magdir/hitachi-sh | 4 +-
external/bsd/file/dist/magic/magdir/images | 338 +-
external/bsd/file/dist/magic/magdir/intel | 6 +-
external/bsd/file/dist/magic/magdir/java | 8 +-
external/bsd/file/dist/magic/magdir/jpeg | 8 +-
external/bsd/file/dist/magic/magdir/kicad | 69 +
external/bsd/file/dist/magic/magdir/linux | 12 +-
external/bsd/file/dist/magic/magdir/make | 13 +-
external/bsd/file/dist/magic/magdir/measure | 28 +-
external/bsd/file/dist/magic/magdir/msdos | 358 +-
external/bsd/file/dist/magic/magdir/msooxml | 10 +-
external/bsd/file/dist/magic/magdir/msvc | 4 +-
external/bsd/file/dist/magic/magdir/pdf | 6 +-
external/bsd/file/dist/magic/magdir/sgi | 6 +-
external/bsd/file/dist/magic/magdir/sniffer | 35 +-
external/bsd/file/dist/magic/magdir/wsdl | 4 +-
external/bsd/file/dist/missing | 6 +-
external/bsd/file/dist/python/CHANGELOG.md | 16 +
external/bsd/file/dist/python/LICENSE | 25 +
external/bsd/file/dist/python/Makefile.am | 3 +-
external/bsd/file/dist/python/Makefile.in | 82 +-
external/bsd/file/dist/python/README.md | 31 +
external/bsd/file/dist/python/magic.py | 5 +-
external/bsd/file/dist/python/setup.py | 7 +-
external/bsd/file/dist/python/tests.py | 32 +
external/bsd/file/dist/src/Makefile.am | 4 +-
external/bsd/file/dist/src/Makefile.in | 95 +-
external/bsd/file/dist/src/apprentice.c | 158 +-
external/bsd/file/dist/src/apptype.c | 16 +-
external/bsd/file/dist/src/ascmagic.c | 12 +-
external/bsd/file/dist/src/asprintf.c | 10 +-
external/bsd/file/dist/src/cdf.c | 38 +-
external/bsd/file/dist/src/cdf.h | 4 +-
external/bsd/file/dist/src/cdf_time.c | 10 +-
external/bsd/file/dist/src/compress.c | 116 +-
external/bsd/file/dist/src/der.c | 35 +-
external/bsd/file/dist/src/dprintf.c | 10 +-
external/bsd/file/dist/src/elfclass.h | 6 +-
external/bsd/file/dist/src/encoding.c | 8 +-
external/bsd/file/dist/src/file.c | 29 +-
external/bsd/file/dist/src/file.h | 23 +-
external/bsd/file/dist/src/fmtcheck.c | 4 +-
external/bsd/file/dist/src/fsmagic.c | 34 +-
external/bsd/file/dist/src/funcs.c | 129 +-
external/bsd/file/dist/src/getopt_long.c | 16 +-
external/bsd/file/dist/src/is_json.c | 461 +
external/bsd/file/dist/src/is_tar.c | 12 +-
external/bsd/file/dist/src/magic.c | 47 +-
external/bsd/file/dist/src/magic.h.in | 4 +-
external/bsd/file/dist/src/mygetopt.h | 4 +-
external/bsd/file/dist/src/print.c | 23 +-
external/bsd/file/dist/src/readcdf.c | 399 +-
external/bsd/file/dist/src/readelf.c | 406 +-
external/bsd/file/dist/src/readelf.h | 122 +-
external/bsd/file/dist/src/seccomp.c | 33 +-
external/bsd/file/dist/src/softmagic.c | 161 +-
external/bsd/file/dist/src/vasprintf.c | 16 +-
external/bsd/file/dist/tests/CVE-2014-1943.result | 1 +
external/bsd/file/dist/tests/CVE-2014-1943.testfile | Bin
external/bsd/file/dist/tests/JW07022A.mp3.result | 1 +
external/bsd/file/dist/tests/JW07022A.mp3.testfile | Bin
external/bsd/file/dist/tests/Makefile.am | 80 +-
external/bsd/file/dist/tests/Makefile.in | 160 +-
external/bsd/file/dist/tests/fit-map-data.result | 1 +
external/bsd/file/dist/tests/fit-map-data.testfile | Bin
external/bsd/file/dist/tests/issue359xlsx.result | 1 +
external/bsd/file/dist/tests/issue359xlsx.testfile | Bin
external/bsd/file/dist/tests/json1.result | 1 +
external/bsd/file/dist/tests/json1.testfile | 14 +
external/bsd/file/dist/tests/json2.result | 1 +
external/bsd/file/dist/tests/json2.testfile | 22 +
external/bsd/file/dist/tests/json3.result | 1 +
external/bsd/file/dist/tests/json3.testfile | 13 +
external/bsd/file/dist/tests/regex-eol.magic | 6 +
external/bsd/file/dist/tests/regex-eol.result | 1 +
external/bsd/file/dist/tests/regex-eol.testfile | 24 +
external/bsd/file/dist/tests/zstd-3-skippable-frames.result | 1 +
external/bsd/file/dist/tests/zstd-dictionary-0.result | 1 +
external/bsd/file/dist/tests/zstd-dictionary-1.result | 1 +
external/bsd/file/dist/tests/zstd-dictionary-2.result | 1 +
external/bsd/file/dist/tests/zstd-skippable-frame-0.result | 1 +
external/bsd/file/dist/tests/zstd-skippable-frame-4.result | 1 +
external/bsd/file/dist/tests/zstd-skippable-frame-8.result | 1 +
external/bsd/file/dist/tests/zstd-skippable-frame-C.result | 1 +
external/bsd/file/dist/tests/zstd-v0.2-FF.result | 1 +
external/bsd/file/dist/tests/zstd-v0.2-FF.testfile | 1 +
external/bsd/file/dist/tests/zstd-v0.3-FF.result | 1 +
external/bsd/file/dist/tests/zstd-v0.3-FF.testfile | 1 +
external/bsd/file/dist/tests/zstd-v0.4-FF.result | 1 +
external/bsd/file/dist/tests/zstd-v0.4-FF.testfile | 1 +
external/bsd/file/dist/tests/zstd-v0.5-FF.result | 1 +
external/bsd/file/dist/tests/zstd-v0.5-FF.testfile | 1 +
external/bsd/file/dist/tests/zstd-v0.6-FF.result | 1 +
external/bsd/file/dist/tests/zstd-v0.6-FF.testfile | 1 +
external/bsd/file/dist/tests/zstd-v0.7-00.result | 1 +
external/bsd/file/dist/tests/zstd-v0.7-21.result | 1 +
external/bsd/file/dist/tests/zstd-v0.7-21.testfile | 1 +
external/bsd/file/dist/tests/zstd-v0.7-22.result | 1 +
external/bsd/file/dist/tests/zstd-v0.7-22.testfile | 1 +
external/bsd/file/dist/tests/zstd-v0.8-00.result | 1 +
external/bsd/file/dist/tests/zstd-v0.8-01.result | 1 +
external/bsd/file/dist/tests/zstd-v0.8-01.testfile | 1 +
external/bsd/file/dist/tests/zstd-v0.8-02.result | 1 +
external/bsd/file/dist/tests/zstd-v0.8-02.testfile | 1 +
external/bsd/file/dist/tests/zstd-v0.8-03.result | 1 +
external/bsd/file/dist/tests/zstd-v0.8-03.testfile | 1 +
external/bsd/file/dist/tests/zstd-v0.8-16.result | 1 +
external/bsd/file/dist/tests/zstd-v0.8-16.testfile | 1 +
external/bsd/file/dist/tests/zstd-v0.8-20.result | 1 +
external/bsd/file/dist/tests/zstd-v0.8-20.testfile | 1 +
external/bsd/file/dist/tests/zstd-v0.8-21.result | 1 +
external/bsd/file/dist/tests/zstd-v0.8-21.testfile | 1 +
external/bsd/file/dist/tests/zstd-v0.8-22.result | 1 +
external/bsd/file/dist/tests/zstd-v0.8-22.testfile | 1 +
external/bsd/file/dist/tests/zstd-v0.8-23.result | 1 +
external/bsd/file/dist/tests/zstd-v0.8-23.testfile | 1 +
external/bsd/file/dist/tests/zstd-v0.8-F4.result | 1 +
external/bsd/file/dist/tests/zstd-v0.8-F4.testfile | 1 +
external/bsd/file/dist/tests/zstd-v0.8-FF.result | 1 +
external/bsd/file/dist/tests/zstd-v0.8-FF.testfile | 1 +
external/bsd/file/include/config.h | 19 +-
external/bsd/file/lib/Makefile | 6 +-
external/bsd/nsd/Makefile.inc | 4 +-
external/bsd/nsd/dist/o | 238 -
external/bsd/ntp/dist/ntpd/ntpd.c | 52 +-
external/bsd/openresolv/dist/dnsmasq.in | 2 +-
external/bsd/openresolv/dist/libc.in | 2 +-
external/bsd/openresolv/dist/named.in | 2 +-
external/bsd/openresolv/dist/resolvconf.in | 10 +-
external/bsd/openresolv/dist/unbound.in | 2 +-
external/cddl/dtracetoolkit/dist/iosnoop | 39 +-
external/public-domain/tz/dist/CONTRIBUTING | 13 +-
external/public-domain/tz/dist/Makefile | 326 +-
external/public-domain/tz/dist/NEWS | 321 +-
external/public-domain/tz/dist/README | 16 +-
external/public-domain/tz/dist/TZDATA_VERSION | 2 +-
external/public-domain/tz/dist/africa | 25 +-
external/public-domain/tz/dist/antarctica | 2 +
external/public-domain/tz/dist/asia | 314 +-
external/public-domain/tz/dist/australasia | 13 +-
external/public-domain/tz/dist/backward | 4 +-
external/public-domain/tz/dist/backzone | 4 +-
external/public-domain/tz/dist/etcetera | 4 +-
external/public-domain/tz/dist/europe | 74 +-
external/public-domain/tz/dist/factory | 6 +-
external/public-domain/tz/dist/leap-seconds.list | 8 +-
external/public-domain/tz/dist/leapseconds | 31 +-
external/public-domain/tz/dist/leapseconds.awk | 68 +-
external/public-domain/tz/dist/northamerica | 4 +-
external/public-domain/tz/dist/pacificnew | 2 +
external/public-domain/tz/dist/southamerica | 36 +-
external/public-domain/tz/dist/systemv | 2 +
external/public-domain/tz/dist/theory.html | 203 +-
external/public-domain/tz/dist/version | 2 +-
external/public-domain/tz/dist/yearistype.sh | 1 +
external/public-domain/tz/dist/zishrink.awk | 204 +-
external/public-domain/tz/dist/zone.tab | 14 +-
external/public-domain/tz/dist/zone1970.tab | 32 +-
external/public-domain/tz/dist/zoneinfo2tdf.pl | 1 +
games/fortune/datfiles/fortunes | 3 +
lib/libc/hash/sha2/sha2.3 | 23 +-
lib/libc/time/CONTRIBUTING | 13 +-
lib/libc/time/Makefile | 326 +-
lib/libc/time/NEWS | 321 +-
lib/libc/time/README | 16 +-
lib/libc/time/ctime.3 | 18 +-
lib/libc/time/difftime.c | 6 +-
lib/libc/time/localtime.c | 95 +-
lib/libc/time/private.h | 4 +-
lib/libc/time/strftime.3 | 10 +-
lib/libc/time/strftime.c | 7 +-
lib/libc/time/theory.html | 203 +-
lib/libc/time/tz-art.html | 10 +-
lib/libc/time/tz-how-to.html | 5 +-
lib/libc/time/tz-link.html | 114 +-
lib/libc/time/tzfile.5 | 44 +-
lib/libc/time/tzselect.8 | 14 +-
lib/libc/time/tzselect.ksh | 26 +-
lib/libc/time/tzset.3 | 24 +-
lib/libc/time/version | 2 +-
lib/libc/time/zdump.8 | 37 +-
lib/libc/time/zdump.c | 8 +-
lib/libc/time/zic.8 | 118 +-
lib/libcurses/curses.h | 6 +-
lib/libcurses/curses_private.h | 12 +-
lib/libcurses/curses_screen.3 | 6 +-
lib/libcurses/fileio.c | 6 +-
lib/libcurses/initscr.c | 5 +-
lib/libcurses/newwin.c | 40 +-
lib/libcurses/refresh.c | 208 +-
lib/libcurses/resize.c | 24 +-
lib/libcurses/ripoffline.c | 72 +-
lib/libcurses/screen.c | 17 +-
lib/libcurses/setterm.c | 8 +-
lib/libcurses/slk.c | 10 +-
lib/libcurses/tstp.c | 7 +-
lib/libcurses/tty.c | 19 +-
lib/libterminfo/term.c | 20 +-
lib/libterminfo/terminfo.5.in | 4 +-
lib/libutil/getfsspecname.3 | 24 +-
lib/libutil/getfsspecname.c | 26 +-
libexec/ld.elf_so/Makefile | 4 +-
libexec/ld.elf_so/compat.c | 94 +
libexec/ld.elf_so/reloc.c | 19 +-
libexec/ld.elf_so/rtld.c | 6 +-
libexec/ld.elf_so/rtld.h | 18 +-
sbin/Makefile | 7 +-
sbin/fsck_ffs/setup.c | 52 +-
sbin/gpt/gpt.c | 4 +-
sbin/mount_qemufwcfg/Makefile | 6 +-
share/man/man4/ddb.4 | 6 +-
share/man/man5/fstab.5 | 14 +-
share/man/man5/rc.conf.5 | 138 +-
share/man/man7/sysctl.7 | 29 +-
share/man/man8/compat_netbsd32.8 | 8 +-
share/man/man9/Makefile | 3 +-
share/man/man9/fstrans.9 | 41 +-
share/man/man9/malloc.9 | 22 +-
share/mk/bsd.own.mk | 7 +-
sys/arch/aarch64/aarch64/aarch32_syscall.c | 191 +
sys/arch/aarch64/aarch64/aarch64_machdep.c | 110 +-
sys/arch/aarch64/aarch64/cpu.c | 14 +-
sys/arch/aarch64/aarch64/cpuswitch.S | 8 +-
sys/arch/aarch64/aarch64/db_disasm.c | 19 +-
sys/arch/aarch64/aarch64/db_machdep.c | 34 +-
sys/arch/aarch64/aarch64/disasm.c | 60 +-
sys/arch/aarch64/aarch64/exec_machdep.c | 25 +-
sys/arch/aarch64/aarch64/fault.c | 13 +-
sys/arch/aarch64/aarch64/genassym.cf | 11 +-
sys/arch/aarch64/aarch64/locore.S | 1647 +-
sys/arch/aarch64/aarch64/netbsd32_machdep.c | 478 +-
sys/arch/aarch64/aarch64/netbsd32_syscall.c | 39 +
sys/arch/aarch64/aarch64/pmap.c | 605 +-
sys/arch/aarch64/aarch64/pmapboot.c | 422 +
sys/arch/aarch64/aarch64/start.S | 6 +-
sys/arch/aarch64/aarch64/trap.c | 62 +-
sys/arch/aarch64/aarch64/vectors.S | 20 +-
sys/arch/aarch64/conf/files.aarch64 | 13 +-
sys/arch/aarch64/conf/kern.ldscript | 6 +-
sys/arch/aarch64/include/armreg.h | 3 +-
sys/arch/aarch64/include/cpu.h | 7 +-
sys/arch/aarch64/include/db_machdep.h | 3 +-
sys/arch/aarch64/include/elf_machdep.h | 9 +-
sys/arch/aarch64/include/machdep.h | 3 +-
sys/arch/aarch64/include/netbsd32_machdep.h | 46 +-
sys/arch/aarch64/include/param.h | 7 +-
sys/arch/aarch64/include/pmap.h | 57 +-
sys/arch/aarch64/include/pte.h | 4 +-
sys/arch/aarch64/include/types.h | 3 +-
sys/arch/aarch64/include/vmparam.h | 11 +-
sys/arch/acorn32/stand/lib/riscoscalls.S | 24 +-
sys/arch/amd64/conf/GENERIC | 9 +-
sys/arch/arm/acpi/acpi_machdep.c | 257 +
sys/arch/arm/acpi/acpi_pci_machdep.c | 373 +
sys/arch/arm/acpi/acpi_pci_machdep.h | 42 +
sys/arch/arm/acpi/acpi_platform.c | 244 +
sys/arch/arm/acpi/acpi_table.c | 115 +
sys/arch/arm/acpi/acpi_table.h | 39 +
sys/arch/arm/acpi/acpipchb.c | 152 +
sys/arch/arm/acpi/cpu_acpi.c | 114 +
sys/arch/arm/acpi/files.acpi | 32 +
sys/arch/arm/acpi/gic_acpi.c | 133 +
sys/arch/arm/acpi/gtmr_acpi.c | 101 +
sys/arch/arm/acpi/plcom_acpi.c | 121 +
sys/arch/arm/altera/cycv_platform.c | 45 +-
sys/arch/arm/altera/cycv_reg.h | 4 +-
sys/arch/arm/altera/cycv_rstmgr.c | 8 +-
sys/arch/arm/amd/seattle_platform.c | 5 +-
sys/arch/arm/arm/armv6_start.S | 1076 +
sys/arch/arm/arm/cpufunc.c | 134 +-
sys/arch/arm/arm/cpufunc_asm_armv7.S | 8 +-
sys/arch/arm/arm/psci.c | 10 +-
sys/arch/arm/arm/psci.h | 7 +-
sys/arch/arm/arm32/arm32_boot.c | 82 +-
sys/arch/arm/arm32/arm32_kvminit.c | 111 +-
sys/arch/arm/arm32/arm32_machdep.c | 115 +-
sys/arch/arm/arm32/cpu.c | 22 +-
sys/arch/arm/arm32/genassym.cf | 18 +-
sys/arch/arm/arm32/locore.S | 17 +-
sys/arch/arm/arm32/pmap.c | 60 +-
sys/arch/arm/broadcom/bcm283x_platform.c | 43 +-
sys/arch/arm/broadcom/files.bcm2835 | 10 +-
sys/arch/arm/cavium/files.thunderx | 9 +
sys/arch/arm/cavium/thunderx_platform.c | 131 +
sys/arch/arm/cavium/thunderx_platform.h | 41 +
sys/arch/arm/conf/files.arm | 10 +-
sys/arch/arm/cortex/a9tmr.c | 6 +-
sys/arch/arm/cortex/gicv3.c | 8 +-
sys/arch/arm/cortex/gtmr.c | 17 +-
sys/arch/arm/dts/socfpga_cyclone5_de0_sockit.dts | 3 +
sys/arch/arm/fdt/acpi_fdt.c | 111 +
sys/arch/arm/fdt/arm_fdtvar.h | 5 +-
sys/arch/arm/fdt/cpu_fdt.c | 87 +-
sys/arch/arm/fdt/files.fdt | 5 +-
sys/arch/arm/fdt/psci_fdt.c | 8 +-
sys/arch/arm/imx/imx6_board.c | 12 +-
sys/arch/arm/imx/imx6_srcreg.h | 7 +-
sys/arch/arm/imx/imx6var.h | 5 +-
sys/arch/arm/include/acpi_machdep.h | 68 +
sys/arch/arm/include/arm32/machdep.h | 3 +-
sys/arch/arm/include/arm32/pmap.h | 7 +-
sys/arch/arm/include/cpu.h | 8 +-
sys/arch/arm/include/cputypes.h | 7 +-
sys/arch/arm/include/mcontext.h | 4 +-
sys/arch/arm/include/param.h | 4 +-
sys/arch/arm/include/types.h | 7 +-
sys/arch/arm/nvidia/soc_tegra124.c | 11 +-
sys/arch/arm/nvidia/tegra_platform.c | 33 +-
sys/arch/arm/nvidia/tegra_var.h | 6 +-
sys/arch/arm/pic/pic.c | 22 +-
sys/arch/arm/pic/picvar.h | 5 +-
sys/arch/arm/rockchip/rk_platform.c | 5 +-
sys/arch/arm/samsung/exynos_combiner.c | 8 +-
sys/arch/arm/samsung/exynos_platform.c | 62 +-
sys/arch/arm/samsung/exynos_soc.c | 61 +-
sys/arch/arm/samsung/exynos_var.h | 4 +-
sys/arch/arm/samsung/files.exynos | 14 +-
sys/arch/arm/sunxi/sunxi_emac.c | 159 +-
sys/arch/arm/sunxi/sunxi_platform.c | 28 +-
sys/arch/arm/vexpress/vexpress_platform.c | 18 +-
sys/arch/arm/virt/virt_platform.c | 5 +-
sys/arch/arm/zynq/zynq7000_board.c | 11 +-
sys/arch/arm/zynq/zynq7000_reg.h | 10 +-
sys/arch/arm/zynq/zynq7000_var.h | 3 +-
sys/arch/evbarm/altera/altera_start.S | 126 -
sys/arch/evbarm/altera/genassym.cf | 7 -
sys/arch/evbarm/altera/platform.h | 6 +-
sys/arch/evbarm/amlogic/amlogic_machdep.c | 173 +-
sys/arch/evbarm/amlogic/amlogic_start.S | 216 -
sys/arch/evbarm/amlogic/genassym.cf | 37 -
sys/arch/evbarm/armadaxp/armadaxp_start.S | 12 +-
sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c | 55 +-
sys/arch/evbarm/beagle/beagle_machdep.c | 61 +-
sys/arch/evbarm/conf/EXYNOS | 6 +-
sys/arch/evbarm/conf/GENERIC | 15 +-
sys/arch/evbarm/conf/GENERIC64 | 27 +-
sys/arch/evbarm/conf/HUMMINGBOARD | 9 +-
sys/arch/evbarm/conf/IMX6UL-STARTER | 5 +-
sys/arch/evbarm/conf/NANOSOC | 6 +-
sys/arch/evbarm/conf/ODROID-C1 | 17 +-
sys/arch/evbarm/conf/OPENBLOCKS_AX3 | 4 +-
sys/arch/evbarm/conf/PARALLELLA | 4 +-
sys/arch/evbarm/conf/RPI | 4 +-
sys/arch/evbarm/conf/RPI2 | 6 +-
sys/arch/evbarm/conf/RPI64 | 5 +-
sys/arch/evbarm/conf/VEXPRESS_A15 | 4 +-
sys/arch/evbarm/conf/VIRT | 6 +-
sys/arch/evbarm/conf/files.exynos | 15 +-
sys/arch/evbarm/conf/files.generic | 19 +-
sys/arch/evbarm/conf/files.generic64 | 8 +-
sys/arch/evbarm/conf/files.rpi | 10 +-
sys/arch/evbarm/conf/files.sunxi | 6 +-
sys/arch/evbarm/conf/files.tegra | 6 +-
sys/arch/evbarm/conf/mk.altera | 13 +-
sys/arch/evbarm/conf/mk.amlogic | 13 +-
sys/arch/evbarm/conf/mk.bcm53xx | 10 +-
sys/arch/evbarm/conf/mk.exynos | 9 +-
sys/arch/evbarm/conf/mk.generic | 13 +-
sys/arch/evbarm/conf/mk.imx6ul | 10 +-
sys/arch/evbarm/conf/mk.nitrogen6 | 10 +-
sys/arch/evbarm/conf/mk.rpi | 8 +-
sys/arch/evbarm/conf/mk.sunxi | 8 +-
sys/arch/evbarm/conf/mk.tegra | 8 +-
sys/arch/evbarm/conf/mk.vexpress | 6 +-
sys/arch/evbarm/conf/mk.virt | 6 +-
sys/arch/evbarm/conf/mk.zynq | 10 +-
sys/arch/evbarm/conf/std.adi_brh | 10 +-
sys/arch/evbarm/conf/std.altera | 9 +-
sys/arch/evbarm/conf/std.amlogic | 34 +-
sys/arch/evbarm/conf/std.armadaxp | 32 +-
sys/arch/evbarm/conf/std.armadillo9 | 13 +-
sys/arch/evbarm/conf/std.bcm53xx | 5 +-
sys/arch/evbarm/conf/std.beagle | 28 +-
sys/arch/evbarm/conf/std.cp3100 | 12 +-
sys/arch/evbarm/conf/std.exynos | 41 +-
sys/arch/evbarm/conf/std.g42xxeb | 14 +-
sys/arch/evbarm/conf/std.gemini | 16 +-
sys/arch/evbarm/conf/std.generic | 26 +-
sys/arch/evbarm/conf/std.generic64 | 20 +-
sys/arch/evbarm/conf/std.gumstix | 12 +-
sys/arch/evbarm/conf/std.hawk | 16 +-
sys/arch/evbarm/conf/std.hdl_g | 6 +-
sys/arch/evbarm/conf/std.igepv2 | 13 +-
sys/arch/evbarm/conf/std.imx23_olinuxino | 18 +-
sys/arch/evbarm/conf/std.imx31 | 15 +-
sys/arch/evbarm/conf/std.imx6ul | 39 +-
sys/arch/evbarm/conf/std.imx7 | 21 +-
sys/arch/evbarm/conf/std.integrator | 8 +-
sys/arch/evbarm/conf/std.integrator_cp | 12 +-
sys/arch/evbarm/conf/std.iq31244 | 12 +-
sys/arch/evbarm/conf/std.iq80310 | 8 +-
sys/arch/evbarm/conf/std.iq80321 | 10 +-
sys/arch/evbarm/conf/std.ixdp425 | 8 +-
sys/arch/evbarm/conf/std.ixm1200 | 10 +-
sys/arch/evbarm/conf/std.kobo | 19 +-
sys/arch/evbarm/conf/std.lubbock | 12 +-
sys/arch/evbarm/conf/std.marvell | 8 +-
sys/arch/evbarm/conf/std.mini2440 | 12 +-
sys/arch/evbarm/conf/std.mmnet | 16 +-
sys/arch/evbarm/conf/std.mpcsa | 16 +-
sys/arch/evbarm/conf/std.mv2120 | 8 +-
sys/arch/evbarm/conf/std.n900 | 15 +-
sys/arch/evbarm/conf/std.netwalker | 19 +-
sys/arch/evbarm/conf/std.nitrogen6 | 44 +-
sys/arch/evbarm/conf/std.npwr_fc | 12 +-
sys/arch/evbarm/conf/std.nslu2 | 6 +-
sys/arch/evbarm/conf/std.osk5912 | 12 +-
sys/arch/evbarm/conf/std.overo | 13 +-
sys/arch/evbarm/conf/std.rpi | 24 +-
sys/arch/evbarm/conf/std.smdk2410 | 14 +-
sys/arch/evbarm/conf/std.smdk2800 | 12 +-
sys/arch/evbarm/conf/std.sunxi | 40 +-
sys/arch/evbarm/conf/std.tegra | 42 +-
sys/arch/evbarm/conf/std.ti | 13 +-
sys/arch/evbarm/conf/std.tisdp24xx | 17 +-
sys/arch/evbarm/conf/std.tsarm | 14 +-
sys/arch/evbarm/conf/std.vexpress | 40 +-
sys/arch/evbarm/conf/std.viper | 16 +-
sys/arch/evbarm/conf/std.virt | 40 +-
sys/arch/evbarm/conf/std.zynq | 42 +-
sys/arch/evbarm/dev/plcom.c | 32 +-
sys/arch/evbarm/exynos/exynos_start.S | 283 -
sys/arch/evbarm/exynos/genassym.cf | 34 -
sys/arch/evbarm/fdt/fdt_machdep.c | 82 +-
sys/arch/evbarm/imx31/imx31lk_start.S | 6 +-
sys/arch/evbarm/include/acpi_machdep.h | 3 +
sys/arch/evbarm/include/cpufunc.h | 7 +
sys/arch/evbarm/marvell/marvell_start.S | 12 +-
sys/arch/evbarm/nitrogen6/genassym.cf | 63 -
sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c | 176 +-
sys/arch/evbarm/nitrogen6/nitrogen6_start.S | 359 -
sys/arch/evbarm/rpi/genassym.cf | 43 -
sys/arch/evbarm/rpi/rpi2_start.S | 237 -
sys/arch/evbarm/rpi/rpi_start.S | 411 -
sys/arch/evbarm/sunxi/genassym.cf | 44 -
sys/arch/evbarm/sunxi/sunxi_start.S | 201 -
sys/arch/evbarm/tegra/genassym.cf | 38 -
sys/arch/evbarm/tegra/tegra_start.S | 198 -
sys/arch/evbarm/vexpress/vexpress_start.S | 191 -
sys/arch/evbarm/virt/virt_start.S | 181 -
sys/arch/evbarm/zynq/genassym.cf | 47 -
sys/arch/evbarm/zynq/platform.h | 5 +-
sys/arch/evbarm/zynq/zynq_machdep.c | 178 +-
sys/arch/evbarm/zynq/zynq_start.S | 322 -
sys/arch/i386/i386/cpufunc.S | 6 +-
sys/arch/i386/i386/machdep.c | 6 +-
sys/arch/m68k/m68k/switch_subr.s | 4 +-
sys/arch/mac68k/dev/adb.c | 8 +-
sys/arch/mips/cavium/dev/octeon_fpa.c | 6 +-
sys/arch/newsmips/apbus/apbus.c | 41 +-
sys/arch/newsmips/apbus/apbus_subr.c | 36 +-
sys/arch/newsmips/apbus/apbusvar.h | 8 +-
sys/arch/newsmips/apbus/if_sn.c | 27 +-
sys/arch/newsmips/apbus/if_sn_ap.c | 81 +-
sys/arch/newsmips/apbus/if_snvar.h | 13 +-
sys/arch/newsmips/apbus/if_tlp_ap.c | 6 +-
sys/arch/newsmips/apbus/kb_ap.c | 9 +-
sys/arch/newsmips/apbus/ms_ap.c | 6 +-
sys/arch/newsmips/apbus/spifi.c | 8 +-
sys/arch/newsmips/apbus/zs_ap.c | 291 +-
sys/arch/newsmips/conf/GENERIC | 9 +-
sys/arch/newsmips/conf/files.newsmips | 5 +-
sys/arch/newsmips/conf/std.newsmips | 5 +-
sys/arch/newsmips/include/adrsmap.h | 55 +-
sys/arch/newsmips/include/apbus.h | 4 +-
sys/arch/newsmips/include/cpu.h | 6 +-
sys/arch/newsmips/include/intr.h | 3 +-
sys/arch/newsmips/newsmips/cpu_cons.c | 16 +-
sys/arch/newsmips/newsmips/machdep.c | 43 +-
sys/arch/newsmips/newsmips/machid.h | 6 +-
sys/arch/newsmips/newsmips/news4000.c | 242 +
sys/arch/newsmips/newsmips/news5000.c | 6 +-
sys/arch/newsmips/stand/boot/Makefile | 5 +-
sys/arch/newsmips/stand/boot/boot.c | 12 +-
sys/arch/newsmips/stand/boot/net.c | 5 +-
sys/arch/newsmips/stand/boot/version | 4 +-
sys/arch/sparc64/conf/GENERIC | 5 +-
sys/arch/sparc64/conf/files.sparc64 | 6 +-
sys/arch/sparc64/dev/pckbc_ebus.c | 48 +-
sys/arch/sparc64/dev/schizoreg.h | 16 +-
sys/arch/sparc64/dev/tadpmu.c | 363 +
sys/arch/sparc64/dev/tadpmureg.h | 88 +
sys/arch/sparc64/dev/tadpmuvar.h | 37 +
sys/arch/sparc64/doc/TODO | 9 +-
sys/arch/x86/include/cpu.h | 3 +-
sys/arch/x86/include/fpu.h | 6 +-
sys/arch/x86/x86/fpu.c | 11 +-
sys/arch/x86/x86/i8259.c | 4 +-
sys/arch/x86/x86/idt.c | 14 +-
sys/arch/x86/x86/intr.c | 77 +-
sys/arch/x86/x86/ioapic.c | 35 +-
sys/arch/x86/x86/ipmi.c | 8 +-
sys/arch/xen/include/intr.h | 7 +-
sys/arch/xen/include/xen.h | 6 +-
sys/arch/xen/x86/autoconf.c | 20 +-
sys/arch/xen/x86/pintr.c | 123 +-
sys/arch/xen/x86/xenfunc.c | 13 +-
sys/arch/xen/xen/pciback.c | 14 +-
sys/arch/xen/xen/xenevt.c | 50 +-
sys/arch/xen/xen/xpci_xenbus.c | 9 +-
sys/compat/netbsd32/netbsd32_ioctl.c | 15 +-
sys/compat/netbsd32/netbsd32_ioctl.h | 3 +-
sys/conf/files | 10 +-
sys/dev/acpi/acpi.c | 78 +-
sys/dev/acpi/acpi_mcfg.c | 263 +-
sys/dev/acpi/acpi_mcfg.h | 3 +-
sys/dev/acpi/acpi_pci.c | 31 +-
sys/dev/acpi/acpi_pci.h | 3 +-
sys/dev/acpi/acpi_timer.c | 27 +-
sys/dev/acpi/acpi_util.c | 42 +-
sys/dev/acpi/acpi_util.h | 3 +-
sys/dev/acpi/acpica/acpi_func.h | 10 +-
sys/dev/acpi/acpivar.h | 10 +-
sys/dev/acpi/ahcisata_acpi.c | 116 +
sys/dev/acpi/amdccp_acpi.c | 123 +
sys/dev/acpi/dwiic_acpi.c | 177 +
sys/dev/acpi/files.acpi | 25 +-
sys/dev/acpi/plgpio_acpi.c | 103 +
sys/dev/ata/TODO.ncq | 2 -
sys/dev/dm/device-mapper.c | 38 +-
sys/dev/fdt/amdccp_fdt.c | 92 +
sys/dev/fdt/dwcwdt_fdt.c | 6 +-
sys/dev/fdt/fdt_subr.c | 8 +-
sys/dev/fdt/files.fdt | 20 +-
sys/dev/fdt/pl061gpio_fdt.c | 162 +-
sys/dev/i2c/gttwsi_core.c | 31 +-
sys/dev/i2c/spdmem_i2c.c | 9 +-
sys/dev/i2c/tcakp.c | 20 +-
sys/dev/ic/amdccp.c | 94 +
sys/dev/ic/amdccpvar.h | 45 +
sys/dev/ic/dwc_gmac.c | 271 +-
sys/dev/ic/dwc_gmac_reg.h | 30 +-
sys/dev/ic/dwc_gmac_var.h | 19 +-
sys/dev/ic/pl061.c | 116 +
sys/dev/ic/pl061var.h | 52 +
sys/dev/ld.c | 12 +-
sys/dev/pci/aac_pci.c | 20 +-
sys/dev/pci/hifn7751.c | 7 +-
sys/dev/pci/if_bwfm_pci.c | 27 +-
sys/dev/pci/if_wm.c | 7 +-
sys/dev/pci/mpii.c | 14 +-
sys/dev/pci/pci_quirks.c | 4 +-
sys/dev/pci/pci_subr.c | 16 +-
sys/dev/pci/pcidevs | 7 +-
sys/dev/pci/pcidevs.h | 9 +-
sys/dev/pci/pcidevs_data.h | 19951 +++++----
sys/dev/pci/pcireg.h | 6 +-
sys/dev/pci/virtio.c | 7 +-
sys/dev/scsipi/scsiconf.c | 6 +-
sys/dev/scsipi/scsipiconf.h | 3 +-
sys/dev/scsipi/sd.c | 19 +-
sys/dev/sdmmc/sbt.c | 6 +-
sys/dev/sdmmc/sdmmc_io.c | 9 +-
sys/dev/usb/if_athn_usb.c | 5 +-
sys/dev/usb/uhub.c | 16 +-
sys/dev/usb/usbdevs | 3 +-
sys/dev/usb/usbdevs.h | 5 +-
sys/dev/usb/usbdevs_data.h | 14 +-
sys/dev/vnd.c | 40 +-
sys/dev/vndvar.h | 4 +-
sys/external/bsd/acpica/dist/include/platform/acnetbsd.h | 6 +-
sys/external/bsd/drm2/dist/drm/i915/intel_panel.c | 8 +-
sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bo.c | 6 +-
sys/external/bsd/drm2/nouveau/files.nouveau | 3 +-
sys/external/bsd/libnv/dist/nv_kern_netbsd.c | 11 +-
sys/fs/udf/udf_allocation.c | 7 +-
sys/fs/udf/udf_subr.c | 11 +-
sys/kern/init_sysctl.c | 46 +-
sys/kern/kern_descrip.c | 30 +-
sys/kern/kern_proc.c | 56 +-
sys/kern/kern_subr.c | 14 +-
sys/kern/kern_sysctl.c | 36 +-
sys/kern/uipc_mbuf.c | 8 +-
sys/kern/uipc_mbufdebug.c | 206 +-
sys/kern/vfs_trans.c | 29 +-
sys/miscfs/genfs/genfs_vfsops.c | 7 +-
sys/miscfs/procfs/procfs_vnops.c | 8 +-
sys/net/if.c | 7 +-
sys/net/if.h | 3 +-
sys/net/if_gif.c | 13 +-
sys/net/if_gif.h | 4 +-
sys/net/if_ipsec.c | 12 +-
sys/net/if_ipsec.h | 4 +-
sys/net/if_l2tp.c | 8 +-
sys/net/if_l2tp.h | 4 +-
sys/net/if_pppoe.c | 29 +-
sys/net/if_vlan.c | 8 +-
sys/netinet/ip_reass.c | 5 +-
sys/rump/librump/rumpkern/emul.c | 19 +-
sys/secmodel/suser/secmodel_suser.c | 10 +-
sys/stand/efiboot/Makefile.efiboot | 4 +-
sys/stand/efiboot/boot.c | 4 +-
sys/stand/efiboot/bootaa64/Makefile | 3 +-
sys/stand/efiboot/efiacpi.c | 100 +
sys/stand/efiboot/efiacpi.h | 35 +
sys/stand/efiboot/efiboot.c | 4 +-
sys/stand/efiboot/exec.c | 8 +-
sys/sys/fstrans.h | 6 +-
sys/sys/kauth.h | 3 +-
sys/sys/malloc.h | 5 +-
sys/sys/mbuf.h | 30 +-
sys/sys/systm.h | 10 +-
sys/sys/timetc.h | 3 +-
tests/lib/libc/string/Makefile | 3 +-
tests/lib/libc/string/t_memmem.c | 33 +-
tests/lib/libc/sys/t_sendmmsg.c | 12 +-
tools/Makefile.gnuhost | 3 +-
tools/gcc/Makefile | 3 +-
usr.bin/gzip/gzip.c | 18 +-
usr.bin/gzip/unxz.c | 323 +-
usr.bin/xlint/common/lp64.h | 5 +-
usr.bin/xlint/lint1/scan.l | 10 +-
usr.sbin/acpitools/acpidump/Makefile | 4 +-
usr.sbin/acpitools/acpidump/acpi.c | 530 +-
usr.sbin/acpitools/acpidump/acpidump.8 | 7 +-
usr.sbin/acpitools/amldb/Makefile | 4 +-
usr.sbin/acpitools/amldb/amldb.c | 8 +-
usr.sbin/gpioctl/gpioctl.c | 4 +-
usr.sbin/sysinst/Makefile.inc | 4 +-
usr.sbin/sysinst/defs.h | 10 +-
usr.sbin/sysinst/main.c | 5 +-
usr.sbin/sysinst/net.c | 16 +-
usr.sbin/sysinst/util.c | 109 +-
usr.sbin/vnconfig/vnconfig.8 | 7 +-
usr.sbin/vnconfig/vnconfig.c | 13 +-
740 files changed, 31451 insertions(+), 22373 deletions(-)
diffs (truncated from 84452 to 300 lines):
diff -r bf53b6178531 -r 55087b0a3ead bin/sh/alias.c
--- a/bin/sh/alias.c Thu Oct 18 22:09:56 2018 +0000
+++ b/bin/sh/alias.c Sat Oct 20 06:58:15 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: alias.c,v 1.16 2017/07/24 12:34:45 kre Exp $ */
+/* $NetBSD: alias.c,v 1.16.2.1 2018/10/20 06:58:15 pgoyette Exp $ */
/*-
* Copyright (c) 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)alias.c 8.3 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: alias.c,v 1.16 2017/07/24 12:34:45 kre Exp $");
+__RCSID("$NetBSD: alias.c,v 1.16.2.1 2018/10/20 06:58:15 pgoyette Exp $");
#endif
#endif /* not lint */
@@ -58,6 +58,8 @@
struct alias *atab[ATABSIZE];
STATIC void setalias(char *, char *);
+STATIC int by_name(const void *, const void *);
+STATIC void list_aliases(void);
STATIC int unalias(char *);
STATIC struct alias **hashalias(const char *);
@@ -204,9 +206,47 @@
return ap->val;
}
-/*
- * TODO - sort output
- */
+STATIC int
+by_name(const void *a, const void *b)
+{
+
+ return strcmp(
+ (*(const struct alias * const *)a)->name,
+ (*(const struct alias * const *)b)->name);
+}
+
+STATIC void
+list_aliases(void)
+{
+ size_t i, j, n;
+ const struct alias **aliases;
+ const struct alias *ap;
+
+ n = 0;
+ for (i = 0; i < ATABSIZE; i++)
+ for (ap = atab[i]; ap != NULL; ap = ap->next)
+ if (ap->name[0] != '\0')
+ n++;
+
+ aliases = ckmalloc(n * sizeof aliases[0]);
+
+ j = 0;
+ for (i = 0; i < ATABSIZE; i++)
+ for (ap = atab[i]; ap != NULL; ap = ap->next)
+ if (ap->name[0] != '\0')
+ aliases[j++] = ap;
+
+ qsort(aliases, n, sizeof aliases[0], by_name);
+
+ for (i = 0; i < n; i++) {
+ out1fmt("alias %s=", aliases[i]->name);
+ print_quoted(aliases[i]->val);
+ out1c('\n');
+ }
+
+ ckfree(aliases);
+}
+
int
aliascmd(int argc, char **argv)
{
@@ -215,18 +255,10 @@
struct alias *ap;
if (argc == 1) {
- int i;
-
- for (i = 0; i < ATABSIZE; i++)
- for (ap = atab[i]; ap; ap = ap->next) {
- if (*ap->name != '\0') {
- out1fmt("alias %s=", ap->name);
- print_quoted(ap->val);
- out1c('\n');
- }
- }
+ list_aliases();
return (0);
}
+
while ((n = *++argv) != NULL) {
if ((v = strchr(n+1, '=')) == NULL) { /* n+1: funny ksh stuff */
if ((ap = lookupalias(n, 0)) == NULL) {
diff -r bf53b6178531 -r 55087b0a3ead bin/sh/eval.c
--- a/bin/sh/eval.c Thu Oct 18 22:09:56 2018 +0000
+++ b/bin/sh/eval.c Sat Oct 20 06:58:15 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: eval.c,v 1.153.2.3 2018/09/06 06:51:32 pgoyette Exp $ */
+/* $NetBSD: eval.c,v 1.153.2.4 2018/10/20 06:58:15 pgoyette Exp $ */
/*-
* Copyright (c) 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)eval.c 8.9 (Berkeley) 6/8/95";
#else
-__RCSID("$NetBSD: eval.c,v 1.153.2.3 2018/09/06 06:51:32 pgoyette Exp $");
+__RCSID("$NetBSD: eval.c,v 1.153.2.4 2018/10/20 06:58:15 pgoyette Exp $");
#endif
#endif /* not lint */
@@ -625,7 +625,7 @@
handler = savehandler;
e = exception;
popredir();
- if (xflag && n->nredir.redirect) {
+ if (PS4 != NULL) {
outxstr(PS4);
/* { */ outxstr("} failed\n");
flushout(outx);
@@ -650,7 +650,7 @@
popredir();
INTON;
- if (xflag && n->nredir.redirect) {
+ if (PS4 != NULL) {
outxstr(PS4);
/* { */ outxstr("} done\n");
flushout(outx);
diff -r bf53b6178531 -r 55087b0a3ead bin/sh/mkinit.sh
--- a/bin/sh/mkinit.sh Thu Oct 18 22:09:56 2018 +0000
+++ b/bin/sh/mkinit.sh Sat Oct 20 06:58:15 2018 +0000
@@ -1,5 +1,5 @@
#! /bin/sh
-# $NetBSD: mkinit.sh,v 1.7.14.1 2018/09/30 01:44:21 pgoyette Exp $
+# $NetBSD: mkinit.sh,v 1.7.14.2 2018/10/20 06:58:15 pgoyette Exp $
# Copyright (c) 2003 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -33,7 +33,37 @@
nl='
'
openparen='('
-backslash='\'
+
+# shells have bugs (including older NetBSD sh) in how \ is
+# used in pattern matching. So work out what the shell
+# running this script expects. We could also just use a
+# literal \ in the pattern, which would need to be quoted
+# of course, but then we'd run into a whole host of potential
+# other shell bugs (both with the quoting in the pattern, and
+# with the matching that follows if that works as inended).
+# Far easier, and more reliable, is to just work out what works,
+# and then use it, which more or less mandates using a variable...
+backslash='\\'
+var='abc\' # dummy test case.
+if [ "$var" = "${var%$backslash}" ]
+then
+ # buggy sh, try the broken way
+ backslash='\'
+ if [ "$var" = "${var%$backslash}" ]
+ then
+ printf >&2 "$0: %s\n" 'No pattern match with \ (broken shell)'
+ exit 1
+ fi
+fi
+# We know we can detect the presence of a trailing \, which is all we need.
+# Now to confirm we will not generate false matches.
+var='abc'
+if [ "$var" != "${var%$backslash}" ]
+then
+ printf >&2 "$0: %s\n" 'Bogus pattern match with \ (broken shell)'
+ exit 1
+fi
+unset var
includes=' "shell.h" "mystring.h" "init.h" '
defines=
diff -r bf53b6178531 -r 55087b0a3ead bin/sh/shell.h
--- a/bin/sh/shell.h Thu Oct 18 22:09:56 2018 +0000
+++ b/bin/sh/shell.h Sat Oct 20 06:58:15 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: shell.h,v 1.25.2.1 2018/07/28 04:32:56 pgoyette Exp $ */
+/* $NetBSD: shell.h,v 1.25.2.2 2018/10/20 06:58:15 pgoyette Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -101,21 +101,10 @@
#define DBG_EXTRAS(n) ((DBG_VBOSE_SHIFT * 2) + (n))
/*
- * Unconditional tracing for compatibility with old tracing setup.
- */
-#define TRACE(param) do { \
- trace param; \
- } while (/*CONSTCOND*/ 0)
-#define TRACEV(param) do { \
- tracev param; \
- } while (/*CONSTCOND*/ 0)
-
-/*
- * and the newer conditional tracing, so the mainainer can control
+ * Macros to enable tracing, so the mainainer can control
* just how much debug output is dumped to the trace file
- * (once the rest of the shell is converted to use it).
*
- * in the X forms, "xtra" can be any legal C statement(s) without (bare) commas
+ * In the X forms, "xtra" can be any legal C statement(s) without (bare) commas
* executed if the relevant debug flag is enabled, after any tracing output.
*/
#define CTRACE(when, param) do { \
diff -r bf53b6178531 -r 55087b0a3ead bin/sh/show.c
--- a/bin/sh/show.c Thu Oct 18 22:09:56 2018 +0000
+++ b/bin/sh/show.c Sat Oct 20 06:58:15 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: show.c,v 1.47.4.2 2018/09/06 06:51:32 pgoyette Exp $ */
+/* $NetBSD: show.c,v 1.47.4.3 2018/10/20 06:58:15 pgoyette Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)show.c 8.3 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: show.c,v 1.47.4.2 2018/09/06 06:51:32 pgoyette Exp $");
+__RCSID("$NetBSD: show.c,v 1.47.4.3 2018/10/20 06:58:15 pgoyette Exp $");
#endif
#endif /* not lint */
@@ -68,21 +68,6 @@
#include "var.h"
#include "builtins.h"
-#if defined(DEBUG) && !defined(DBG_PID)
-/*
- * If this is compiled, it means this is being compiled in a shell that still
- * has an older shell.h (a simpler TRACE() mechanism than is coming soon.)
- *
- * Compensate for as much of that as is missing and is needed here
- * to compile and operate at all. After the other changes have appeared,
- * this little block can (and should be) deleted (sometime).
- *
- * Try to avoid waiting 22 years...
- */
-#define DBG_PID 1
-#define DBG_NEST 2
-#endif
-
#define DEFINE_NODENAMES
#include "nodenames.h" /* does almost nothing if !defined(DEBUG) */
diff -r bf53b6178531 -r 55087b0a3ead common/lib/libc/string/memmem.c
--- a/common/lib/libc/string/memmem.c Thu Oct 18 22:09:56 2018 +0000
+++ b/common/lib/libc/string/memmem.c Sat Oct 20 06:58:15 2018 +0000
@@ -25,7 +25,7 @@
#if 0
__FBSDID("$FreeBSD: head/lib/libc/string/memmem.c 315468 2017-03-18 00:53:24Z emaste $");
#else
-__RCSID("$NetBSD: memmem.c,v 1.1.2.2 2018/07/28 04:32:57 pgoyette Exp $");
+__RCSID("$NetBSD: memmem.c,v 1.1.2.3 2018/10/20 06:58:15 pgoyette Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -36,29 +36,33 @@
#include <lib/libkern/libkern.h>
#endif
-static char *twobyte_memmem(const unsigned char *h, size_t k, const unsigned char *n)
+static char *twobyte_memmem(const unsigned char *h, size_t k,
+ const unsigned char *n)
{
- uint16_t nw = n[0]<<8 | n[1], hw = h[0]<<8 | h[1];
- for (h++, k--; k; k--, hw = hw<<8 | *++h)
- if (hw == nw) return __UNCONST(h-1);
- return 0;
+ uint16_t nw = n[0] << 8 | n[1], hw = h[0] << 8 | h[1];
+ for (h += 2, k -= 2; k; k--, hw = hw << 8 | *h++)
+ if (hw == nw) return __UNCONST(h - 2);
+ return hw == nw ? __UNCONST(h - 2) : 0;
}
-static char *threebyte_memmem(const unsigned char *h, size_t k, const unsigned char *n)
+static char *threebyte_memmem(const unsigned char *h, size_t k,
+ const unsigned char *n)
{
- uint32_t nw = n[0]<<24 | n[1]<<16 | n[2]<<8;
- uint32_t hw = h[0]<<24 | h[1]<<16 | h[2]<<8;
- for (h+=2, k-=2; k; k--, hw = (hw|*++h)<<8)
- if (hw == nw) return __UNCONST(h-2);
- return 0;
+ uint32_t nw = n[0] << 24 | n[1] << 16 | n[2] << 8;
+ uint32_t hw = h[0] << 24 | h[1] << 16 | h[2] << 8;
+ for (h += 3, k -= 3; k; k--, hw = (hw|*h++) << 8)
+ if (hw == nw) return __UNCONST(h - 3);
Home |
Main Index |
Thread Index |
Old Index