/* $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 <cstring>
#include <msp/fs/stat.h>
#include <msp/fs/utils.h>
#include <msp/io/file.h>
+#include <msp/io/print.h>
#include "builder.h"
#include "sourcepackage.h"
#include "tar.h"
InternalAction(b),
tarball(t)
{
- string basename=tarball.get_name().substr(tarball.get_name().rfind('/')+1);
+ string basename=FS::basename(tarball.get_path());
announce(tarball.get_package()->get_name(), "TAR ", basename);
if(builder.get_verbose()>=2)
- cout<<"Create "<<basename<<'\n';
+ IO::print("Create %s\n", basename);
if(!builder.get_dry_run())
worker=new Worker(*this);
void Tar::Worker::main()
{
const FS::Path &pkg_src=tar.tarball.get_package()->get_source();
- FS::Path basedir=FS::basepart(FS::basename(tar.tarball.get_name()));
+ FS::Path basedir=FS::basepart(FS::basename(tar.tarball.get_path()));
- IO::File out(tar.tarball.get_name(), IO::M_WRITE);
+ IO::File out(tar.tarball.get_path().str(), IO::M_WRITE);
const TargetList &deps=tar.tarball.get_depends();
for(TargetList::const_iterator i=deps.begin(); i!=deps.end(); ++i)
{
+ FileTarget *ft=dynamic_cast<FileTarget *>(*i);
+ if(!ft)
+ continue;
+
char buf[4096];
memset(buf, 0, 512);
- string rel_path=(basedir/relative((*i)->get_name(), pkg_src)).str();
+ string rel_path=(basedir/relative(ft->get_path(), pkg_src)).str();
if(rel_path.size()>99)
{
- cout<<"Can't store "<<rel_path<<" in tar archive - too long name\n";
+ IO::print("Can't store %s in tar archive - too long name\n", rel_path);
error=true;
break;
}
memcpy(buf, rel_path.data(), rel_path.size());
- struct stat st=FS::stat((*i)->get_name());
+ struct stat st=FS::stat(ft->get_path());
store_number(buf+100, st.st_mode, 7);
store_number(buf+108, st.st_uid, 7);
store_number(buf+116, st.st_gid, 7);
buf[155]=0;
out.write(buf, 512);
- IO::File in((*i)->get_name());
+ IO::File in(ft->get_path().str());
for(int j=0; j<st.st_size; j+=4096)
{
unsigned len=in.read(buf, 4096);