Deleted Added
full compact
eval.c (293359) eval.c (293635)
1/*-
2 * Copyright (c) 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * This code is derived from software contributed to Berkeley by
6 * Kenneth Almquist.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 22 unchanged lines hidden (view full) ---

31 */
32
33#ifndef lint
34#if 0
35static char sccsid[] = "@(#)eval.c 8.9 (Berkeley) 6/8/95";
36#endif
37#endif /* not lint */
38#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * This code is derived from software contributed to Berkeley by
6 * Kenneth Almquist.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 22 unchanged lines hidden (view full) ---

31 */
32
33#ifndef lint
34#if 0
35static char sccsid[] = "@(#)eval.c 8.9 (Berkeley) 6/8/95";
36#endif
37#endif /* not lint */
38#include <sys/cdefs.h>
39__FBSDID("$FreeBSD: head/bin/sh/eval.c 293359 2016-01-07 20:48:24Z jilles $");
39__FBSDID("$FreeBSD: head/bin/sh/eval.c 293635 2016-01-10 16:31:28Z jilles $");
40
41#include <paths.h>
42#include <signal.h>
43#include <stdlib.h>
44#include <unistd.h>
45#include <sys/resource.h>
46#include <sys/wait.h> /* For WIFSIGNALED(status) */
47#include <errno.h>

--- 986 unchanged lines hidden (view full) ---

1034 shellparam.optp = NULL;
1035 shellparam.optnext = NULL;
1036 INTOFF;
1037 savelocalvars = localvars;
1038 localvars = NULL;
1039 reffunc(cmdentry.u.func);
1040 savehandler = handler;
1041 if (setjmp(jmploc.loc)) {
40
41#include <paths.h>
42#include <signal.h>
43#include <stdlib.h>
44#include <unistd.h>
45#include <sys/resource.h>
46#include <sys/wait.h> /* For WIFSIGNALED(status) */
47#include <errno.h>

--- 986 unchanged lines hidden (view full) ---

1034 shellparam.optp = NULL;
1035 shellparam.optnext = NULL;
1036 INTOFF;
1037 savelocalvars = localvars;
1038 localvars = NULL;
1039 reffunc(cmdentry.u.func);
1040 savehandler = handler;
1041 if (setjmp(jmploc.loc)) {
1042 freeparam(&shellparam);
1043 shellparam = saveparam;
1044 popredir();
1045 unreffunc(cmdentry.u.func);
1046 poplocalvars();
1047 localvars = savelocalvars;
1042 popredir();
1043 unreffunc(cmdentry.u.func);
1044 poplocalvars();
1045 localvars = savelocalvars;
1046 freeparam(&shellparam);
1047 shellparam = saveparam;
1048 funcnest--;
1049 handler = savehandler;
1050 longjmp(handler->loc, 1);
1051 }
1052 handler = &jmploc;
1053 funcnest++;
1054 redirect(cmd->ncmd.redirect, REDIR_PUSH);
1055 INTON;

--- 327 unchanged lines hidden ---
1048 funcnest--;
1049 handler = savehandler;
1050 longjmp(handler->loc, 1);
1051 }
1052 handler = &jmploc;
1053 funcnest++;
1054 redirect(cmd->ncmd.redirect, REDIR_PUSH);
1055 INTON;

--- 327 unchanged lines hidden ---