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

Check_Cwd_av: Ensure that word after a '(', '{' etc is considered a command, 

so that we spot the cd/chdir and don't put one in.
This commit is contained in:
sjg 2000-06-06 03:00:11 +00:00
parent d8e5d1fa7d
commit 3d93bb57a6
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
/* $NetBSD: main.c,v 1.56 2000/05/10 07:49:35 sjg Exp $ */ /* $NetBSD: main.c,v 1.57 2000/06/06 03:00:11 sjg Exp $ */
/* /*
* Copyright (c) 1988, 1989, 1990, 1993 * Copyright (c) 1988, 1989, 1990, 1993
@ -39,7 +39,7 @@
*/ */
#ifdef MAKE_BOOTSTRAP #ifdef MAKE_BOOTSTRAP
static char rcsid[] = "$NetBSD: main.c,v 1.56 2000/05/10 07:49:35 sjg Exp $"; static char rcsid[] = "$NetBSD: main.c,v 1.57 2000/06/06 03:00:11 sjg Exp $";
#else #else
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
@ -51,7 +51,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993\n\
#if 0 #if 0
static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94"; static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94";
#else #else
__RCSID("$NetBSD: main.c,v 1.56 2000/05/10 07:49:35 sjg Exp $"); __RCSID("$NetBSD: main.c,v 1.57 2000/06/06 03:00:11 sjg Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
#endif #endif
@ -1052,9 +1052,17 @@ Check_Cwd_av(ac, av, copy)
i, (is_cmd) ? "cmd" : "arg", av[i]); i, (is_cmd) ? "cmd" : "arg", av[i]);
#endif #endif
if (is_cmd != 0) { if (is_cmd != 0) {
while (*cp == '(' || *cp == '{' || if (*cp == '(' || *cp == '{' ||
*cp == ';' || *cp == '&' || *cp == '|') *cp == ';' || *cp == '&' || *cp == '|') {
++cp; do {
++cp;
} while (*cp == '(' || *cp == '{' ||
*cp == ';' || *cp == '&' || *cp == '|');
if (*cp == '\0') {
next_cmd = 1;
continue;
}
}
if (strcmp(cp, "cd") == 0 || strcmp(cp, "chdir") == 0) { if (strcmp(cp, "cd") == 0 || strcmp(cp, "chdir") == 0) {
#ifdef check_cwd_debug #ifdef check_cwd_debug
fprintf(stderr, " == cd, done.\n"); fprintf(stderr, " == cd, done.\n");