From 9e8fe1472b50b5aae98ab7be7fe0444d251c8d7d Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 23 May 2019 15:31:24 +0200
Subject: Switch to libarchive's bsdtar as default on Windows

Note that MSYS GNU tar can still be requested by passing --tar=tar.
---
 bpkg/archive.cxx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'bpkg')

diff --git a/bpkg/archive.cxx b/bpkg/archive.cxx
index e8fb073..9d19dc5 100644
--- a/bpkg/archive.cxx
+++ b/bpkg/archive.cxx
@@ -4,8 +4,6 @@
 
 #include <bpkg/archive.hxx>
 
-#include <cstring> // strlen()
-
 #include <libbutl/process.mxx>
 
 #include <bpkg/utility.hxx>
@@ -32,7 +30,7 @@ namespace bpkg
   static inline bool
   bsdtar (const char* p)
   {
-    const char* l (path::traits::find_leaf (p, strlen (p)));
+    const char* l (path::traits::find_leaf (p));
     return l != nullptr && casecmp (l, "bsdtar", 6) == 0;
   }
 #endif
@@ -48,7 +46,7 @@ namespace bpkg
     const char* tar (co.tar_specified ()
                      ? co.tar ().string ().c_str ()
 #ifdef _WIN32
-                     : "tar"
+                     : "bsdtar"
 #else
                      : "tar"
 #endif
-- 
cgit v1.1