isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Store milliseconds in the debug file timestamp.

Browse Source 
Sometime second granularity is not enough.
This commit is contained in:
Todd C. Miller
2021-09-17 10:55:06 -06:00
parent 78eb240642
commit 46d71c4360
1 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
lib/util/sudo_debug.c
View File

@@ -24,6 +24,7 @@
#include <config.h> #include <config.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/time.h>
#include <sys/uio.h> #include <sys/uio.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@@ -606,11 +607,31 @@ void
sudo_debug_write2_v1(int fd, const char *func, const char *file, int lineno, sudo_debug_write2_v1(int fd, const char *func, const char *file, int lineno,
const char *str, int len, int errnum) const char *str, int len, int errnum)
{ {
char *timestr, numbuf[(((sizeof(int) * 8) + 2) / 3) + 2]; char numbuf[(((sizeof(int) * 8) + 2) / 3) + 2];
time_t now; char timebuf[64];
struct timeval tv;
struct iovec iov[12]; struct iovec iov[12];
int iovcnt = 3; int iovcnt = 3;
/* Cannot use sudo_gettime_real() here since it calls sudo_debug. */
timebuf[0] = '\0';
if (gettimeofday(&tv, NULL) != -1) {
time_t now = tv.tv_sec;
struct tm *tm = localtime(&now);
if (tm != NULL) {
size_t tlen = strftime(timebuf, sizeof(timebuf), "%b %e %H:%M:%S", tm);
if (tlen == 0) {
/* contents are undefined on error */
timebuf[0] = '\0';
} else {
(void)snprintf(timebuf + tlen, sizeof(timebuf) - tlen,
".%03d ", (int)tv.tv_usec / 1000);
}
}
}
iov[0].iov_base = timebuf;
iov[0].iov_len = strlen(timebuf);
/* Prepend program name and pid with a trailing space. */ /* Prepend program name and pid with a trailing space. */
iov[1].iov_base = (char *)getprogname(); iov[1].iov_base = (char *)getprogname();
iov[1].iov_len = strlen(iov[1].iov_base); iov[1].iov_len = strlen(iov[1].iov_base);
@@ -667,14 +688,6 @@ sudo_debug_write2_v1(int fd, const char *func, const char *file, int lineno,
iov[iovcnt].iov_len = 1; iov[iovcnt].iov_len = 1;
iovcnt++; iovcnt++;
/* Do timestamp last due to ctime's static buffer. */
time(&now);
timestr = ctime(&now) + 4;
timestr[15] = ' '; /* replace year with a space */
timestr[16] = '\0';
iov[0].iov_base = timestr;
iov[0].iov_len = 16;
/* Write message in a single syscall */ /* Write message in a single syscall */
ignore_result(writev(fd, iov, iovcnt)); ignore_result(writev(fd, iov, iovcnt));
} }