External/passt
1
0
Fork 0
mirror of https://passt.top/passt synced 2024-06-29 22:42:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

log: Avoid time_t/__syscall_slong_t format mismatch with long int on X32 ABI

Browse Source 
On X32 (ILP32 using AMD64 system call ABI) and glibc,
struct timespec::tv_nsec is __syscall_slong_t and not a long int, see
also https://sourceware.org/bugzilla/show_bug.cgi?id=16437 and
timespec(3type). Fine, we could cast that down to long and be done
with it.

But it turns out that also time_t (not guaranteed to be equivalent to
any type) is a long long int, and there we can't downcast.

To keep it simple, cast both to long long int, and change formats to
%lli, to avoid format warnings from gcc.

Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Stefano Brivio 2023-03-10 23:15:35 +01:00
parent 70c0765b49
commit 4e6178fd46
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
log.c
View File

@ -53,9 +53,9 @@ void name(const char *format, ...) { \
\ \
if (setlogmask(0) & LOG_MASK(LOG_DEBUG) && log_file == -1) { \ if (setlogmask(0) & LOG_MASK(LOG_DEBUG) && log_file == -1) { \
clock_gettime(CLOCK_REALTIME, &tp); \ clock_gettime(CLOCK_REALTIME, &tp); \
fprintf(stderr, "%li.%04li: ", \ fprintf(stderr, "%lli.%04lli: ", \
tp.tv_sec - log_start, \ (long long int)tp.tv_sec - log_start, \
tp.tv_nsec / (100L * 1000)); \ (long long int)tp.tv_nsec / (100L * 1000)); \
} \ } \
\ \
if ((LOG_MASK(LOG_PRI(level)) & log_mask) || BEFORE_DAEMON) { \ if ((LOG_MASK(LOG_PRI(level)) & log_mask) || BEFORE_DAEMON) { \
@ -225,8 +225,9 @@ static void logfile_rotate_fallocate(int fd, struct timespec *ts)
return; return;
n = snprintf(buf, BUFSIZ, n = snprintf(buf, BUFSIZ,
"%s - log truncated at %li.%04li", log_header, "%s - log truncated at %lli.%04lli", log_header,
ts->tv_sec - log_start, ts->tv_nsec / (100L * 1000)); (long long int)(ts->tv_sec - log_start),
(long long int)(ts->tv_nsec / (100L * 1000)));
/* Avoid partial lines by padding the header with spaces */ /* Avoid partial lines by padding the header with spaces */
nl = memchr(buf + n + 1, '\n', BUFSIZ - n - 1); nl = memchr(buf + n + 1, '\n', BUFSIZ - n - 1);
@ -256,9 +257,9 @@ static void logfile_rotate_move(int fd, struct timespec *ts)
char buf[BUFSIZ], *nl; char buf[BUFSIZ], *nl;
header_len = snprintf(buf, BUFSIZ, header_len = snprintf(buf, BUFSIZ,
"%s - log truncated at %li.%04li\n", log_header, "%s - log truncated at %lli.%04lli\n", log_header,
ts->tv_sec - log_start, (long long int)(ts->tv_sec - log_start),
ts->tv_nsec / (100L * 1000)); (long long int)(ts->tv_nsec / (100L * 1000)));
if (lseek(fd, 0, SEEK_SET) == -1) if (lseek(fd, 0, SEEK_SET) == -1)
return; return;
if (write(fd, buf, header_len) == -1) if (write(fd, buf, header_len) == -1)
@ -349,8 +350,9 @@ void logfile_write(int pri, const char *format, va_list ap)
if (clock_gettime(CLOCK_REALTIME, &ts)) if (clock_gettime(CLOCK_REALTIME, &ts))
return; return;
n = snprintf(buf, BUFSIZ, "%li.%04li: %s", n = snprintf(buf, BUFSIZ, "%lli.%04lli: %s",
ts.tv_sec - log_start, ts.tv_nsec / (100L * 1000), (long long int)(ts.tv_sec - log_start),
(long long int)(ts.tv_nsec / (100L * 1000)),
logfile_prefix[pri]); logfile_prefix[pri]);
n += vsnprintf(buf + n, BUFSIZ - n, format, ap); n += vsnprintf(buf + n, BUFSIZ - n, format, ap);