Reorder class members

[builder.git] / source / tar.cpp

diff --git a/source/tar.cpp b/source/tar.cpp
index da579250a15654b978cda94eef621af1afbe319e..797bf240425e4fe78451376a55c6e7ecaca38b79 100644 (file)
--- a/source/tar.cpp
+++ b/source/tar.cpp
@@ -1,12 +1,15 @@
 /* $Id$
 
 This file is part of builder
-Copyright © 2007 Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2009  Mikko Rasa, Mikkosoft Productions
 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 "sourcepackage.h"
 #include "tar.h"
@@ -37,10 +40,10 @@ Tar::Worker::Worker(Tar &t):
 
 void Tar::Worker::main()
 {
-       const Path &pkg_src=tar.tarball.get_package()->get_source();
-       Path basedir=splitext(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)
        {
@@ -57,7 +60,7 @@ void Tar::Worker::main()
 
                memcpy(buf, rel_path.data(), rel_path.size());
 
-               struct stat st=stat((*i)->get_name());
+               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);
@@ -73,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);
                }