From e487e17e93ae396d5546f2b4aa00049f2567b540 Mon Sep 17 00:00:00 2001 From: Paul Ackersviller Date: Mon, 30 Apr 2007 04:10:42 +0000 Subject: Merge of 20955: "unset foo" should return status 0 if foo was not set. --- Src/builtin.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'Src/builtin.c') diff --git a/Src/builtin.c b/Src/builtin.c index 1af193f8f..1d9f458e6 100644 --- a/Src/builtin.c +++ b/Src/builtin.c @@ -2728,8 +2728,12 @@ bin_unset(char *name, char **argv, Options ops, int func) pm = (Param) (paramtab == realparamtab ? gethashnode2(paramtab, s) : paramtab->getnode(paramtab, s)); + /* + * Unsetting an unset variable is not an error. + * This appears to be reasonably standard behaviour. + */ if (!pm) - returnval = 1; + continue; else if ((pm->flags & PM_RESTRICTED) && isset(RESTRICTED)) { zerrnam(name, "%s: restricted", pm->nam, 0); returnval = 1; -- cgit 1.4.1