logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git

0005-Avoid-use-of-statement-expressions.patch (8931B)

    

  1. From 979d85c842898463192c7e7dae87798c1df6d471 Mon Sep 17 00:00:00 2001
  2. From: Michael Forney <mforney@mforney.org>
  3. Date: Fri, 30 Apr 2021 20:02:41 -0700
  4. Subject: [PATCH] Avoid use of statement-expressions
  6. ---
  7.  Makefile.am   |  2 +-
  8.  acpi_listen.c |  6 +++---
  9.  acpid.c       |  4 ++--
  10.  event.c       |  5 +++--
  11.  input_layer.c |  4 ++--
  12.  libc_compat.h | 40 ----------------------------------------
  13.  libnetlink.c  | 17 +++++++++--------
  14.  netlink.c     |  4 ++--
  15.  proc.c        |  5 +++--
  16.  ud_socket.c   |  5 +++--
  17.  10 files changed, 28 insertions(+), 64 deletions(-)
  18.  delete mode 100644 libc_compat.h
  20. diff --git a/Makefile.am b/Makefile.am
  21. index 417528f..1c80ca4 100644
  22. --- a/Makefile.am
  23. +++ b/Makefile.am
  24. @@ -14,7 +14,7 @@ bin_PROGRAMS = acpi_listen
  25.  
  26.  acpid_SOURCES = acpid.c acpi_ids.c connection_list.c event.c input_layer.c inotify_handler.c libnetlink.c log.c netlink.c proc.c sock.c ud_socket.c \
  27.  				acpid.h  acpi_genetlink.h  acpi_ids.h  config.h  connection_list.h  event.h  genetlink.h  inotify_handler.h  input_layer.h  \
  28. -				libnetlink.h  log.h  netlink.h  proc.h  sock.h  ud_socket.h  libc_compat.h
  29. +				libnetlink.h  log.h  netlink.h  proc.h  sock.h  ud_socket.h
  30.  
  31.  acpi_listen_SOURCES = acpi_listen.c log.c ud_socket.c
  32.  
  33. diff --git a/acpi_listen.c b/acpi_listen.c
  34. index 63a1cc3..674cc80 100644
  35. --- a/acpi_listen.c
  36. +++ b/acpi_listen.c
  37. @@ -39,8 +39,6 @@
  38.  #include "acpid.h"
  39.  #include "ud_socket.h"
  40.  
  41. -#include "libc_compat.h"
  42. -
  43.  static int handle_cmdline(int *argc, char ***argv);
  44.  static char *read_line(int fd);
  45.  
  46. @@ -217,8 +215,10 @@ read_line(int fd)
  47.  		memset(buf+i, 0, buflen-i);
  48.  
  49.  		while (i < buflen) {
  50. -			r = TEMP_FAILURE_RETRY (read(fd, buf+i, 1) );
  51. +			r = read(fd, buf+i, 1);
  52.  			if (r < 0) {
  53. +				if (errno == EINTR)
  54. +					continue;
  55.  				/* we should do something with the data */
  56.  				fprintf(stderr, "ERR: read(): %s\n",
  57.  					strerror(errno));
  58. diff --git a/acpid.c b/acpid.c
  59. index cb1875a..6538578 100644
  60. --- a/acpid.c
  61. +++ b/acpid.c
  62. @@ -41,7 +41,6 @@
  63.  #include "input_layer.h"
  64.  #include "inotify_handler.h"
  65.  #include "netlink.h"
  66. -#include "libc_compat.h"
  67.  
  68.  static int handle_cmdline(int *argc, char ***argv);
  69.  static void close_fds(void);
  70. @@ -153,7 +152,8 @@ main(int argc, char **argv)
  71.  		readfds = *get_fdset();
  72.  
  73.  		/* wait on data */
  74. -		nready = TEMP_FAILURE_RETRY(select(get_highestfd() + 1, &readfds, NULL, NULL, NULL));
  75. +		do nready = select(get_highestfd() + 1, &readfds, NULL, NULL, NULL);
  76. +		while (nready == -1 && errno == EINTR);
  77.  
  78.  		if (nready < 0) {
  79.  			acpid_log(LOG_ERR, "select(): %s", strerror(errno));
  80. diff --git a/event.c b/event.c
  81. index 6c67062..033466e 100644
  82. --- a/event.c
  83. +++ b/event.c
  84. @@ -39,7 +39,6 @@
  85.  #include "log.h"
  86.  #include "sock.h"
  87.  #include "ud_socket.h"
  88. -#include "libc_compat.h"
  89.  
  90.  #include "event.h"
  91.  /*
  92. @@ -754,8 +753,10 @@ safe_write(int fd, const char *buf, int len)
  93.  	int ntries = NTRIES;
  94.  
  95.  	do {
  96. -		r = TEMP_FAILURE_RETRY (write(fd, buf+ttl, len-ttl) );
  97. +		r = write(fd, buf+ttl, len-ttl);
  98.  		if (r < 0) {
  99. +			if (errno == EINTR)
  100. +				continue;
  101.  			if (errno != EAGAIN) {
  102.  				/* a legit error */
  103.  				return r;
  104. diff --git a/input_layer.c b/input_layer.c
  105. index 00246b3..f6bddef 100644
  106. --- a/input_layer.c
  107. +++ b/input_layer.c
  108. @@ -42,7 +42,6 @@
  109.  #include "log.h"
  110.  #include "connection_list.h"
  111.  #include "event.h"
  112. -#include "libc_compat.h"
  113.  
  114.  #include "input_layer.h"
  115.  
  116. @@ -352,7 +351,8 @@ static void process_input(int fd)
  117.  	struct connection *c;
  118.  	char str2[100];
  119.  
  120. -	nbytes = TEMP_FAILURE_RETRY ( read(fd, &event, sizeof(event)) );
  121. +	do nbytes = read(fd, &event, sizeof(event));
  122. +	while (nbytes == -1 && errno == EINTR);
  123.  
  124.  	if (nbytes == 0) {
  125.  		acpid_log(LOG_WARNING, "input layer connection closed");
  126. diff --git a/libc_compat.h b/libc_compat.h
  127. deleted file mode 100644
  128. index 39f2336..0000000
  129. --- a/libc_compat.h
  130. +++ /dev/null
  131. @@ -1,40 +0,0 @@
  132. -/*
  133. - *  libc_compat.h - implement defs/macros missing from some libcs
  134. - *
  135. - *  Copyright (C) 1999-2000 Andrew Henroid
  136. - *  Copyright (C) 2001 Sun Microsystems
  137. - *  Portions Copyright (C) 2004 Tim Hockin (thockin@hockin.org)
  138. - *
  139. - *  This program is free software; you can redistribute it and/or modify
  140. - *  it under the terms of the GNU General Public License as published by
  141. - *  the Free Software Foundation; either version 2 of the License, or
  142. - *  (at your option) any later version.
  143. - *
  144. - *  This program is distributed in the hope that it will be useful,
  145. - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  146. - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  147. - *  GNU General Public License for more details.
  148. - *
  149. - *  You should have received a copy of the GNU General Public License
  150. - *  along with this program; if not, write to the Free Software
  151. - *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  152. - */
  153. -
  154. -#ifndef LIBC_COMPAT_H__
  155. -#define LIBC_COMPAT_H__
  156. -
  157. -/* Evaluate EXPRESSION, and repeat as long as it returns -1 with `errno'
  158. -   set to EINTR. This macro is present on glibc/uclibc but may not be in other cases.  */
  159. -
  160. -#ifndef ____GLIBC__
  161. -#ifndef TEMP_FAILURE_RETRY
  162. -#define TEMP_FAILURE_RETRY(expression) \
  163. -  (__extension__                                                             \
  164. -    ({ long int __result;                                                    \
  165. -       do __result = (long int) (expression);                                \
  166. -       while (__result == -1L && errno == EINTR);                            \
  167. -       __result; }))
  168. -#endif
  169. -#endif /* __GLIBC__ */
  170. -
  171. -#endif /* LIBC_COMPAT_H__ */
  172. diff --git a/libnetlink.c b/libnetlink.c
  173. index d94bd5f..7ad00df 100644
  174. --- a/libnetlink.c
  175. +++ b/libnetlink.c
  176. @@ -31,8 +31,6 @@
  177.  #include <time.h>
  178.  #include <sys/uio.h>
  179.  
  180. -#include "libc_compat.h"
  181. -
  182.  #include "libnetlink.h"
  183.  
  184.  void rtnl_close(struct rtnl_handle *rth)
  185. @@ -180,10 +178,11 @@ int rtnl_dump_filter(struct rtnl_handle *rth,
  186.  		struct nlmsghdr *h;
  187.  
  188.  		iov.iov_len = sizeof(buf);
  189. -		status = TEMP_FAILURE_RETRY ( recvmsg(rth->fd, &msg, MSG_CMSG_CLOEXEC) );
  190. +		status = recvmsg(rth->fd, &msg, MSG_CMSG_CLOEXEC);
  191.  
  192.  		if (status < 0) {
  193. -			perror("OVERRUN");
  194. +			if (errno != EINTR)
  195. +				perror("OVERRUN");
  196.  			continue;
  197.  		}
  198.  
  199. @@ -281,10 +280,11 @@ int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer,
  200.  
  201.  	while (1) {
  202.  		iov.iov_len = sizeof(buf);
  203. -		status = TEMP_FAILURE_RETRY ( recvmsg(rtnl->fd, &msg, MSG_CMSG_CLOEXEC) );
  204. +		status = recvmsg(rtnl->fd, &msg, MSG_CMSG_CLOEXEC);
  205.  
  206.  		if (status < 0) {
  207. -			perror("OVERRUN");
  208. +			if (errno != EINTR)
  209. +				perror("OVERRUN");
  210.  			continue;
  211.  		}
  212.  		if (status == 0) {
  213. @@ -383,10 +383,11 @@ int rtnl_listen(struct rtnl_handle *rtnl,
  214.  	iov.iov_base = buf;
  215.  	while (1) {
  216.  		iov.iov_len = sizeof(buf);
  217. -		status = TEMP_FAILURE_RETRY ( recvmsg(rtnl->fd, &msg, MSG_CMSG_CLOEXEC) );
  218. +		status = recvmsg(rtnl->fd, &msg, MSG_CMSG_CLOEXEC);
  219.  
  220.  		if (status < 0) {
  221. -			perror("OVERRUN");
  222. +			if (errno != EINTR)
  223. +				perror("OVERRUN");
  224.  			continue;
  225.  		}
  226.  		if (status == 0) {
  227. diff --git a/netlink.c b/netlink.c
  228. index 8254762..695bb33 100644
  229. --- a/netlink.c
  230. +++ b/netlink.c
  231. @@ -48,7 +48,6 @@
  232.  #include "libnetlink.h"
  233.  #include "genetlink.h"
  234.  #include "acpi_genetlink.h"
  235. -#include "libc_compat.h"
  236.  
  237.  #include "acpi_ids.h"
  238.  #include "connection_list.h"
  239. @@ -151,7 +150,8 @@ process_netlink(int fd)
  240.  	iov.iov_len = sizeof(buf);
  241.  	
  242.  	/* read the data into the buffer */
  243. -	status = TEMP_FAILURE_RETRY ( recvmsg(fd, &msg, MSG_CMSG_CLOEXEC) );
  244. +	do status = recvmsg(fd, &msg, MSG_CMSG_CLOEXEC);
  245. +	while (status == -1 && errno == EINTR);
  246.  
  247.  	/* if there was a problem, print a message and keep trying */
  248.  	if (status < 0) {
  249. diff --git a/proc.c b/proc.c
  250. index f96b913..295cb73 100644
  251. --- a/proc.c
  252. +++ b/proc.c
  253. @@ -31,7 +31,6 @@
  254.  #include "log.h"
  255.  #include "event.h"
  256.  #include "connection_list.h"
  257. -#include "libc_compat.h"
  258.  
  259.  #include "proc.h"
  260.  
  261. @@ -137,8 +136,10 @@ read_line(int fd)
  262.  
  263.  		/* only go to BUFLEN-1 so there will always be a 0 at the end */
  264.  		while (i < BUFLEN-1) {
  265. -			r = TEMP_FAILURE_RETRY(read(fd, buf+i, 1));
  266. +			r = read(fd, buf+i, 1);
  267.  			if (r < 0) {
  268. +				if (errno == EINTR)
  269. +					continue;
  270.  				/* we should do something with the data */
  271.  				acpid_log(LOG_ERR, "read(): %s",
  272.  					strerror(errno));
  273. diff --git a/ud_socket.c b/ud_socket.c
  274. index 83b2aa9..15a3b4a 100644
  275. --- a/ud_socket.c
  276. +++ b/ud_socket.c
  277. @@ -21,7 +21,6 @@
  278.  #include "acpid.h"
  279.  #include "log.h"
  280.  #include "ud_socket.h"
  281. -#include "libc_compat.h"
  282.  
  283.  int
  284.  ud_create_socket(const char *name, mode_t socketmode)
  285. @@ -87,8 +86,10 @@ ud_accept(int listenfd, struct ucred *cred)
  286.  		struct sockaddr_un cliaddr;
  287.  		socklen_t len = sizeof(struct sockaddr_un);
  288.  
  289. -		newsock = TEMP_FAILURE_RETRY (accept4(listenfd, (struct sockaddr *)&cliaddr, &len, SOCK_CLOEXEC|SOCK_NONBLOCK));
  290. +		newsock = accept4(listenfd, (struct sockaddr *)&cliaddr, &len, SOCK_CLOEXEC|SOCK_NONBLOCK);
  291.  		if (newsock < 0) {
  292. +			if (errno == EINTR)
  293. +				continue;
  294.  			return newsock;
  295.  		}
  296.  		if (cred) {
  297. -- 
  298. 2.37.3