X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=tfc_misc.c;h=44e1117be6342ec710d8e6848824cd55b9d6f895;hb=92b6bb91a5be9fc1b4d300f99b239cb8e3a6398d;hp=f55726ac897974471b33f9ad4422bc4463ddccfe;hpb=f761a53231d1a023e2d3e5efcc5591b04a34f98a;p=tfcrypt.git

diff --git a/tfc_misc.c b/tfc_misc.c
index f55726a..44e1117 100644
--- a/tfc_misc.c
+++ b/tfc_misc.c
@@ -85,15 +85,48 @@ const char *tfc_modename(int mode)
 
 void tfc_getcurtime(tfc_useconds *tx)
 {
-	struct timeval t;
+	struct timespec t;
 	memset(&t, 0, sizeof(t));
 
-	gettimeofday(&t, NULL);
-	*tx = t.tv_sec * 1000000 + t.tv_usec;
+	clock_gettime(CLOCK_MONOTONIC, &t);
+	*tx = (tfc_useconds)t.tv_sec * 1000000 + (t.tv_nsec / 1000);
 
 	memset(&t, 0, sizeof(t));
 }
 
+char *tfc_format_time(tfc_useconds t)
+{
+	tfc_useconds secs, dsecs;
+	unsigned days, hours, minutes, seconds;
+	static char r[128];
+
+	secs = (tfc_useconds)TFC_UTODSECS(t);
+	dsecs = (tfc_useconds)(t - (secs * 1000000));
+
+	days = secs / 86400;
+	hours = (secs / 3600) % 24;
+	minutes = (secs / 60) % 60;
+	seconds = secs % 60;
+
+	if (days > 0) sprintf(r, "%ud,%02u:%02u:%02u.%04u", days, hours, minutes, seconds, (unsigned)(dsecs / 100));
+	else if (hours > 0) sprintf(r, "%02u:%02u:%02u.%04u", hours, minutes, seconds, (unsigned)(dsecs / 100));
+	else if (minutes > 0) sprintf(r, "%02u:%02u.%04u", minutes, seconds, (unsigned)(dsecs / 100));
+	else sprintf(r, "%02u.%04u", seconds, (unsigned)(dsecs / 100));
+
+	return r;
+}
+
+char *tfc_format_pid(const char *str)
+{
+	static char r[128];
+	size_t n;
+
+	n = xstrlcpy(r, str, sizeof(r));
+	if (show_pid == YES && sizeof(r)-n >= 22) sprintf(r+n, "[%lu]", (unsigned long)progpid);
+
+	return r;
+}
+
 tfc_fsize tfc_fdsize(int fd)
 {
 	off_t l, cur;
@@ -113,7 +146,7 @@ tfc_fsize tfc_fdgetpos(int fd)
 	off_t t;
 
 	t = lseek(fd, 0L, SEEK_CUR);
-	if (t == -1) return NOFSIZE;
+	if (t == (off_t)-1) return NOFSIZE;
 	return (tfc_fsize)t;
 }