X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftar.cpp;h=6f7b154feabba71b738c66623080d4d02b68c1a6;hb=66d1078c04849ec17a7343d0494d6ed087e04318;hp=797bf240425e4fe78451376a55c6e7ecaca38b79;hpb=242c55b17e6608b29a77ca17a5b677e202a3ca90;p=builder.git

diff --git a/source/tar.cpp b/source/tar.cpp
index 797bf24..6f7b154 100644
--- a/source/tar.cpp
+++ b/source/tar.cpp
@@ -22,7 +22,7 @@ Tar::Tar(Builder &b, const TarBall &t):
 	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';
@@ -41,16 +41,20 @@ Tar::Worker::Worker(Tar &t):
 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";
@@ -60,7 +64,7 @@ void Tar::Worker::main()
 
 		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);
@@ -76,7 +80,7 @@ void Tar::Worker::main()
 		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);