Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/lib/libalpm/libarchive-compat.c
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2013-01-28 20:23:24 -0500
committerAllan McRae <allan@archlinux.org>2013-01-29 13:37:32 +1000
commit2a57c2068c3ea744608c364f9cacedd3f0c14849 (patch)
treee4ff260eafaa1035b58576fd149397c5dbdcf4c7 /lib/libalpm/libarchive-compat.c
parent266b3dd70698db05cd2e531fdcf2c5c2a741e3cb (diff)
add libarchive compatability object
This allows us to support both libarchive 2.8.x as well as 3.x without deprecation warnings on compile. Signed-off-by: Dave Reisner <dreisner@archlinux.org> Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'lib/libalpm/libarchive-compat.c')
-rw-r--r--lib/libalpm/libarchive-compat.c65
1 files changed, 65 insertions, 0 deletions
diff --git a/lib/libalpm/libarchive-compat.c b/lib/libalpm/libarchive-compat.c
new file mode 100644
index 00000000..56af2e11
--- /dev/null
+++ b/lib/libalpm/libarchive-compat.c
@@ -0,0 +1,65 @@
+/*
+ * libarchive-compat.c
+ *
+ * Copyright (c) 2013 Pacman Development Team <pacman-dev@archlinux.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdint.h>
+
+#include "libarchive-compat.h"
+
+int _alpm_archive_read_free(struct archive *archive) {
+#if ARCHIVE_VERSION_NUMBER >= 3000000
+ return archive_read_free(archive);
+#else
+ return archive_read_finish(archive);
+#endif
+}
+
+int64_t _alpm_archive_compressed_ftell(struct archive *archive) {
+#if ARCHIVE_VERSION_NUMBER >= 3000000
+ return archive_filter_bytes(archive, -1);
+#else
+ return archive_position_compressed(archive);
+#endif
+}
+
+int _alpm_archive_read_open_file(struct archive *archive,
+ const char *filename, size_t block_size) {
+#if ARCHIVE_VERSION_NUMBER >= 3000000
+ return archive_read_open_filename(archive, filename, block_size);
+#else
+ return archive_read_open_file(archive, filename, block_size);
+#endif
+}
+
+int _alpm_archive_filter_code(struct archive *archive) {
+#if ARCHIVE_VERSION_NUMBER >= 3000000
+ return archive_filter_code(archive, 0);
+#else
+ return archive_compression(archive);
+#endif
+}
+
+int _alpm_archive_read_support_filter_all(struct archive *archive) {
+#if ARCHIVE_VERSION_NUMBER >= 3000000
+ return archive_read_support_filter_all(archive);
+#else
+ return archive_read_support_compression_all(archive);
+#endif
+}
+
+/* vim: set ts=2 sw=2 noet: */