Merge branch 'gawk-4.0-stable'

1 files changed, 2 insertions, 6 deletions

diff --git a/array.c b/array.c
index 2a89a606..90679b72 100644
--- a/array.c
+++ b/array.c
@@ -1219,7 +1219,6 @@ sort_user_func(const void *p1, const void *p2)
 	NODE *idx1, *idx2, *val1, *val2;
 	AWKNUM ret;
 	INSTRUCTION *code;
-	extern int exiting;
 
 	idx1 = *((NODE *const *) p1);
 	idx2 = *((NODE *const *) p2);
@@ -1244,9 +1243,6 @@ sort_user_func(const void *p1, const void *p2)
 	/* execute the comparison function */
 	(void) interpret(code);
 
-	if (exiting)	/* do not assume anything about the user-defined function! */
-		gawk_exit(exit_val);
-
 	/* return value of the comparison function */
 	POP_NUMBER(ret);
 
@@ -1346,9 +1342,9 @@ assoc_list(NODE *symbol, const char *sort_str, SORT_CTXT sort_ctxt)
 		(code + 1)->expr_count = 4;	/* function takes 4 arguments */
 		code->nexti = bcalloc(Op_stop, 1, 0);	
 
-		/* make non-local jumps `next' and `nextfile' fatal in
+		/* make non-redirected getline, exit, `next' and `nextfile' fatal in
 		 * callback function by setting currule in interpret()
-		 * to undefined (0). `exit' is handled in sort_user_func.
+		 * to undefined (0).
 		 */
 
 		save_rule = currule;	/* save current rule */