From: Martin Jansa <martin.jansa@gmail.com>
To: meta-virtualization@lists.yoctoproject.org
Cc: Ola x Nilsson <olani@axis.com>, Martin Jansa <martin.jansa@gmail.com>
Subject: [PATCHv2] diod: Build in 32bit systems with 64bit time_t
Date: Sat, 20 Apr 2024 09:29:17 +0200 [thread overview]
Message-ID: <20240420072917.914160-1-martin.jansa@gmail.com> (raw)
From: Ola x Nilsson <olani@axis.com>
Signed-off-by: Ola x Nilsson <olani@axis.com>
Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
---
v2: just fixed Author
recipes-extended/diod/diod_1.0.24.bb | 1 +
...ous-time_t-sizes-in-printf-and-scanf.patch | 100 ++++++++++++++++++
2 files changed, 101 insertions(+)
create mode 100644 recipes-extended/diod/files/0002-Handle-various-time_t-sizes-in-printf-and-scanf.patch
diff --git a/recipes-extended/diod/diod_1.0.24.bb b/recipes-extended/diod/diod_1.0.24.bb
index 5e191dc0..6019fbfb 100644
--- a/recipes-extended/diod/diod_1.0.24.bb
+++ b/recipes-extended/diod/diod_1.0.24.bb
@@ -14,6 +14,7 @@ SRC_URI = "git://github.com/chaos/diod.git;protocol=https;branch=master \
file://diod \
file://diod.conf \
file://0001-build-Find-lua-with-pkg-config.patch \
+ file://0002-Handle-various-time_t-sizes-in-printf-and-scanf.patch \
"
DEPENDS = "libcap ncurses tcp-wrappers lua"
diff --git a/recipes-extended/diod/files/0002-Handle-various-time_t-sizes-in-printf-and-scanf.patch b/recipes-extended/diod/files/0002-Handle-various-time_t-sizes-in-printf-and-scanf.patch
new file mode 100644
index 00000000..3c13c101
--- /dev/null
+++ b/recipes-extended/diod/files/0002-Handle-various-time_t-sizes-in-printf-and-scanf.patch
@@ -0,0 +1,100 @@
+From 04b0c5a5cb9e32090b177ff7327ad3260783abe0 Mon Sep 17 00:00:00 2001
+From: Ola x Nilsson <olani@axis.com>
+Date: Mon, 15 Apr 2024 17:31:44 +0200
+Subject: [PATCH] Handle various time_t sizes in printf and scanf
+
+The members of the timeval struct are both signed (defined by POSIX)
+and typically both 64 bits on a system where time_t is 64 bits. This
+is possible also on 32 bit systems where time_t is larger to handle
+the 2038 problem.
+
+It's practically impossible to find a type and printf format that
+works even on all glibc systems. Play it safe and always use printf
+with intmax_t and explict int64_t variables for scanf.
+
+Upstream-Status: Submitted [https://github.com/chaos/diod/pull/100]
+Signed-off-by: Ola x Nilsson <olani@axis.com>
+---
+ libnpfs/conn.c | 5 +++--
+ libnpfs/ctl.c | 7 ++++---
+ utils/dioddate.c | 8 +++++++-
+ 3 files changed, 14 insertions(+), 6 deletions(-)
+
+diff --git a/libnpfs/conn.c b/libnpfs/conn.c
+index 6e85fff..c34c840 100644
+--- a/libnpfs/conn.c
++++ b/libnpfs/conn.c
+@@ -16,6 +16,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdint.h>
++#include <inttypes.h>
+ #include <stdarg.h>
+ #include <errno.h>
+ #include <pthread.h>
+@@ -133,8 +134,8 @@ _debug_trace (Npsrv *srv, Npfcall *fc)
+ (void)gettimeofday(&b, NULL);
+ (void)gettimeofday(&a, NULL);
+ timersub(&a, &b, &c);
+- np_logmsg(srv, "[%lu.%-3lu] %s",
+- c.tv_sec, c.tv_usec/1000, s);
++ np_logmsg(srv, "[%"PRIdMAX".%-3"PRIdMAX"] %s",
++ (intmax_t)c.tv_sec, (intmax_t)c.tv_usec/1000, s);
+ } else
+ np_logmsg(srv, "%s", s);
+ }
+diff --git a/libnpfs/ctl.c b/libnpfs/ctl.c
+index f40cde4..317a22e 100644
+--- a/libnpfs/ctl.c
++++ b/libnpfs/ctl.c
+@@ -16,6 +16,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdint.h>
++#include <inttypes.h>
+ #include <stdarg.h>
+ #include <pthread.h>
+ #include <errno.h>
+@@ -291,9 +292,9 @@ _ctl_get_date (char *name, void *a)
+ np_uerror (errno);
+ goto error;
+ }
+- if (aspf (&s, &len, "%lu.%lu %d.%d\n",
+- tv.tv_sec, tv.tv_usec,
+- tz.tz_minuteswest, tz.tz_dsttime) < 0) {
++ if (aspf (&s, &len, "%"PRIdMAX".%"PRIdMAX" %d.%d\n",
++ (uintmax_t)tv.tv_sec, (uintmax_t)tv.tv_usec,
++ tz.tz_minuteswest, tz.tz_dsttime) < 0) {
+ np_uerror (ENOMEM);
+ goto error;
+ }
+diff --git a/utils/dioddate.c b/utils/dioddate.c
+index bde002f..f392792 100644
+--- a/utils/dioddate.c
++++ b/utils/dioddate.c
+@@ -21,6 +21,7 @@
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <stdint.h>
++#include <inttypes.h>
+ #include <stdarg.h>
+ #include <stdio.h>
+ #if HAVE_GETOPT_H
+@@ -142,11 +143,16 @@ main (int argc, char *argv[])
+ errn (np_rerror (), "error reading date");
+ goto done;
+ }
+- if (sscanf (buf, "%lu.%lu %d.%d", &tv.tv_sec, &tv.tv_usec,
++
++ int64_t sec = 0, usec = 0;
++ if (sscanf (buf, "%"SCNd64".%"SCNd64" %d.%d", &sec, &usec,
+ &tz.tz_minuteswest, &tz.tz_dsttime) != 4) {
+ msg ("error scanning returned date: %s", buf);
+ goto done;
+ }
++ tv.tv_sec = sec;
++ tv.tv_usec = usec;
++
+ if (Sopt) {
+ if (settimeofday (&tv, &tz) < 0)
+ err_exit ("settimeofday");
--
2.44.0
next reply other threads:[~2024-04-20 7:29 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-20 7:29 Martin Jansa [this message]
2024-04-20 16:10 ` [meta-virtualization] [PATCHv2] diod: Build in 32bit systems with 64bit time_t Khem Raj
2024-04-22 1:29 ` Bruce Ashfield
2024-04-22 10:14 ` Ola x Nilsson
2024-04-22 10:37 ` Martin Jansa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240420072917.914160-1-martin.jansa@gmail.com \
--to=martin.jansa@gmail.com \
--cc=meta-virtualization@lists.yoctoproject.org \
--cc=olani@axis.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).