diff options
| author | jilles <jilles@FreeBSD.org> | 2013-09-04 22:10:16 +0000 |
|---|---|---|
| committer | jilles <jilles@FreeBSD.org> | 2013-09-04 22:10:16 +0000 |
| commit | ad7328341af15585f1dee4fbb63f288d2b2917e2 (patch) | |
| tree | 00235be2a41fac24160537f8172d9ce83957898a /bin/sh/eval.h | |
| parent | 206a10e8a633f64ba34396341d375e620bba21d2 (diff) | |
| download | FreeBSD-src-ad7328341af15585f1dee4fbb63f288d2b2917e2.zip FreeBSD-src-ad7328341af15585f1dee4fbb63f288d2b2917e2.tar.gz | |
sh: Make return return from the closest function or dot script.
Formerly, return always returned from a function if it was called from a
function, even if there was a closer dot script. This was for compatibility
with the Bourne shell which only allowed returning from functions.
Other modern shells and POSIX return from the function or the dot script,
whichever is closest.
Git 1.8.4's rebase --continue depends on the POSIX behaviour.
Reported by: Christoph Mallon, avg
Diffstat (limited to 'bin/sh/eval.h')
| -rw-r--r-- | bin/sh/eval.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/bin/sh/eval.h b/bin/sh/eval.h index a6e87b2..4129757 100644 --- a/bin/sh/eval.h +++ b/bin/sh/eval.h @@ -67,5 +67,4 @@ extern int skipcount; /* reasons for skipping commands (see comment on breakcmd routine) */ #define SKIPBREAK 1 #define SKIPCONT 2 -#define SKIPFUNC 3 -#define SKIPFILE 4 +#define SKIPRETURN 3 |
