github-repos/make
1
0
Fork 0
mirror of https://github.com/mirror/make.git synced 2025-03-28 13:00:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

(message): Take new arg PREFIX. Print "make: " only if nonzero.

Browse Source
This commit is contained in:
Roland McGrath 1995-11-26 01:35:05 +00:00
parent 06021f945f
commit 808f1c1cd2
1 changed files with 25 additions and 7 deletions

32
misc.c
View File

@ -174,15 +174,25 @@ concat (s1, s2, s3)
/* Print a message on stdout. */
void
message (s1, s2, s3, s4, s5, s6)
message (prefix, s1, s2, s3, s4, s5, s6)
int prefix;
char *s1, *s2, *s3, *s4, *s5, *s6;
{
if (makelevel == 0)
printf ("%s: ", program);
else
printf ("%s[%u]: ", program, makelevel);
printf (s1, s2, s3, s4, s5, s6);
putchar ('\n');
log_working_directory (1);
if (s1 != 0)
{
if (prefix)
{
if (makelevel == 0)
printf ("%s: ", program);
else
printf ("%s[%u]: ", program, makelevel);
}
printf (s1, s2, s3, s4, s5, s6);
putchar ('\n');
}
fflush (stdout);
}
@ -193,6 +203,8 @@ void
fatal (s1, s2, s3, s4, s5, s6)
char *s1, *s2, *s3, *s4, *s5, *s6;
{
log_working_directory (1);
if (makelevel == 0)
fprintf (stderr, "%s: *** ", program);
else
@ -211,6 +223,8 @@ void
error (s1, s2, s3, s4, s5, s6)
char *s1, *s2, *s3, *s4, *s5, *s6;
{
log_working_directory (1);
if (makelevel == 0)
fprintf (stderr, "%s: ", program);
else
@ -226,6 +240,8 @@ makefile_error (file, lineno, s1, s2, s3, s4, s5, s6)
unsigned int lineno;
char *s1, *s2, *s3, *s4, *s5, *s6;
{
log_working_directory (1);
fprintf (stderr, "%s:%u: ", file, lineno);
fprintf (stderr, s1, s2, s3, s4, s5, s6);
putc ('\n', stderr);
@ -238,6 +254,8 @@ makefile_fatal (file, lineno, s1, s2, s3, s4, s5, s6)
unsigned int lineno;
char *s1, *s2, *s3, *s4, *s5, *s6;
{
log_working_directory (1);
fprintf (stderr, "%s:%u: *** ", file, lineno);
fprintf (stderr, s1, s2, s3, s4, s5, s6);
fputs (". Stop.\n", stderr);