mirrors/make-dfsg
1
0
Fork 0
mirror of https://salsa.debian.org/srivasta/make-dfsg.git synced 2024-12-27 23:06:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

(log_working_directory): Made global.

Browse source 
Print entering msg only once.
This commit is contained in:
Roland McGrath 1995-11-26 01:37:07 +00:00
parent 808f1c1cd2
commit 37cf6fdc18
1 changed files with 18 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
main.c
View file

@ -43,7 +43,6 @@ extern double atof ();
#endif #endif
extern char *mktemp (); extern char *mktemp ();
static void log_working_directory ();
static void print_data_base (), print_version (); static void print_data_base (), print_version ();
static void decode_switches (), decode_env_switches (); static void decode_switches (), decode_env_switches ();
static void define_makeflags (); static void define_makeflags ();
@ -688,10 +687,6 @@ main (argc, argv, envp)
starting_directory = current_directory; starting_directory = current_directory;
} }
/* Tell the user where he is. */
if (print_directory_flag)
log_working_directory (1);
/* Read any stdin makefiles into temporary files. */ /* Read any stdin makefiles into temporary files. */
@ -1010,7 +1005,6 @@ main (argc, argv, envp)
if (print_data_base_flag) if (print_data_base_flag)
print_data_base (); print_data_base ();
if (print_directory_flag)
log_working_directory (0); log_working_directory (0);
if (makefiles != 0) if (makefiles != 0)
@ -1950,7 +1944,6 @@ die (status)
if (print_data_base_flag) if (print_data_base_flag)
print_data_base (); print_data_base ();
if (print_directory_flag)
log_working_directory (0); log_working_directory (0);
} }
@ -1960,20 +1953,21 @@ die (status)
/* Write a message indicating that we've just entered or /* Write a message indicating that we've just entered or
left (according to ENTERING) the current directory. */ left (according to ENTERING) the current directory. */
static void void
log_working_directory (entering) log_working_directory (entering)
int entering; int entering;
{ {
static int entered = 0; static int entered = 0;
char *message = entering ? "Entering" : "Leaving"; char *message = entering ? "Entering" : "Leaving";
if (entering) /* Print nothing without the flag. Don't print the entering message
entered = 1; again if we already have. Don't print the leaving message if we
else if (!entered)
/* Don't print the leaving message if we
haven't printed the entering message. */ haven't printed the entering message. */
if (! print_directory_flag || entering == entered)
return; return;
entered = entering;
if (print_data_base_flag) if (print_data_base_flag)
fputs ("# ", stdout); fputs ("# ", stdout);