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

when displaying the 'Failed command:', collapse runs of whitespace in the 

command to a single space.   suggested by David Laight in private mail.
This commit is contained in:
lukem 2003-09-09 16:16:02 +00:00
parent f8a1f76075
commit f741d2d094
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
usr.bin/make/compat.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: compat.c,v 1.50 2003/09/08 23:54:54 lukem Exp $ */ /* $NetBSD: compat.c,v 1.51 2003/09/09 16:16:02 lukem Exp $ */
/* /*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California. * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@ -70,14 +70,14 @@
*/ */
#ifdef MAKE_BOOTSTRAP #ifdef MAKE_BOOTSTRAP
static char rcsid[] = "$NetBSD: compat.c,v 1.50 2003/09/08 23:54:54 lukem Exp $"; static char rcsid[] = "$NetBSD: compat.c,v 1.51 2003/09/09 16:16:02 lukem Exp $";
#else #else
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
#if 0 #if 0
static char sccsid[] = "@(#)compat.c 8.2 (Berkeley) 3/19/94"; static char sccsid[] = "@(#)compat.c 8.2 (Berkeley) 3/19/94";
#else #else
__RCSID("$NetBSD: compat.c,v 1.50 2003/09/08 23:54:54 lukem Exp $"); __RCSID("$NetBSD: compat.c,v 1.51 2003/09/09 16:16:02 lukem Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
#endif #endif
@ -354,9 +354,19 @@ CompatRunCommand(ClientData cmdp, ClientData gnp)
} else if (WIFEXITED(reason)) { } else if (WIFEXITED(reason)) {
status = WEXITSTATUS(reason); /* exited */ status = WEXITSTATUS(reason); /* exited */
if (status != 0) { if (status != 0) {
printf("\n*** Failed target: %s\n*** Failed command: %s\n", printf("\n*** Failed target: %s\n*** Failed command: ",
gn->name, cmd); gn->name);
printf ("*** Error code %d", status); for (cp = cmd; *cp; ) {
if (isspace((unsigned char)*cp)) {
putchar(' ');
while (isspace((unsigned char)*cp))
cp++;
} else {
putchar(*cp);
cp++;
}
}
printf ("\n*** Error code %d", status);
} }
} else { } else {
status = WTERMSIG(reason); /* signaled */ status = WTERMSIG(reason); /* signaled */