Deleted Added
full compact
39c39
< __FBSDID("$FreeBSD: head/bin/sh/eval.c 268927 2014-07-20 20:29:09Z jilles $");
---
> __FBSDID("$FreeBSD: head/bin/sh/eval.c 272575 2014-10-05 21:51:36Z jilles $");
319c319,320
< evaltree(n->nbinary.ch1, EV_TESTED);
---
> if (!evalskip)
> evaltree(n->nbinary.ch1, EV_TESTED);
321c322
< skipping: if (evalskip == SKIPCONT && --skipcount <= 0) {
---
> if (evalskip == SKIPCONT && --skipcount <= 0) {
340,341d340
< if (evalskip)
< goto skipping;
651d649
< setstackmark(&smark);
658c656
< goto out;
---
> return;
659a658
> setstackmark(&smark);
701d699
< out: