Merge branch 'master' into coveritycoverity

151 files changed, 10670 insertions, 3290 deletions

diff --git a/.gitignore b/.gitignore
index b251086..99776af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *.o
 *.d
 /bfs
+/tests/mksock
diff --git a/.travis.yml b/.travis.yml
index 7756b52..d7bd7ef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,16 @@ before_install:
   - echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-
 
 addons:
+  apt:
+    packages:
+      - gcc-multilib
+      - acl
+      - libacl1-dev
+      - attr
+      - libattr1-dev
+      - libcap2-bin
+      - libcap-dev
+
   coverity_scan:
     project:
       name: "tavianator/bfs"
diff --git a/COPYING b/COPYING
index f99675f..9a254ab 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright (C) 2015-2017 Tavian Barnes <tavianator@tavianator.com>
+Copyright (C) 2015-2020 Tavian Barnes <tavianator@tavianator.com>
 
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted.
diff --git a/Makefile b/Makefile
index cb6a4a0..5bd8ab8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 ############################################################################
 # bfs                                                                      #
-# Copyright (C) 2015-2017 Tavian Barnes <tavianator@tavianator.com>        #
+# Copyright (C) 2015-2020 Tavian Barnes <tavianator@tavianator.com>        #
 #                                                                          #
 # Permission to use, copy, modify, and/or distribute this software for any #
 # purpose with or without fee is hereby granted.                           #
@@ -15,23 +15,28 @@
 ############################################################################
 
 ifeq ($(wildcard .git),)
-VERSION := 1.2.3
+VERSION := 1.6
 else
 VERSION := $(shell git describe --always)
 endif
 
+ifndef OS
+OS := $(shell uname)
+endif
+
 CC ?= gcc
 INSTALL ?= install
 MKDIR ?= mkdir -p
 RM ?= rm -f
 
-WFLAGS ?= -Wall -Wmissing-declarations
+WFLAGS ?= -Wall -Wmissing-declarations -Wstrict-prototypes
 CFLAGS ?= -g $(WFLAGS)
 LDFLAGS ?=
 DEPFLAGS ?= -MD -MP -MF $(@:.o=.d)
 
 DESTDIR