mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH] scripts/kwboot: Fix normalizing timeval
@ 2021-11-30 16:03 Uwe Kleine-König
  2021-12-07  9:07 ` Sascha Hauer
  0 siblings, 1 reply; 2+ messages in thread
From: Uwe Kleine-König @ 2021-11-30 16:03 UTC (permalink / raw)
  To: barebox

If tv.tv_usec is 1000000 the structure needs normalizing, too. So the
right check would be:

	if (tv.tv_usec >= 1000000) {
		...

But as normalizing doesn't destroy anything even for smaller values,
just do it unconditionally to simplify a bit.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 scripts/kwboot.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/scripts/kwboot.c b/scripts/kwboot.c
index 60e8a69d187d..1cbb456935f2 100644
--- a/scripts/kwboot.c
+++ b/scripts/kwboot.c
@@ -147,12 +147,11 @@ kwboot_tty_recv(int fd, void *buf, size_t len, int timeo)
 	FD_ZERO(&rfds);
 	FD_SET(fd, &rfds);
 
-	tv.tv_sec = 0;
 	tv.tv_usec = timeo * 1000;
-	if (tv.tv_usec > 1000000) {
-		tv.tv_sec += tv.tv_usec / 1000000;
-		tv.tv_usec %= 1000000;
-	}
+
+	/* normalize timeval */
+	tv.tv_sec = tv.tv_usec / 1000000;
+	tv.tv_usec %= 1000000;
 
 	do {
 		nfds = select(fd + 1, &rfds, NULL, NULL, &tv);

base-commit: f2dd8896846757829fb3033f41b89be3fc037d78
-- 
2.30.2


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-12-07  9:14 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-30 16:03 [PATCH] scripts/kwboot: Fix normalizing timeval Uwe Kleine-König
2021-12-07  9:07 ` Sascha Hauer

mail archive of the barebox mailing list

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://lore.barebox.org/barebox/0 barebox/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 barebox barebox/ https://lore.barebox.org/barebox \
		barebox@lists.infradead.org barebox@lists.infradead.org
	public-inbox-index barebox

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git