dilim/make
1
0
Fork 0
mirror of https://github.com/mirror/make.git synced 2026-06-24 08:47:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

make -p now uses consistent timestamp format

Browse Source 
* NEWS: mention this.
* src/main.c (safer_ctime, time_now): Remove.
(print_data_base): Use file_timestamp_sprintf to format timestamps.
This commit is contained in:
Paul Eggert
2023-05-10 12:10:16 -07:00
committed by Paul Smith
parent 032f784601
commit c85b71a396
2 changed files with 11 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
NEWS
View File

@@ -9,6 +9,11 @@ which is contained in this distribution as the file doc/make.texi.
See the README file and the GNU Make manual for instructions for
reporting bugs.
* 'make --print-data-base' (or 'make -p') now outputs time of day
using the same form as for file timestamps, e.g., "2023-05-10
10:43:57.570558743". Previously it used the form "Wed May 10
10:43:57 2023", which has less detail and is harder to compare.
Version 4.5 (26 Feb 2023)

51
src/main.c
View File

@@ -3720,57 +3720,18 @@ print_version (void)
printed_version = 1;
}
/* Like ctime, except do not have undefined behavior with timestamps
out of ctime range. */
static char const *
safer_ctime (time_t *t)
{
struct tm *tm = localtime (t);
if (tm && -999 - 1900 <= tm->tm_year && tm->tm_year <= 9999 - 1900)
return ctime (t);
else
return "(time out of range)\n";
}
static time_t
time_now (void)
{
/* Use an algorithm like file_timestamp_now's, extracting just the
seconds part of the timestamp. This avoids a race that would
generate output that incorrectly makes it look like the system
clock jumped backwards on platforms like GNU/Linux where the
'time' function does not use the CLOCK_REALTIME clock and the two
clocks can disagree in their seconds component. */
#if FILE_TIMESTAMP_HI_RES
# if HAVE_CLOCK_GETTIME && defined CLOCK_REALTIME
{
struct timespec timespec;
if (clock_gettime (CLOCK_REALTIME, &timespec) == 0)
return timespec.tv_sec;
}
# endif
# if HAVE_GETTIMEOFDAY
{
struct timeval timeval;
if (gettimeofday (&timeval, 0) == 0)
return timeval.tv_sec;
}
# endif
#endif
return time ((time_t *) 0);
}
/* Print a bunch of information about this and that. */
static void
print_data_base (void)
{
time_t when = time_now ();
int resolution;
char buf[FILE_TIMESTAMP_PRINT_LEN_BOUND + 1];
file_timestamp_sprintf (buf, file_timestamp_now (&resolution));
print_version ();
printf (_("\n# Make data base, printed on %s"), safer_ctime (&when));
printf (_("\n# Make data base, printed on %s\n"), buf);
print_variable_data_base ();
print_dir_data_base ();
@@ -3779,8 +3740,8 @@ print_data_base (void)
print_vpath_data_base ();
strcache_print_stats ("#");
when = time_now ();
printf (_("\n# Finished Make data base on %s\n"), safer_ctime (&when));
file_timestamp_sprintf (buf, file_timestamp_now (&resolution));
printf (_("\n# Finished Make data base on %s\n\n"), buf);
}
static void