mirrors/make
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/make.git synced 2024-10-24 05:09:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

(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
Show stats Download patch file Download diff file Expand all files Collapse all files

32
misc.c
View file

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