canutils: remove usleep and bzero

Both removed in POSIX 2008.

Signed-off-by: Rosen Penev <redacted>

diff --git a/utils/canutils/Makefile b/utils/canutils/Makefile
index f4048e23cba58967ea3e72682ef853c03e81e1b6..758dac525907a1471c3dc037b628d2064ce06c34 100644 (file)
--- a/utils/canutils/Makefile
+++ b/utils/canutils/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=canutils
 PKG_VERSION:=2020.02.04
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/linux-can/can-utils/tar.gz/v$(PKG_VERSION)?

diff --git a/utils/canutils/patches/010-bzero.patch b/utils/canutils/patches/010-bzero.patch
new file mode 100644 (file)
index 0000000..cfeebc6
--- /dev/null
+++ b/utils/canutils/patches/010-bzero.patch
@@ -0,0 +1,31 @@
+From 8d2ed4c959039abdcfeaa3fe1e70af0e75be8809 Mon Sep 17 00:00:00 2001
+From: Rosen Penev <rosenp@gmail.com>
+Date: Sun, 11 Oct 2020 22:02:23 -0700
+Subject: [PATCH] jcat: remove bzero
+
+bzero is removed in POSIX 2008. malloc/bzero can also be replaced with
+calloc.
+
+Signed-off-by: Rosen Penev <rosenp@gmail.com>
+---
+ jcat.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/jcat.c b/jcat.c
+index 8335d6e..81ffe04 100644
+--- a/jcat.c
++++ b/jcat.c
+@@ -644,12 +644,10 @@ int main(int argc, char *argv[])
+       struct jcat_priv *priv;
+       int ret;
+ 
+-      priv = malloc(sizeof(*priv));
++      priv = calloc(1, sizeof(*priv));
+       if (!priv)
+               err(EXIT_FAILURE, "can't allocate priv");
+ 
+-      bzero(priv, sizeof(*priv));
+-
+       priv->todo_prio = -1;
+       priv->infile = STDIN_FILENO;
+       priv->outfile = STDOUT_FILENO;

diff --git a/utils/canutils/patches/020-usleep.patch b/utils/canutils/patches/020-usleep.patch
new file mode 100644 (file)
index 0000000..4feb5b8
--- /dev/null
+++ b/utils/canutils/patches/020-usleep.patch
@@ -0,0 +1,85 @@
+From d7df79e6876bed9df9522255f9d24ad5a76b65ce Mon Sep 17 00:00:00 2001
+From: Rosen Penev <rosenp@gmail.com>
+Date: Sun, 11 Oct 2020 22:00:32 -0700
+Subject: [PATCH] convert usleep to nanosleep
+
+usleep is removed in POSIX 2008.
+
+Signed-off-by: Rosen Penev <rosenp@gmail.com>
+---
+ bcmserver.c    | 7 ++++++-
+ canlogserver.c | 6 +++++-
+ isotpserver.c  | 7 ++++++-
+ 3 files changed, 17 insertions(+), 3 deletions(-)
+
+diff --git a/bcmserver.c b/bcmserver.c
+index b51cb2c..3fe092c 100644
+--- a/bcmserver.c
++++ b/bcmserver.c
+@@ -114,6 +114,7 @@
+ #include <string.h>
+ #include <signal.h>
+ #include <errno.h>
++#include <time.h>
+ 
+ #include <sys/types.h>
+ #include <sys/wait.h>
+@@ -180,8 +181,12 @@ int main(void)
+       saddr.sin_port = htons(PORT);
+ 
+       while(bind(sl,(struct sockaddr*)&saddr, sizeof(saddr)) < 0) {
++              struct timespec f = {
++                      .tv_nsec = 100 * 1000 * 1000,
++              };
++
+               printf(".");fflush(NULL);
+-              usleep(100000);
++              nanosleep(&f, NULL);
+       }
+ 
+       if (listen(sl,3) != 0) {
+diff --git a/canlogserver.c b/canlogserver.c
+index 4bcf991..ef338d1 100644
+--- a/canlogserver.c
++++ b/canlogserver.c
+@@ -280,8 +280,12 @@ int main(int argc, char **argv)
+       inaddr.sin_port = htons(port);
+ 
+       while(bind(socki, (struct sockaddr*)&inaddr, sizeof(inaddr)) < 0) {
++              struct timespec f = {
++                      .tv_nsec = 100 * 1000 * 1000,
++              };
++
+               printf(".");fflush(NULL);
+-              usleep(100000);
++              nanosleep(&f, NULL);
+       }
+ 
+       if (listen(socki, 3) != 0) {
+diff --git a/isotpserver.c b/isotpserver.c
+index 91719f0..946169e 100644
+--- a/isotpserver.c
++++ b/isotpserver.c
+@@ -64,6 +64,7 @@
+ #include <string.h>
+ #include <signal.h>
+ #include <errno.h>
++#include <time.h>
+ 
+ #include <sys/types.h>
+ #include <sys/wait.h>
+@@ -298,9 +299,13 @@ int main(int argc, char **argv)
+       saddr.sin_port = htons(local_port);
+ 
+       while(bind(sl,(struct sockaddr*)&saddr, sizeof(saddr)) < 0) {
++              struct timespec f = {
++                      .tv_nsec = 100 * 1000 * 1000,
++              };
++
+               printf(".");
+               fflush(NULL);
+-              usleep(100000);
++              nanosleep(&f, NULL);
+       }
+ 
+       if (listen(sl, 3) != 0) {