diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2011-12-08 21:20:11 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2011-12-08 21:20:11 +0200 |
| commit | c5da922b0486462028584e4568d6e00d1a4f2783 (patch) | |
| tree | de1d17b273449e5aa03dcbf79d53edbc0bc3b157 /array.c | |
| parent | 69239a8fd65ad7f55cc2d567c933a800d5d10fac (diff) | |
| parent | d586094c7c4a9a412a7633a32d2b92a8e1cfea1c (diff) | |
| download | egawk-c5da922b0486462028584e4568d6e00d1a4f2783.tar.gz egawk-c5da922b0486462028584e4568d6e00d1a4f2783.tar.bz2 egawk-c5da922b0486462028584e4568d6e00d1a4f2783.zip | |
Merge branch 'gawk-4.0-stable'
Diffstat (limited to 'array.c')
| -rw-r--r-- | array.c | 8 |
1 files changed, 2 insertions, 6 deletions
@@ -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 */ |