Migrate from msppath to mspfs

[builder.git] / source / tar.cpp

diff --git a/source/tar.cpp b/source/tar.cpp
index 0b0c38df775696fcf1e98d8333a3357df68af305..04beabfdd83d52828c6ccb6e34a68fa8518345bc 100644 (file)
--- a/source/tar.cpp
+++ b/source/tar.cpp
@@ -6,9 +6,12 @@ Distributed under the LGPL
 */
 
 #include <iostream>
-#include <msp/path/utils.h>
+#include <cstring>
+#include <msp/fs/stat.h>
+#include <msp/fs/utils.h>
+#include <msp/io/file.h>
 #include "builder.h"
-#include "package.h"
+#include "sourcepackage.h"
 #include "tar.h"
 #include "tarball.h"
 
@@ -16,57 +19,31 @@ using namespace std;
 using namespace Msp;
 
 Tar::Tar(Builder &b, const TarBall &t):
-       Action(b),
-       tarball(t),
-       worker(0)
+       InternalAction(b),
+       tarball(t)
 {
        string basename=tarball.get_name().substr(tarball.get_name().rfind('/')+1);
        announce(tarball.get_package()->get_name(), "TAR ", basename);
        if(builder.get_verbose()>=2)
                cout<<"Create "<<basename<<'\n';
-       
+
        if(!builder.get_dry_run())
                worker=new Worker(*this);
 }
 
-Tar::~Tar()
-{
-       delete worker;
-}
-
-int Tar::check()
-{
-       if(!worker)  // True for dry run
-       {
-               signal_done.emit();
-               return 0;
-       }
-       
-       if(worker->get_done())
-       {
-               signal_done.emit();
-               worker->join();
-               return worker->get_error()?1:0;
-       }
-       
-       return -1;
-}
-
 
 Tar::Worker::Worker(Tar &t):
-       tar(t),
-       done(false),
-       error(false)
+       tar(t)
 {
        launch();
 }
 
 void Tar::Worker::main()
 {
-       const Path::Path &pkg_src=tar.tarball.get_package()->get_source();
-       Path::Path basedir=Path::splitext(Path::basename(tar.tarball.get_name())).base;
+       const FS::Path &pkg_src=tar.tarball.get_package()->get_source();
+       FS::Path basedir=FS::basepart(FS::basename(tar.tarball.get_name()));
 
-       ofstream out(tar.tarball.get_name().c_str());
+       IO::File out(tar.tarball.get_name(), IO::M_WRITE);
        const TargetList &deps=tar.tarball.get_depends();
        for(TargetList::const_iterator i=deps.begin(); i!=deps.end(); ++i)
        {
@@ -83,8 +60,7 @@ void Tar::Worker::main()
 
                memcpy(buf, rel_path.data(), rel_path.size());
 
-               struct stat st;
-               Path::stat((*i)->get_name(), st);
+               struct stat st=FS::stat((*i)->get_name());
                store_number(buf+100, st.st_mode, 7);
                store_number(buf+108, st.st_uid, 7);
                store_number(buf+116, st.st_gid, 7);
@@ -100,11 +76,10 @@ void Tar::Worker::main()
                buf[155]=0;
 
                out.write(buf, 512);
-               ifstream in((*i)->get_name().c_str());
+               IO::File in((*i)->get_name());
                for(int j=0; j<st.st_size; j+=4096)
                {
-                       in.read(buf, 4096);
-                       unsigned len=in.gcount();
+                       unsigned len=in.read(buf, 4096);
                        len+=((~len)+1)&0777;
                        out.write(buf, len);
                }