op public repos

Commit Diff

Commit:: 8a2c07d715dea281c0887cb83cced2593c550c5f
From:: Omar Polo <op@omarpolo.com>
Date:: Sun Jan 9 17:19:23 2022 UTC
Message:: fix build on linux
Actions:: Patch | Tree
commit - 97327839af8154f3c2d378cacd8010f6ad755685
commit + 8a2c07d715dea281c0887cb83cced2593c550c5f
blob - 59b7d6b81777229668dfbb0bb1aaaca8e126eb8c
blob + cb1b9bd93046bd4c4738c07cece523bd7af294aa
--- compat/vis.h
+++ compat/vis.h
@@ -73,8 +73,6 @@
  */
 #define	UNVIS_END	1	/* no more characters */
 
-#include <sys/cdefs.h>
-
 char	*vis(char *, int, int, int);
 int	strvis(char *, const char *, int);
 int	stravis(char **, const char *, int);
blob - b0515084f057d8663be62be76614f58434f45c2c
blob + b0346a8d6354022bdcf2f51f0cf0786afe344f86
--- kamictl/ctl_parser.c
+++ kamictl/ctl_parser.c
@@ -15,15 +15,11 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/uio.h>
+#include "compat.h"
 
-#include <event.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
-#include <imsg.h>
 
 #include "ctl_parser.h"
 #include "kamid.h"
blob - be14f113641e49a974eaa5f420de82e4b67dccfa
blob + 34607ae1e6d70d9065d0da1719a00985a289f58a
--- kamictl/kamictl.c
+++ kamictl/kamictl.c
@@ -14,20 +14,19 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "compat.h"
+
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
 #include <sys/un.h>
 
-#include <err.h>
-#include <event.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
 #include <unistd.h>
-#include <imsg.h>
 
 #include "ctl_parser.h"
 #include "kamid.h"
blob - 74734329db79092dc0f40c306b3c44998dd8cf27
blob + 0b178a42ff7d5f9f95ce9ded30db61b7162aee21
--- kamid/client.c
+++ kamid/client.c
@@ -14,16 +14,15 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "compat.h"
+
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <sys/queue.h>
 #include <sys/uio.h>
 
 #include <dirent.h>
 #include <endian.h>
-#include <err.h>
 #include <errno.h>
-#include <event.h>
 #include <fcntl.h>
 #include <pwd.h>
 #include <signal.h>
@@ -32,7 +31,6 @@
 #include <string.h>
 #include <syslog.h>
 #include <unistd.h>
-#include <imsg.h>
 
 #include "client.h"
 #include "kami.h"
blob - 5d8abc786358b8715dec9ab680a868c59bf80c0d
blob + 2b6985542b6d7383f5f452adbe52744d5ef88ad6
--- kamid/control.c
+++ kamid/control.c
@@ -14,10 +14,11 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "compat.h"
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
-#include <sys/queue.h>
 #include <sys/uio.h>
 #include <sys/un.h>
 
@@ -25,12 +26,10 @@
 #include <net/if.h>
 
 #include <errno.h>
-#include <event.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <imsg.h>
 
 #include "control.h"
 #include "kamid.h"
blob - cd27289756b18d4d7bceb853c1b5d5f210686808
blob + 0c963c740a461c315d0027210d578d980db92bc8
--- kamid/kamid.c
+++ kamid/kamid.c
@@ -18,9 +18,10 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "compat.h"
+
 #include <sys/socket.h>
 #include <sys/types.h>
-#include <sys/queue.h>
 #include <sys/uio.h>
 #include <sys/wait.h>
 
@@ -28,7 +29,6 @@
 #include <netinet/in.h>
 
 #include <errno.h>
-#include <event.h>
 #include <fcntl.h>
 #include <pwd.h>
 #include <signal.h>
@@ -38,7 +38,6 @@
 #include <string.h>
 #include <syslog.h>
 #include <unistd.h>
-#include <imsg.h>
 
 #include "client.h"
 #include "control.h"
blob - 655c05f33499a226890eee263131d3efa95be0b9
blob + 8df8890afda9b5ad12af7a81c69dc416216b8185
--- kamid/listener.c
+++ kamid/listener.c
@@ -18,15 +18,14 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "compat.h"
+
 #include <sys/socket.h>
 #include <sys/types.h>
-#include <sys/tree.h>
-#include <sys/queue.h>
 #include <sys/uio.h>
 
 #include <endian.h>
 #include <errno.h>
-#include <event.h>
 #include <inttypes.h>
 #include <pwd.h>
 #include <signal.h>
@@ -36,7 +35,6 @@
 #include <string.h>
 #include <syslog.h>
 #include <unistd.h>
-#include <imsg.h>
 
 #include "control.h"
 #include "kami.h"
blob - 342a0800da97c13c5140ccfbd7fe240b178499b9
blob + eb8b81009eb6c2d5754323f777bf98fbc29478fb
--- kamid/parse.y
+++ kamid/parse.y
@@ -23,14 +23,12 @@
 
 %{
 
-#include <sys/types.h>
-#include <sys/queue.h>
+#include "compat.h"
+
 #include <sys/stat.h>
 
 #include <ctype.h>
-#include <err.h>
 #include <errno.h>
-#include <event.h>
 #include <inttypes.h>
 #include <limits.h>
 #include <stdarg.h>
@@ -39,7 +37,6 @@
 #include <string.h>
 #include <syslog.h>
 #include <unistd.h>
-#include <imsg.h>
 
 #include "log.h"
 #include "kamid.h"
blob - e7c8a5965571c231fcca030c4048a11e0f7bfd28
blob + 8a4ae8b015c96849c181dd8c0178ff43c0a8c502
--- kamid/table.c
+++ kamid/table.c
@@ -14,15 +14,13 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/types.h>
-#include <sys/queue.h>
+#include "compat.h"
+
 #include <sys/uio.h>
 
-#include <event.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <imsg.h>
 
 #include "log.h"
 #include "utils.h"
blob - e83954e7280640d8f36108cc971e7028a7600c9c
blob + 550bb623efc8f59242d5ce988876022df5e09e01
--- kamid/table_static.c
+++ kamid/table_static.c
@@ -14,15 +14,12 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/queue.h>
+#include "compat.h"
 
-#include <event.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ohash.h>
-#include <imsg.h>
 
 #include "utils.h"
 #include "kamid.h"
blob - 8dd79f8941e896cd85d3f57cd9d5cb8a9d6af4a3
blob + f48cdf9a937efed5fad2ea7fbf0c75acc92f1911
--- kamiftp/ftp.c
+++ kamiftp/ftp.c
@@ -14,14 +14,14 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "compat.h"
+
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 
 #include <assert.h>
-#include <err.h>
 #include <errno.h>
-#include <event.h>
 #include <fcntl.h>
 #include <inttypes.h>
 #include <netdb.h>
@@ -33,7 +33,6 @@
 #include <syslog.h>
 #include <tls.h>
 #include <unistd.h>
-#include <util.h>
 
 #if HAVE_LIBREADLINE
 #include <readline/readline.h>
blob - d811e395f1890a7cf094ee8612574ff27b3e5763
blob + 4e8ce1ff3db895b71d5e0264b8eb3e1ca270020c
--- kamirepl/kamirepl.c
+++ kamirepl/kamirepl.c
@@ -14,6 +14,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "compat.h"
+
 #include <sys/types.h>
 #include <sys/socket.h>
 
@@ -21,9 +23,7 @@
 
 #include <assert.h>
 #include <endian.h>
-#include <err.h>
 #include <errno.h>
-#include <event.h>
 #include <fcntl.h>
 #include <inttypes.h>
 #include <signal.h>
@@ -33,7 +33,6 @@
 #include <syslog.h>
 #include <tls.h>
 #include <unistd.h>
-#include <vis.h>
 
 #include "9pclib.h"
 #include "kami.h"
blob - 41698f3563582a33b0dcd1b46aac1564ca3e56c0
blob + c9cc93ca244ecef5eedfab354ec8bc7c3ce57f98
--- lib/9pclib.c
+++ lib/9pclib.c
@@ -14,8 +14,9 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "compat.h"
+
 #include <endian.h>
-#include <event.h>
 #include <inttypes.h>
 #include <string.h>
 
blob - 362b9c4cbfe5998442528d99f3faaa2315f44972
blob + 859eb2b7dc29fb815517252d515596e8a2c801f3
--- lib/log.c
+++ lib/log.c
@@ -14,6 +14,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "compat.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
blob - 408dec92e050085f6a48c675e9cb0dde00869cd4
blob + ad34f705b7da07948450ea1d2a3ee510061e9cc2
--- lib/log.h
+++ lib/log.h
@@ -18,7 +18,6 @@
 #define LOG_H
 
 #include <stdarg.h>
-#include <sys/cdefs.h>
 
 void	log_init(int, int);
 void	log_procinit(const char *);
blob - cf1ac0e9438622950da2943dd9476e842bc8531c
blob + 03d5397f7dfc5cb6f74e0789bf83c8db9e0395b0
--- lib/sandbox.c
+++ lib/sandbox.c
@@ -14,6 +14,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "compat.h"
+
 #include "log.h"
 #include "sandbox.h"
 
blob - 19c5accb28cf9b5a472ffc64462f0fd1e645a970
blob + 1f3e5488dc446718a1b1729cd834f81a70446bb8
--- lib/utils.c
+++ lib/utils.c
@@ -14,17 +14,16 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "compat.h"
+
 #include <sys/types.h>
-#include <sys/queue.h>
 #include <sys/uio.h>
 
-#include <event.h>
 #include <ctype.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <imsg.h>
 
 #include "kami.h"
 #include "log.h"
blob - be7be3e1e7d43208a380f99283ed303709a37d0f
blob + ab28e8217ef5a3cca017a41636e3c3a11bbcc1b6
--- lib/utils.h
+++ lib/utils.h
@@ -17,8 +17,6 @@
 #ifndef UTILS_H
 #define UTILS_H
 
-#include <imsg.h>
-
 #define MIN(a, b) ((a) < (b) ? (a) : (b))
 
 struct imsgev {
blob - d8897db51f613efeec14222cf68a621ef949d128
blob + 3632bb8dc410be1c8d57a49826af5b7561514770
--- ninepscript/parse.y
+++ ninepscript/parse.y
@@ -23,12 +23,10 @@
 
 %{
 
-#include <sys/queue.h>
+#include "compat.h"
 
 #include <ctype.h>
-#include <err.h>
 #include <errno.h>
-#include <event.h>
 #include <inttypes.h>
 #include <limits.h>
 #include <limits.h>
blob - c6b2837f20fc239ffd568d478a748fd27272ed11
blob + 6bf46bf5f04cbfb62de38d738bcc22ccf9be93ad
--- ninepscript/script.c
+++ ninepscript/script.c
@@ -14,16 +14,15 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/queue.h>
+#include "compat.h"
+
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 
 #include <assert.h>
 #include <endian.h>
-#include <err.h>
 #include <errno.h>
-#include <event.h>
 #include <fcntl.h>
 #include <inttypes.h>
 #include <poll.h>
@@ -1710,7 +1709,7 @@ main(int argc, char **argv)
 	if (pat == NULL)
 		pat = ".*";
 
-	if (regcomp(&reg, pat, REG_BASIC | REG_ICASE | REG_NOSUB) != 0)
+	if (regcomp(&reg, pat, REG_ICASE | REG_NOSUB) != 0)
 		fatalx("invalid regexp: %s", pat);
 
 	for (i = 0; i < argc; ++i)