X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftar.cpp;h=04beabfdd83d52828c6ccb6e34a68fa8518345bc;hb=a2adbd9c0a8d7a7567848c4c6bdbf0de6ba32bb1;hp=d43a5b0cbb24e0e49dc384591f9300201e6a58ff;hpb=7567502e17be7704d58ced2f49703fcf71c7ef38;p=builder.git

diff --git a/source/tar.cpp b/source/tar.cpp
index d43a5b0..04beabf 100644
--- a/source/tar.cpp
+++ b/source/tar.cpp
@@ -7,8 +7,9 @@ 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/path/utils.h>
 #include "builder.h"
 #include "sourcepackage.h"
 #include "tar.h"
@@ -39,8 +40,8 @@ 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()));
 
 	IO::File out(tar.tarball.get_name(), IO::M_WRITE);
 	const TargetList &deps=tar.tarball.get_depends();
@@ -59,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);