Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

if brk_string fail, so do we.

Browse Source
This commit is contained in:
christos 2008-12-19 22:03:41 +00:00
parent 1a59b518a0
commit cd056136e4
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.bin/make/job.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: job.c,v 1.142 2008/12/13 15:19:29 dsl Exp $ */
/* $NetBSD: job.c,v 1.143 2008/12/19 22:03:41 christos Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
static char rcsid[] = "$NetBSD: job.c,v 1.142 2008/12/13 15:19:29 dsl Exp $";
static char rcsid[] = "$NetBSD: job.c,v 1.143 2008/12/19 22:03:41 christos Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)job.c 8.2 (Berkeley) 3/19/94";
#else
__RCSID("$NetBSD: job.c,v 1.142 2008/12/13 15:19:29 dsl Exp $");
__RCSID("$NetBSD: job.c,v 1.143 2008/12/19 22:03:41 christos Exp $");
#endif
#endif /* not lint */
#endif
@ -2330,6 +2330,10 @@ Job_ParseShell(char *line)
* Parse the specification by keyword
*/
words = brk_string(line, &argc, TRUE, &path);
if (words == NULL) {
Error("Unterminated quoted string [%s]", line);
return FAILURE;
}
shellArgv = path;
for (path = NULL, argv = words; argc != 0; argc--, argv++) {

12
usr.bin/make/main.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: main.c,v 1.158 2008/12/13 18:11:53 dholland Exp $ */
/* $NetBSD: main.c,v 1.159 2008/12/19 22:03:41 christos Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@ -69,7 +69,7 @@
*/
#ifndef MAKE_NATIVE
static char rcsid[] = "$NetBSD: main.c,v 1.158 2008/12/13 18:11:53 dholland Exp $";
static char rcsid[] = "$NetBSD: main.c,v 1.159 2008/12/19 22:03:41 christos Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
@ -81,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993\
#if 0
static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94";
#else
__RCSID("$NetBSD: main.c,v 1.158 2008/12/13 18:11:53 dholland Exp $");
__RCSID("$NetBSD: main.c,v 1.159 2008/12/19 22:03:41 christos Exp $");
#endif
#endif /* not lint */
#endif
@ -603,6 +603,12 @@ Main_ParseArgLine(char *line)
free(p1);
argv = brk_string(buf, &argc, TRUE, &args);
free(buf);
if (argv == NULL) {
Error("Unterminated quoted string [%s]", buf);
free(buf);
return;
}
free(buf);
MainParseArgs(argc, argv);