tesses50/crosslang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

use shared ptrs for stream, vfs and ihttpserver and add progress

Browse Source
This commit is contained in:
Mike Nolan
2025-09-29 03:03:46 -05:00
parent 91622089f7
commit b92db28bba
31 changed files with 1394 additions and 1493 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/crossmergecli.cpp
View File

@@ -28,15 +28,15 @@ int main(int argc, char** argv)
destF.MakeAbsolute();
SubdirFilesystem sdir(&LocalFS,srcF.GetParent(),false);
SubdirFilesystem ddir(&LocalFS,destF+"_tmp",false);
auto sdir = std::make_shared<SubdirFilesystem>(LocalFS,srcF.GetParent());
auto ddir = std::make_shared<SubdirFilesystem>(LocalFS,destF+"_tmp");
auto outpath = Merge(&sdir,"/"+srcF.GetFileName(), &ddir);
auto outpath = Merge(sdir,"/"+srcF.GetFileName(), ddir);
outpath.relative=true;
outpath = (destF+"_tmp") / outpath;
LocalFS.MoveFile(outpath,destF);
LocalFS.DeleteDirectoryRecurse(destF+"_tmp");
LocalFS->MoveFile(outpath,destF);
LocalFS->DeleteDirectoryRecurse(destF+"_tmp");
return 0;