quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not move symlinks when saving a map, overwrite target instead

Browse Source 
If the user is editing a symlink to a target instead of a real file,
chances are high they want the symlink to stay in place.

Precondition:

  some.map -> /path/to/elsewhere.map

After save (before):

  some.bak -> /path/to/elsewhere.map
  some.map (real file)

After save (after):

  some.map -> /path/to/elsewhere.map

Closes #107.
This commit is contained in:
Walter Doekes
2022-08-27 16:03:40 +02:00
parent f61e0dcb67
commit dd81a7f0d7
3 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
radiant/referencecache.cpp
View File

@@ -114,14 +114,15 @@ bool MapResource_saveFile( const MapFormat& format, scene::Node& root, GraphTrav
}
bool file_saveBackup( const char* path ){
if ( file_writeable( path ) ) {
const auto backup = StringOutputStream( 256 )( PathExtensionless( path ), ".bak" );
const auto backup = StringOutputStream( 256 )( PathExtensionless( path ), ".bak" );
return ( !file_exists( backup ) || file_remove( backup ) ) // remove backup
&& file_move( path, backup ); // rename current to backup
if ( file_move( path, backup.c_str() ) ) {
return true;
}
globalErrorStream() << "map path is not writeable: " << makeQuoted( path ) << "\n";
if ( !file_exists( path ) ) {
return true; // nothing to move, no wonder it failed
}
globalErrorStream() << "map path (or backup path) is not writable: " << makeQuoted( path ) << "\n";
return false;
}
@@ -130,11 +131,14 @@ bool MapResource_save( const MapFormat& format, scene::Node& root, const char* p
fullpath << path << name;
if ( path_is_absolute( fullpath.c_str() ) ) {
if ( !file_exists( fullpath.c_str() ) || file_saveBackup( fullpath.c_str() ) ) {
// We don't want a backup + rename operation if the .map file is
// a symlink. Otherwise we'll break the user's careful symlink setup.
// Just overwrite the original file. Assume the user has versioning.
if ( file_is_symlink( fullpath.c_str() ) || file_saveBackup( fullpath.c_str() ) ) {
return MapResource_saveFile( format, root, Map_Traverse, fullpath.c_str() );
}
globalErrorStream() << "failed to save a backup map file: " << makeQuoted( fullpath.c_str() ) << "\n";
globalErrorStream() << "failed to save map file: " << makeQuoted( fullpath.c_str() ) << "\n";
return false;
}