aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2019-05-22 11:26:33 (GMT)
committerBoris Kolpackov <boris@codesynthesis.com>2019-05-22 11:26:33 (GMT)
commit1373e460b426d5adf3a304a60cd8f3634aface45 (patch)
treed11466b3f641510d351a6ce57ec9c131dd9ce47d
parent4fd96434dd9afca5f446275fd037e28a09c85edd (diff)
Unify package archive extraction cases to use common implementation
-rw-r--r--bpkg/archive.cxx108
-rw-r--r--bpkg/archive.hxx17
-rw-r--r--bpkg/pkg-unpack.cxx98
3 files changed, 110 insertions, 113 deletions
diff --git a/bpkg/archive.cxx b/bpkg/archive.cxx
index 9fac5fc..5488ce2 100644
--- a/bpkg/archive.cxx
+++ b/bpkg/archive.cxx
@@ -26,14 +26,9 @@ namespace bpkg
return path_cast<dir_path> (d);
}
- pair<process, process>
- start_extract (const common_options& co,
- const path& a,
- const path& f,
- bool diag)
+ static pair<cstrings, size_t>
+ start_extract (const common_options& co, const path& a)
{
- assert (!f.empty () && f.relative ());
-
cstrings args;
// See if we need to decompress.
@@ -59,19 +54,15 @@ namespace bpkg
args.push_back (co.tar ().string ().c_str ());
- // Add extra options.
+ // Add user's extra options.
//
for (const string& o: co.tar_option ())
args.push_back (o.c_str ());
- // -O/--to-stdout -- extract to stdout.
- //
- args.push_back ("-O");
-
// An archive name that has a colon in it specifies a file or device on a
// remote machine. That makes it impossible to use absolute Windows paths
// unless we add the --force-local option. Note that BSD tar doesn't
- // support this option.
+ // support this option but appears to do the right thing on Windows.
//
#ifdef _WIN32
args.push_back ("--force-local");
@@ -80,8 +71,95 @@ namespace bpkg
args.push_back ("-xf");
args.push_back (i == 0 ? a.string ().c_str () : "-");
- // MSYS tar doesn't find archived file if it's path is provided in Windows
- // notation.
+ return make_pair (move (args), i);
+ }
+
+ pair<process, process>
+ start_extract (const common_options& co, const path& a, const dir_path& d)
+ {
+ pair<cstrings, size_t> args_i (start_extract (co, a));
+ cstrings& args (args_i.first);
+ size_t i (args_i.second);
+
+ // -C/--directory -- change to directory.
+ //
+ args.push_back ("-C");
+
+#ifndef _WIN32
+ args.push_back (d.string ().c_str ());
+#else
+ // Note that MSYS GNU tar misinterprets -C option's absolute paths on
+ // Windows, unless only forward slashes are used as directory separators:
+ //
+ // tar -C c:\a\cfg --force-local -xf c:\a\cfg\libbutl-0.7.0.tar.gz
+ // tar: c\:\a\\cfg: Cannot open: No such file or directory
+ // tar: Error is not recoverable: exiting now
+ //
+ string cwd (d.string ());
+ replace (cwd.begin (), cwd.end (), '\\', '/');
+
+ args.push_back (cwd.c_str ());
+#endif
+
+ args.push_back (nullptr);
+ args.push_back (nullptr); // Pipe end.
+
+ size_t what;
+ try
+ {
+ process_path dpp;
+ process_path tpp;
+
+ process dpr;
+ process tpr;
+
+ if (i != 0)
+ dpp = process::path_search (args[what = 0]);
+
+ tpp = process::path_search (args[what = i]);
+
+ if (verb >= 2)
+ print_process (args);
+
+ if (i != 0)
+ {
+ dpr = process (dpp, &args[what = 0], 0, -1);
+ tpr = process (tpp, &args[what = i], dpr);
+ }
+ else
+ tpr = process (tpp, &args[what = 0]);
+
+ return make_pair (move (dpr), move (tpr));
+ }
+ catch (const process_error& e)
+ {
+ error << "unable to execute " << args[what] << ": " << e;
+
+ if (e.child)
+ exit (1);
+
+ throw failed ();
+ }
+ }
+
+ pair<process, process>
+ start_extract (const common_options& co,
+ const path& a,
+ const path& f,
+ bool diag)
+ {
+ assert (!f.empty () && f.relative ());
+
+ pair<cstrings, size_t> args_i (start_extract (co, a));
+ cstrings& args (args_i.first);
+ size_t i (args_i.second);
+
+ // -O/--to-stdout -- extract to stdout.
+ //
+ args.push_back ("-O");
+
+ // On Windows neither MSYS GNU tar nor BSD tar will find the archived file
+ // if its path is provided in the Windows notation.
//
string fs (f.posix_string ());
args.push_back (fs.c_str ());
diff --git a/bpkg/archive.hxx b/bpkg/archive.hxx
index c646185..d5f9390 100644
--- a/bpkg/archive.hxx
+++ b/bpkg/archive.hxx
@@ -19,14 +19,21 @@ namespace bpkg
dir_path
package_dir (const path& archive);
- // Start the process of extracting the specified file from the archive. If
- // diag is false, then redirect stderr to /dev/null (this can be used, for
- // example, to suppress diagnostics). Note that in this case process errors
- // (like unable to start) are still printed.
+ // Start the process of extracting the archive to the specified directory.
+ //
+ pair<process, process>
+ start_extract (const common_options&,
+ const path& archive,
+ const dir_path&);
+
+ // Start the process of extracting the specified file from the archive to
+ // the process' stdout. If diag is false, then redirect stderr to /dev/null
+ // (this can be used, for example, to suppress diagnostics). Note that in
+ // this case process errors (like unable to start) are still reported.
//
// Return a pair of processes that form a pipe. Wait on the second first.
//
- pair<butl::process, butl::process>
+ pair<process, process>
start_extract (const common_options&,
const path& archive,
const path& file,
diff --git a/bpkg/pkg-unpack.cxx b/bpkg/pkg-unpack.cxx
index 483a252..f289c2f 100644
--- a/bpkg/pkg-unpack.cxx
+++ b/bpkg/pkg-unpack.cxx
@@ -12,6 +12,7 @@
#include <libbpkg/manifest.hxx>
+#include <bpkg/archive.hxx>
#include <bpkg/package.hxx>
#include <bpkg/package-odb.hxx>
#include <bpkg/database.hxx>
@@ -322,108 +323,19 @@ namespace bpkg
//
arm = auto_rmdir (d);
- cstrings args;
-
- // See if we need to decompress.
- //
- {
- string e (a.extension ());
-
- if (e == "gz") args.push_back ("gzip");
- else if (e == "bzip2") args.push_back ("bzip2");
- else if (e == "xz") args.push_back ("xz");
- else if (e != "tar")
- fail << "unknown compression method in package " << a;
- }
-
- size_t i (0); // The tar command line start.
- if (!args.empty ())
- {
- args.push_back ("-dc");
- args.push_back (a.string ().c_str ());
- args.push_back (nullptr);
- i = args.size ();
- }
-
- args.push_back (co.tar ().string ().c_str ());
-
- // Add extra options.
- //
- for (const string& o: co.tar_option ())
- args.push_back (o.c_str ());
-
- // -C/--directory -- change to directory.
- //
- args.push_back ("-C");
-
-#ifndef _WIN32
- args.push_back (c.string ().c_str ());
-#else
- // Note that tar misinterprets -C option's absolute paths on Windows,
- // unless only forward slashes are used as directory separators:
- //
- // tar -C c:\a\cfg --force-local -xf c:\a\cfg\libbutl-0.7.0.tar.gz
- // tar: c\:\a\\cfg: Cannot open: No such file or directory
- // tar: Error is not recoverable: exiting now
- //
- string cwd (c.string ());
- replace (cwd.begin (), cwd.end (), '\\', '/');
-
- args.push_back (cwd.c_str ());
-
- // An archive name that has a colon in it specifies a file or device on a
- // remote machine. That makes it impossible to use absolute Windows paths
- // unless we add the --force-local option. Note that BSD tar doesn't
- // support this option.
- //
- args.push_back ("--force-local");
-#endif
-
- args.push_back ("-xf");
- args.push_back (i == 0 ? a.string ().c_str () : "-");
- args.push_back (nullptr);
- args.push_back (nullptr); // Pipe end.
-
- size_t what;
try
{
- process_path dpp;
- process_path tpp;
-
- process dpr;
- process tpr;
-
- if (i != 0)
- dpp = process::path_search (args[what = 0]);
-
- tpp = process::path_search (args[what = i]);
-
- if (verb >= 2)
- print_process (args);
-
- if (i != 0)
- {
- dpr = process (dpp, &args[what = 0], 0, -1);
- tpr = process (tpp, &args[what = i], dpr);
- }
- else
- tpr = process (tpp, &args[what = 0]);
+ pair<process, process> pr (start_extract (co, a, c));
// While it is reasonable to assuming the child process issued
// diagnostics, tar, specifically, doesn't mention the archive name.
//
- if (!(what = i, tpr.wait ()) ||
- !(what = 0, dpr.wait ()))
- fail << "unable to extract package archive " << a;
+ if (!pr.second.wait () || !pr.first.wait ())
+ fail << "unable to extract " << a << " to " << c;
}
catch (const process_error& e)
{
- error << "unable to execute " << args[what] << ": " << e;
-
- if (e.child)
- exit (1);
-
- throw failed ();
+ fail << "unable to extract " << a << " to " << c << ": " << e;
}
mc = sha256 (co, d / manifest_file);