Deleted Added
full compact
var.c (236346) var.c (239071)
1/*-
2 * Copyright (c) 2002 Juli Mallett.
3 * Copyright (c) 1988, 1989, 1990, 1993
4 * The Regents of the University of California. All rights reserved.
5 * Copyright (c) 1989 by Berkeley Softworks
6 * All rights reserved.
7 *
8 * This code is derived from software contributed to Berkeley by

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

35 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
36 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
37 * SUCH DAMAGE.
38 *
39 * @(#)var.c 8.3 (Berkeley) 3/19/94
40 */
41
42#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2002 Juli Mallett.
3 * Copyright (c) 1988, 1989, 1990, 1993
4 * The Regents of the University of California. All rights reserved.
5 * Copyright (c) 1989 by Berkeley Softworks
6 * All rights reserved.
7 *
8 * This code is derived from software contributed to Berkeley by

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

35 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
36 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
37 * SUCH DAMAGE.
38 *
39 * @(#)var.c 8.3 (Berkeley) 3/19/94
40 */
41
42#include <sys/cdefs.h>
43__FBSDID("$FreeBSD: head/usr.bin/make/var.c 236346 2012-05-31 00:36:56Z obrien $");
43__FBSDID("$FreeBSD: head/usr.bin/make/var.c 239071 2012-08-05 15:55:36Z dim $");
44
45/**
46 * var.c --
47 * Variable-handling functions
48 *
49 * Interface:
50 * Var_Set Set the value of a variable in the given
51 * context. The variable is created if it doesn't

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

1760 }
1761 /* FALLTHROUGH */
1762 default:
1763 if (vp->ptr[1] != endc && vp->ptr[1] != ':') {
1764#ifdef SUNSHCMD
1765 if ((vp->ptr[0] == 's') &&
1766 (vp->ptr[1] == 'h') &&
1767 (vp->ptr[2] == endc || vp->ptr[2] == ':')) {
44
45/**
46 * var.c --
47 * Variable-handling functions
48 *
49 * Interface:
50 * Var_Set Set the value of a variable in the given
51 * context. The variable is created if it doesn't

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

1760 }
1761 /* FALLTHROUGH */
1762 default:
1763 if (vp->ptr[1] != endc && vp->ptr[1] != ':') {
1764#ifdef SUNSHCMD
1765 if ((vp->ptr[0] == 's') &&
1766 (vp->ptr[1] == 'h') &&
1767 (vp->ptr[2] == endc || vp->ptr[2] == ':')) {
1768 const char *error;
1768 const char *error = NULL;
1769
1770 if (vp->execute) {
1771 newStr = Buf_Peel(
1772 Cmd_Exec(value, &error));
1773 } else {
1774 newStr = estrdup("");
1775 }
1776

--- 846 unchanged lines hidden ---
1769
1770 if (vp->execute) {
1771 newStr = Buf_Peel(
1772 Cmd_Exec(value, &error));
1773 } else {
1774 newStr = estrdup("");
1775 }
1776

--- 846 unchanged lines hidden ---