lib,bin: only include archive{,_entry}.h where needed.

bin/xbps-checkvers/main.c

@@ -26,18 +26,20 @@
  *
  */
 
+#include <sys/stat.h>
+
+#include <assert.h>
+#include <ctype.h>
+#include <dirent.h>
+#include <errno.h>
 #include <getopt.h>
+#include <limits.h>
 #include <stdbool.h>
-#include <stdio.h>
 #include <stddef.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
-#include <ctype.h>
-#include <dirent.h>
-#include <limits.h>
-#include <sys/stat.h>
-#include <assert.h>
+#include <unistd.h>
 
 #include <xbps.h>
 

bin/xbps-create/main.c

@@ -22,25 +22,30 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include <sys/types.h>
+
+#include <sys/mman.h>
 #include <sys/param.h>
 #include <sys/stat.h>
-#include <sys/mman.h>
-#include <stdio.h>
+#include <sys/types.h>
+
+#include <assert.h>
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <ftw.h>
+#include <getopt.h>
+#include <libgen.h>
+#include <locale.h>
+#include <stdarg.h>
 #include <stdbool.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
-#include <stdarg.h>
-#include <errno.h>
-#include <assert.h>
 #include <unistd.h>
-#include <getopt.h>
-#include <ftw.h>
-#include <fcntl.h>
-#include <libgen.h>
-#include <locale.h>
-#include <dirent.h>
+
+#include <archive.h>
+#include <archive_entry.h>
 
 #include <xbps.h>
 #include "queue.h"

bin/xbps-install/fetch_cb.c

@@ -31,16 +31,20 @@
  */
 
 #include <sys/param.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/time.h>
+#include <sys/types.h>
+
+#include <errno.h>
+#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
-#include <fcntl.h>
+#include <time.h>
+#include <unistd.h>
 
 #include <xbps.h>
+
 #include "defs.h"
 
 static int v_tty; /* stderr is a tty */

bin/xbps-install/util.c

@@ -23,15 +23,17 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdio.h>
-#include <stdbool.h>
-#include <stdlib.h>
+#include <sys/ioctl.h>
+
+#include <assert.h>
 #include <errno.h>
 #include <fnmatch.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <strings.h>
-#include <sys/ioctl.h>
-#include <assert.h>
+#include <unistd.h>
 
 #include <xbps.h>
 #include "defs.h"

bin/xbps-query/show-info-files.c

@@ -23,15 +23,16 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdio.h>
+#include <assert.h>
+#include <errno.h>
+#include <fnmatch.h>
+#include <libgen.h>
+#include <limits.h>
 #include <stdbool.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
-#include <limits.h>
-#include <libgen.h>
-#include <fnmatch.h>
-#include <assert.h>
+#include <unistd.h>
 
 #include <xbps.h>
 #include "defs.h"

bin/xbps-rindex/index-add.c

@@ -24,15 +24,17 @@
  */
 
 #include <sys/stat.h>
-#include <stdio.h>
+
+#include <assert.h>
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <libgen.h>
 #include <stdbool.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
-#include <dirent.h>
-#include <libgen.h>
-#include <assert.h>
-#include <fcntl.h>
+#include <unistd.h>
 
 #include <xbps.h>
 #include "defs.h"

bin/xbps-rindex/index-clean.c

@@ -24,18 +24,21 @@
  */
 
 #include <sys/stat.h>
-#include <stdio.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
+
+#include <assert.h>
 #include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
 #include <libgen.h>
-#include <assert.h>
 #include <pthread.h>
-#include <fcntl.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 #include <xbps.h>
+
 #include "defs.h"
 
 static xbps_dictionary_t dest;

bin/xbps-rindex/remove-obsoletes.c

@@ -24,14 +24,16 @@
  */
 
 #include <sys/stat.h>
-#include <stdio.h>
+
+#include <assert.h>
+#include <dirent.h>
+#include <errno.h>
+#include <libgen.h>
 #include <stdbool.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
-#include <dirent.h>
-#include <libgen.h>
-#include <assert.h>
+#include <unistd.h>
 
 #include <xbps.h>
 #include "defs.h"

bin/xbps-rindex/repoflush.c

@@ -24,17 +24,22 @@
  */
 
 #include <sys/stat.h>
-#include <stdio.h>
+
+#include <assert.h>
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <libgen.h>
 #include <stdbool.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
-#include <dirent.h>
-#include <libgen.h>
-#include <assert.h>
-#include <fcntl.h>
+
+#include <archive.h>
+#include <archive_entry.h>
 
 #include <xbps.h>
+
 #include "defs.h"
 
 bool

include/xbps.h.in

@@ -40,9 +40,6 @@
 #include <xbps/xbps_number.h>
 #include <xbps/xbps_string.h>
 
-#include <archive.h>
-#include <archive_entry.h>
-
 #define XBPS_MAXPATH	512
 #define XBPS_NAME_SIZE	64
 

include/xbps_api_impl.h

@@ -44,13 +44,6 @@
 #include "queue.h"
 #include "compat.h"
 
-#define EXTRACT_FLAGS	ARCHIVE_EXTRACT_SECURE_NODOTDOT | \
-			ARCHIVE_EXTRACT_SECURE_SYMLINKS | \
-			ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS | \
-			ARCHIVE_EXTRACT_TIME | ARCHIVE_EXTRACT_PERM | \
-			ARCHIVE_EXTRACT_UNLINK
-#define FEXTRACT_FLAGS	ARCHIVE_EXTRACT_OWNER | EXTRACT_FLAGS
-
 #ifndef __UNCONST
 #define __UNCONST(a)	((void *)(uintptr_t)(const void *)(a))
 #endif
@@ -59,6 +52,8 @@
 #define __arraycount(x) (sizeof(x) / sizeof(*x))
 #endif
 
+struct archive_entry;
+
 /**
  * @private
  */

lib/archive.c

@@ -29,6 +29,9 @@
 #include <string.h>
 #include <errno.h>
 
+#include <archive.h>
+#include <archive_entry.h>
+
 #include "xbps_api_impl.h"
 
 char HIDDEN *

lib/download.c

@@ -29,18 +29,20 @@
  * From FreeBSD fetch(8):
  * $FreeBSD: src/usr.bin/fetch/fetch.c,v 1.84.2.1 2009/08/03 08:13:06 kensmith Exp $
  */
-
 #include <sys/param.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/time.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
 #include <errno.h>
 #include <fcntl.h>
-#include <sys/wait.h>
 #include <libgen.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
 
 #include <openssl/sha.h>
 

lib/external/fexec.c

@@ -27,14 +27,15 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/stat.h>
 #include <sys/types.h>
-#include <unistd.h>
-
 #include <sys/wait.h>
+
 #include <errno.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "xbps_api_impl.h"
 

lib/initend.c

@@ -23,12 +23,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
 #include <sys/utsname.h>
+
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
+#include <unistd.h>
 
 #include "xbps_api_impl.h"
 

lib/package_alternatives.c

@@ -24,12 +24,15 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdio.h>
+#include <sys/stat.h>
+
+#include <errno.h>
+#include <libgen.h>
 #include <stdbool.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
-#include <libgen.h>
+#include <unistd.h>
 
 #include "xbps_api_impl.h"
 

lib/package_config_files.c

@@ -29,6 +29,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <archive_entry.h>
+
 #include "xbps_api_impl.h"
 
 /*

lib/package_configure.c

@@ -23,12 +23,15 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/stat.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 
 #include "xbps_api_impl.h"
+
 /**
  * @file lib/package_configure.c
  * @brief Package configuration routines
@@ -45,6 +48,7 @@
   member, the package (or packages) will be reconfigured even if its
  * state is XBPS_PKG_STATE_INSTALLED.
  */
+
 int
 xbps_configure_packages(struct xbps_handle *xhp, xbps_array_t ignpkgs)
 {