Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-6]: src/bin/sh Pull up following revision(s) (requested by dholla...
details: https://anonhg.NetBSD.org/src/rev/8f8503db806c
branches: netbsd-6
changeset: 777123:8f8503db806c
user: snj <snj%NetBSD.org@localhost>
date: Wed Nov 16 17:53:57 2016 +0000
description:
Pull up following revision(s) (requested by dholland in ticket #1412):
bin/sh/exec.c: revision 1.45
bin/sh/var.c: revision 1.43
PR/48312: Dieter Roelants: According to TOG, unset should not return an error
for functions are variables that were not previously set:
http://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html
diffstat:
bin/sh/exec.c | 7 +++----
bin/sh/var.c | 8 ++++----
2 files changed, 7 insertions(+), 8 deletions(-)
diffs (60 lines):
diff -r ac9388a9b375 -r 8f8503db806c bin/sh/exec.c
--- a/bin/sh/exec.c Sun Nov 13 06:50:10 2016 +0000
+++ b/bin/sh/exec.c Wed Nov 16 17:53:57 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: exec.c,v 1.42 2008/10/16 15:31:05 dholland Exp $ */
+/* $NetBSD: exec.c,v 1.42.20.1 2016/11/16 17:53:57 snj 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.42 2008/10/16 15:31:05 dholland Exp $");
+__RCSID("$NetBSD: exec.c,v 1.42.20.1 2016/11/16 17:53:57 snj Exp $");
#endif
#endif /* not lint */
@@ -944,9 +944,8 @@
cmdp->cmdtype == CMDFUNCTION) {
freefunc(cmdp->param.func);
delete_cmd_entry();
- return (0);
}
- return (1);
+ return 0;
}
/*
diff -r ac9388a9b375 -r 8f8503db806c bin/sh/var.c
--- a/bin/sh/var.c Sun Nov 13 06:50:10 2016 +0000
+++ b/bin/sh/var.c Wed Nov 16 17:53:57 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.40 2011/06/18 21:18:46 christos Exp $ */
+/* $NetBSD: var.c,v 1.40.4.1 2016/11/16 17:53:57 snj Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: var.c,v 1.40 2011/06/18 21:18:46 christos Exp $");
+__RCSID("$NetBSD: var.c,v 1.40.4.1 2016/11/16 17:53:57 snj Exp $");
#endif
#endif /* not lint */
@@ -753,10 +753,10 @@
vp = find_var(s, &vpp, NULL);
if (vp == NULL)
- return 1;
+ return 0;
if (vp->flags & VREADONLY)
- return (1);
+ return 1;
INTOFF;
if (unexport) {
Home |
Main Index |
Thread Index |
Old Index