Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/prg-localcount2]: src Resolve conflicts from previous merge (all resulti...
details: https://anonhg.NetBSD.org/src/rev/4408efc34d97
branches: prg-localcount2
changeset: 823559:4408efc34d97
user: pgoyette <pgoyette%NetBSD.org@localhost>
date: Fri May 19 00:22:50 2017 +0000
description:
Resolve conflicts from previous merge (all resulting from $NetBSD
keywork expansion)
diffstat:
bin/sh/Makefile | 14 +-
bin/sh/builtins.def | 6 +-
bin/sh/eval.c | 8 +-
bin/sh/exec.c | 103 +-
bin/sh/jobs.c | 36 +-
bin/sh/main.c | 6 +-
bin/sh/miscbltin.c | 6 +-
bin/sh/options.c | 78 +-
bin/sh/options.h | 18 +-
bin/sh/output.c | 8 +-
bin/sh/parser.c | 39 +-
bin/sh/redir.c | 40 +-
bin/sh/sh.1 | 704 +++-
bin/sh/shell.h | 144 +-
bin/sh/show.c | 1409 +++++++--
bin/sh/show.h | 4 +-
bin/sh/syntax.h | 4 +-
bin/sh/var.c | 41 +-
distrib/amd64/installimage/Makefile | 4 +-
distrib/amd64/uefi-installimage/Makefile | 4 +-
distrib/arc/ramdisk/Makefile | 4 +-
distrib/notes/common/main | 4 +-
distrib/sets/lists/base/shl.mi | 6 +-
distrib/sets/lists/debug/shl.mi | 6 +-
distrib/sets/lists/man/mi | 5 +-
distrib/sets/lists/tests/mi | 13 +-
distrib/utils/embedded/conf/evbarm.conf | 5 +-
doc/CHANGES | 8 +-
etc/mtree/NetBSD.dist.tests | 3 +-
external/bsd/atf/dist/atf-sh/atf-sh-api.3 | 146 +-
external/bsd/bind/lib/libdns/Makefile | 10 +-
external/cddl/osnet/dist/cmd/dtrace/dtrace.1 | 4 +-
external/gpl3/gcc/dist/gcc/auto-profile.c | 2 +-
external/gpl3/gcc/dist/gcc/graphite-isl-ast-to-gimple.c | 2 +-
external/gpl3/gcc/dist/gcc/system.h | 1 +
lib/libc/gen/assert.c | 53 +-
lib/libc/gen/signalname.3 | 25 +-
lib/libc/sys/execve.2 | 4 +-
lib/libc/sys/getdents.2 | 8 +-
lib/libc/sys/intro.2 | 10 +-
lib/libc/sys/lfs_markv.2 | 6 +-
lib/libc/sys/lfs_segclean.2 | 6 +-
lib/libc/sys/lfs_segwait.2 | 6 +-
lib/libc/sys/mmap.2 | 6 +-
lib/libc/sys/mount.2 | 48 +-
lib/libc/sys/mprotect.2 | 4 +-
lib/libc/sys/open.2 | 6 +-
lib/libc/sys/statvfs.2 | 4 +-
lib/libc/sys/sync.2 | 4 +-
lib/libc/sys/truncate.2 | 4 +-
lib/libc/sys/undelete.2 | 4 +-
lib/libcurses/curses.3 | 4 +-
lib/libm/compat/compat_cabs.c | 4 +-
lib/libm/compat/compat_cabsf.c | 4 +-
lib/libm/shlib_version | 4 +-
lib/librumpclient/Makefile | 4 +-
lib/librumpclient/rumpclient.h | 9 +-
lib/librumphijack/Makefile | 4 +-
lib/librumpuser/Makefile | 4 +-
lib/librumpuser/rumpuser_port.h | 6 +-
lib/libterminfo/term.c | 135 +-
regress/Makefile | 5 +-
regress/sys/Makefile | 7 +-
regress/sys/crypto/Makefile | 12 -
regress/sys/crypto/Makefile.inc | 20 -
regress/sys/crypto/blowfish/Makefile | 15 -
regress/sys/crypto/blowfish/bftest.c | 209 -
regress/sys/crypto/blowfish_asm/Makefile | 16 -
regress/sys/crypto/cast128/Makefile | 15 -
regress/sys/crypto/cast128/casttest.c | 205 -
regress/sys/crypto/des/Makefile | 15 -
regress/sys/crypto/des/destest.c | 273 -
regress/sys/crypto/des_asm/Makefile | 18 -
regress/sys/crypto/rijndael/Makefile | 17 -
regress/sys/crypto/rijndael/rijndaeltest.c | 224 -
regress/sys/fs/Makefile | 4 +-
regress/sys/fs/getdents/Makefile | 25 -
regress/sys/fs/getdents/getdents.c | 226 -
regress/sys/fs/lseek/Makefile | 19 -
regress/sys/fs/lseek/lseek.c | 118 -
regress/sys/kern/callout1/Makefile | 13 -
regress/sys/kern/callout1/test_callout1.c | 110 -
regress/sys/kern/mutex1/Makefile | 13 -
regress/sys/kern/mutex1/test_mutex1.c | 178 -
regress/sys/kern/mutex2/Makefile | 13 -
regress/sys/kern/mutex2/test_mutex2.c | 124 -
regress/sys/kern/priority_inheritance1/Makefile | 13 -
regress/sys/kern/priority_inheritance1/test_priority_inheritance1.c | 228 -
regress/sys/kern/rwlock1/Makefile | 13 -
regress/sys/kern/rwlock1/test_rwlock1.c | 134 -
regress/sys/net/Makefile | 7 -
regress/sys/net/bpf/Makefile | 7 -
regress/sys/net/bpf/interface/Makefile | 15 -
regress/sys/net/bpf/interface/interface.c | 109 -
regress/sys/net/bpf/out-of-bounds/Makefile | 13 -
regress/sys/net/bpf/out-of-bounds/out-of-bounds.sh | 28 -
regress/sys/uvm/Makefile | 19 -
regress/sys/uvm/Makefile.inc | 4 -
regress/sys/uvm/stack_exec/Makefile | 17 -
regress/sys/uvm/stack_exec/tramptest.c | 44 -
regress/sys/uvm/stack_noexec/Makefile | 28 -
regress/sys/uvm/stack_noexec/tramptest.c | 61 -
regress/usr.bin/Makefile | 11 -
regress/usr.bin/c++/Makefile | 5 -
regress/usr.bin/c++/static_destructor/Makefile | 11 -
regress/usr.bin/c++/static_destructor/expected | 4 -
regress/usr.bin/c++/static_destructor/static_destructor.cc | 37 -
regress/usr.bin/rtld/Makefile | 9 -
regress/usr.bin/rtld/testlib/Makefile | 27 -
regress/usr.bin/rtld/testlib/ccexc.cc | 14 -
regress/usr.bin/rtld/testlib/construct.cc | 25 -
regress/usr.bin/rtld/testlib/virt.cc | 15 -
share/man/man4/Makefile | 4 +-
share/man/man4/vioscsi.4 | 66 +
share/man/man4/virtio.4 | 10 +-
share/man/man9/uvm_map.9 | 4 +-
share/misc/acronyms.comp | 8 +-
share/misc/airport | 4 +-
sys/arch/amd64/conf/XEN3_DOMU | 4 +-
sys/arch/arm/arm/ast.c | 8 +-
sys/arch/evbmips/conf/LOONGSON | 5 +-
sys/arch/mips/mips/cache.c | 26 +-
sys/arch/mips/mips/mipsX_subr.S | 4 +-
sys/arch/mips/mips/pmap_machdep.c | 99 +-
sys/arch/mips/mips/vm_machdep.c | 6 +-
sys/arch/pmax/ibus/dz_ibus.c | 5 +-
sys/arch/pmax/pmax/bus.c | 16 +-
sys/arch/pmax/pmax/bus_dma.c | 16 +-
sys/arch/x86/include/cpu.h | 4 +-
sys/arch/x86/include/specialreg.h | 6 +-
sys/arch/x86/x86/procfs_machdep.c | 72 +-
sys/dev/audio.c | 112 +-
sys/dev/i2c/axp20x.c | 43 +-
sys/dev/ic/rtl8169.c | 6 +-
sys/dev/pci/if_re_pci.c | 7 +-
sys/dev/pci/if_rtwn.c | 9 +-
sys/dev/pci/if_vioif.c | 98 +-
sys/dev/pci/ixgbe/ix_txrx.c | 3 +-
sys/dev/pci/ixgbe/ixgbe.c | 58 +-
sys/dev/pci/ixgbe/ixgbe_type.h | 4 +-
sys/dev/pci/vioscsi.c | 52 +-
sys/dev/rasops/rasops.c | 10 +-
sys/dev/usb/uaudio.c | 8 +-
sys/dev/usb/uts.c | 6 +-
sys/external/bsd/ipf/netinet/ip_fil_netbsd.c | 9 +-
sys/kern/kern_descrip.c | 6 +-
sys/kern/kern_event.c | 4 +-
sys/kern/vfs_mount.c | 15 +-
sys/kern/vfs_vnode.c | 33 +-
sys/modules/lua/lua.c | 6 +-
sys/net/npf/npf_ctl.c | 25 +-
sys/netinet/if_arp.c | 54 +-
sys/netinet/in.c | 22 +-
sys/netinet/in_var.h | 5 +-
sys/netinet/ip_carp.c | 16 +-
sys/netinet/ip_output.c | 6 +-
sys/netinet6/mld6.c | 5 +-
sys/netipsec/ipsec.c | 73 +-
sys/netipsec/ipsec.h | 11 +-
sys/netipsec/ipsec_input.c | 38 +-
sys/netipsec/ipsec_output.c | 13 +-
sys/netipsec/key.c | 367 +-
sys/netipsec/key.h | 17 +-
sys/netipsec/keydb.h | 7 +-
sys/netipsec/keysock.c | 6 +-
sys/netipsec/xform_ah.c | 29 +-
sys/netipsec/xform_esp.c | 50 +-
sys/netipsec/xform_ipcomp.c | 28 +-
sys/netipsec/xform_ipip.c | 9 +-
sys/opencrypto/crypto.c | 249 +-
sys/opencrypto/cryptodev.c | 132 +-
sys/opencrypto/cryptodev.h | 6 +-
sys/opencrypto/cryptosoft.c | 8 +-
sys/opencrypto/deflate.c | 47 +-
sys/opencrypto/ocryptodev.c | 10 +-
sys/rump/include/rump/rump.h | 9 +-
sys/rump/librump/rumpkern/vm.c | 11 +-
sys/uvm/pmap/pmap.c | 12 +-
sys/uvm/pmap/pmap_segtab.c | 9 +-
sys/uvm/uvm_extern.h | 44 +-
sys/uvm/uvm_map.h | 9 +-
tests/bin/sh/t_expand.sh | 223 +-
tests/bin/sh/t_redircloexec.sh | 78 +-
tests/net/carp/t_basic.sh | 213 +-
tests/net/ipsec/Makefile | 6 +-
tests/net/ipsec/algorithms.sh | 16 +-
tests/net/ipsec/common.sh | 4 +-
tests/net/ipsec/t_ipsec_gif.sh | 56 +-
tests/net/ipsec/t_ipsec_l2tp.sh | 56 +-
tests/net/ipsec/t_ipsec_misc.sh | 429 +++
tests/net/ipsec/t_ipsec_transport.sh | 44 +-
tests/net/ipsec/t_ipsec_tunnel.sh | 44 +-
tests/net/ipsec/t_ipsec_tunnel_odd.sh | 44 +-
tests/net/net_common.sh | 13 +-
tests/usr.bin/Makefile | 6 +-
tests/usr.bin/c++/Makefile | 11 +
tests/usr.bin/c++/t_cxxruntime.sh | 148 +
tests/usr.bin/c++/t_hello.sh | 162 +
tests/usr.bin/c++/t_static_destructor.sh | 194 +
tests/usr.bin/cc/t_hello.sh | 24 +-
usr.bin/infocmp/infocmp.c | 16 +-
usr.bin/rump_allserver/Makefile | 3 +-
usr.bin/rump_dhcpclient/Makefile | 3 +-
usr.bin/rump_halt/Makefile | 3 +-
usr.bin/rump_server/Makefile | 3 +-
usr.bin/su/su.1 | 4 +-
usr.sbin/npf/npfctl/npf_show.c | 6 +-
usr.sbin/npf/npftest/npftest.c | 5 +-
208 files changed, 5083 insertions(+), 4977 deletions(-)
diffs (truncated from 17069 to 300 lines):
diff -r cb48ab7c1075 -r 4408efc34d97 bin/sh/Makefile
--- a/bin/sh/Makefile Thu May 18 23:52:01 2017 +0000
+++ b/bin/sh/Makefile Fri May 19 00:22:50 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.104 2017/03/20 11:26:07 kre Exp $
+# $NetBSD: Makefile,v 1.104.2.1 2017/05/19 00:22:50 pgoyette Exp $
# @(#)Makefile 8.4 (Berkeley) 5/5/95
.include <bsd.own.mk>
@@ -14,8 +14,8 @@
DPSRCS+=${GENHDRS}
-LDADD+= -ll -ledit -lterminfo
-DPADD+= ${LIBL} ${LIBEDIT} ${LIBTERMINFO}
+LDADD+= -ledit -lterminfo
+DPADD+= ${LIBEDIT} ${LIBTERMINFO}
# Environment for scripts executed during build.
SCRIPT_ENV= \
@@ -29,6 +29,14 @@
#CFLAGS+=-funsigned-char
#TARGET_CHARFLAG?= -DTARGET_CHAR="unsigned char" -funsigned-char
+# Reproducible build parameters ... export into sh for NETBSD_SHELL setting
+.if ${MKREPRO_TIMESTAMP:Uno} != "no"
+BUILD_DATE!= date -u -r "${MKREPRO_TIMESTAMP}" "+%Y%m%d%H%M%S"
+# These are (should be) equivalent, but the 2nd is easier to understand
+#CPPFLAGS+= -DBUILD_DATE='"${BUILD_DATE:C/([^0]0?)(00)*$/\1/}Z"'
+CPPFLAGS+= -DBUILD_DATE='"${BUILD_DATE:S/00$//:S/00$//:S/00$//}Z"'
+.endif
+
.ifdef SMALLPROG
CPPFLAGS+=-DSMALL
.endif
diff -r cb48ab7c1075 -r 4408efc34d97 bin/sh/builtins.def
--- a/bin/sh/builtins.def Thu May 18 23:52:01 2017 +0000
+++ b/bin/sh/builtins.def Fri May 19 00:22:50 2017 +0000
@@ -1,5 +1,5 @@
#!/bin/sh -
-# $NetBSD: builtins.def,v 1.24 2017/02/02 20:00:40 christos Exp $
+# $NetBSD: builtins.def,v 1.24.2.1 2017/05/19 00:22:50 pgoyette Exp $
#
# Copyright (c) 1991, 1993
# The Regents of the University of California. All rights reserved.
@@ -91,4 +91,8 @@
wordexpcmd wordexp
#newgrp -u newgrp # optional command in posix
+#ifdef DEBUG
+debugcmd debug
+#endif
+
#exprcmd expr
diff -r cb48ab7c1075 -r 4408efc34d97 bin/sh/eval.c
--- a/bin/sh/eval.c Thu May 18 23:52:01 2017 +0000
+++ b/bin/sh/eval.c Fri May 19 00:22:50 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: eval.c,v 1.131.2.1 2017/05/11 02:58:28 pgoyette Exp $ */
+/* $NetBSD: eval.c,v 1.131.2.2 2017/05/19 00:22:50 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.131.2.1 2017/05/11 02:58:28 pgoyette Exp $");
+__RCSID("$NetBSD: eval.c,v 1.131.2.2 2017/05/19 00:22:50 pgoyette Exp $");
#endif
#endif /* not lint */
@@ -931,6 +931,7 @@
savelocalvars = localvars;
localvars = NULL;
vforked = 1;
+ VFORK_BLOCK
switch (pid = vfork()) {
case -1:
serrno = errno;
@@ -942,6 +943,7 @@
/* Make sure that exceptions only unwind to
* after the vfork(2)
*/
+ SHELL_FORKED();
if (setjmp(jmploc.loc)) {
if (exception == EXSHELLPROC) {
/* We can't progress with the vfork,
@@ -960,6 +962,7 @@
forkchild(jp, cmd, mode, vforked);
break;
default:
+ VFORK_UNDO();
handler = savehandler; /* restore from vfork(2) */
poplocalvars();
localvars = savelocalvars;
@@ -974,6 +977,7 @@
forkparent(jp, cmd, mode, pid);
goto parent;
}
+ VFORK_END
} else {
normal_fork:
#endif
diff -r cb48ab7c1075 -r 4408efc34d97 bin/sh/exec.c
--- a/bin/sh/exec.c Thu May 18 23:52:01 2017 +0000
+++ b/bin/sh/exec.c Fri May 19 00:22:50 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: exec.c,v 1.46 2016/05/03 17:21:02 christos Exp $ */
+/* $NetBSD: exec.c,v 1.46.6.1 2017/05/19 00:22:51 pgoyette Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)exec.c 8.4 (Berkeley) 6/8/95";
#else
-__RCSID("$NetBSD: exec.c,v 1.46 2016/05/03 17:21:02 christos Exp $");
+__RCSID("$NetBSD: exec.c,v 1.46.6.1 2017/05/19 00:22:51 pgoyette Exp $");
#endif
#endif /* not lint */
@@ -340,32 +340,82 @@
struct tblentry **pp;
struct tblentry *cmdp;
int c;
- int verbose;
struct cmdentry entry;
char *name;
+ int allopt=0, bopt=0, fopt=0, ropt=0, sopt=0, uopt=0, verbose=0;
- verbose = 0;
- while ((c = nextopt("rv")) != '\0') {
- if (c == 'r') {
- clearcmdentry(0);
- } else if (c == 'v') {
- verbose++;
+ while ((c = nextopt("bcfrsuv")) != '\0')
+ switch (c) {
+ case 'b': bopt = 1; break;
+ case 'c': uopt = 1; break; /* c == u */
+ case 'f': fopt = 1; break;
+ case 'r': ropt = 1; break;
+ case 's': sopt = 1; break;
+ case 'u': uopt = 1; break;
+ case 'v': verbose = 1; break;
}
- }
+
+ if (ropt)
+ clearcmdentry(0);
+
+ if (bopt == 0 && fopt == 0 && sopt == 0 && uopt == 0)
+ allopt = bopt = fopt = sopt = uopt = 1;
+
if (*argptr == NULL) {
for (pp = cmdtable ; pp < &cmdtable[CMDTABLESIZE] ; pp++) {
for (cmdp = *pp ; cmdp ; cmdp = cmdp->next) {
- if (verbose || cmdp->cmdtype == CMDNORMAL)
+ switch (cmdp->cmdtype) {
+ case CMDNORMAL:
+ if (!uopt)
+ continue;
+ break;
+ case CMDBUILTIN:
+ if (!bopt)
+ continue;
+ break;
+ case CMDSPLBLTIN:
+ if (!sopt)
+ continue;
+ break;
+ case CMDFUNCTION:
+ if (!fopt)
+ continue;
+ break;
+ default: /* never happens */
+ continue;
+ }
+ if (!allopt || verbose ||
+ cmdp->cmdtype == CMDNORMAL)
printentry(cmdp, verbose);
}
}
return 0;
}
- while ((name = *argptr) != NULL) {
- if ((cmdp = cmdlookup(name, 0)) != NULL
- && (cmdp->cmdtype == CMDNORMAL
- || (cmdp->cmdtype == CMDBUILTIN && builtinloc >= 0)))
- delete_cmd_entry();
+
+ while ((name = *argptr++) != NULL) {
+ if ((cmdp = cmdlookup(name, 0)) != NULL) {
+ switch (cmdp->cmdtype) {
+ case CMDNORMAL:
+ if (!uopt)
+ continue;
+ delete_cmd_entry();
+ break;
+ case CMDBUILTIN:
+ if (!bopt)
+ continue;
+ if (builtinloc >= 0)
+ delete_cmd_entry();
+ break;
+ case CMDSPLBLTIN:
+ if (!sopt)
+ continue;
+ break;
+ case CMDFUNCTION:
+ if (!fopt)
+ continue;
+ break;
+ }
+ }
find_command(name, &entry, DO_ERR, pathval());
if (verbose) {
if (entry.cmdtype != CMDUNKNOWN) { /* if no error msg */
@@ -375,12 +425,10 @@
}
flushall();
}
- argptr++;
}
return 0;
}
-
STATIC void
printentry(struct tblentry *cmdp, int verbose)
{
@@ -396,16 +444,24 @@
name = padvance(&path, cmdp->cmdname);
stunalloc(name);
} while (--idx >= 0);
+ if (verbose)
+ out1fmt("Command from PATH[%d]: ",
+ cmdp->param.index);
out1str(name);
break;
case CMDSPLBLTIN:
- out1fmt("special builtin %s", cmdp->cmdname);
- break;
+ if (verbose)
+ out1str("special ");
+ /* FALLTHROUGH */
case CMDBUILTIN:
- out1fmt("builtin %s", cmdp->cmdname);
+ if (verbose)
+ out1str("builtin ");
+ out1fmt("%s", cmdp->cmdname);
break;
case CMDFUNCTION:
- out1fmt("function %s", cmdp->cmdname);
+ if (verbose)
+ out1str("function ");
+ out1fmt("%s", cmdp->cmdname);
if (verbose) {
struct procstat ps;
INTOFF;
@@ -417,7 +473,8 @@
}
break;
default:
- error("internal error: %s cmdtype %d", cmdp->cmdname, cmdp->cmdtype);
+ error("internal error: %s cmdtype %d",
+ cmdp->cmdname, cmdp->cmdtype);
}
if (cmdp->rehash)
out1c('*');
diff -r cb48ab7c1075 -r 4408efc34d97 bin/sh/jobs.c
--- a/bin/sh/jobs.c Thu May 18 23:52:01 2017 +0000
+++ b/bin/sh/jobs.c Fri May 19 00:22:50 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: jobs.c,v 1.79.6.2 2017/05/11 02:58:28 pgoyette Exp $ */
+/* $NetBSD: jobs.c,v 1.79.6.3 2017/05/19 00:22:51 pgoyette Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)jobs.c 8.5 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: jobs.c,v 1.79.6.2 2017/05/11 02:58:28 pgoyette Exp $");
+__RCSID("$NetBSD: jobs.c,v 1.79.6.3 2017/05/19 00:22:51 pgoyette Exp $");
#endif
#endif /* not lint */
@@ -869,6 +869,7 @@
error("Cannot fork (%s)", strerror(serrno));
break;
case 0:
+ SHELL_FORKED();
forkchild(jp, n, mode, 0);
return 0;
default:
@@ -1423,7 +1424,7 @@
int subtype = 0;
int quoted = 0;
Home |
Main Index |
Thread Index |
Old Index