Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-11-25 18:31:14 +00:00
Code Issues Projects Releases Wiki Activity

- moving/renaming/deleting files in the ExtFS also moves/deletes the

Browse Source 
helper files/directories
This commit is contained in:
cebix 1999-11-08 18:06:02 +00:00
parent 30b45e559b
commit e1d954b756
5 changed files with 81 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
BasiliskII/src/AmigaOS/extfs_amiga.cpp
View File

@ -379,17 +379,48 @@ bool extfs_remove(const char *path)
make_helper_path(path, helper_path, ".rsrc/", false); make_helper_path(path, helper_path, ".rsrc/", false);
remove(helper_path); remove(helper_path);
// Now remove file or directory // Now remove file or directory (and helper directories in the directory)
if (remove(path) < 0) { if (remove(path) < 0) {
if (errno == EISDIR) if (errno == EISDIR || errno == ENOTEMPTY) {
helper_path[0] = 0;
strncpy(helper_path, path, MAX_PATH_LENGTH-1);
add_path_component(helper_path, ".finf");
rmdir(helper_path);
helper_path[0] = 0;
strncpy(helper_path, path, MAX_PATH_LENGTH-1);
add_path_component(helper_path, ".rsrc");
rmdir(helper_path);
return rmdir(path) == 0; return rmdir(path) == 0;
else } else
return false; return false;
} }
return true; return true;
} }
/*
* Rename/move file/directory (and associated helper files),
* returns false on error (and sets errno)
*/
bool extfs_rename(const char *old_path, const char *new_path)
{
// Rename helpers first, don't complain if this fails
char old_helper_path[MAX_PATH_LENGTH], new_helper_path[MAX_PATH_LENGTH];
make_helper_path(old_path, old_helper_path, ".finf/", false);
make_helper_path(new_path, new_helper_path, ".finf/", false);
create_helper_dir(new_path, ".finf/");
rename(old_helper_path, new_helper_path);
make_helper_path(old_path, old_helper_path, ".rsrc/", false);
make_helper_path(new_path, new_helper_path, ".rsrc/", false);
create_helper_dir(new_path, ".rsrc/");
rename(old_helper_path, new_helper_path);
// Now rename file
return rename(old_path, new_path) == 0;
}
/* /*
* ftruncate() is missing from libnix * ftruncate() is missing from libnix
*/ */

10
BasiliskII/src/BeOS/extfs_beos.cpp
View File

@ -471,3 +471,13 @@ bool extfs_remove(const char *path)
} }
return true; return true;
} }
/*
* Rename/move file/directory, returns false on error (and sets errno)
*/
bool extfs_rename(const char *old_path, const char *new_path)
{
return rename(old_path, new_path) == 0;
}

37
BasiliskII/src/Unix/extfs_unix.cpp
View File

@ -384,12 +384,43 @@ bool extfs_remove(const char *path)
make_helper_path(path, helper_path, ".rsrc/", false); make_helper_path(path, helper_path, ".rsrc/", false);
remove(helper_path); remove(helper_path);
// Now remove file or directory // Now remove file or directory (and helper directories in the directory)
if (remove(path) < 0) { if (remove(path) < 0) {
if (errno == EISDIR) if (errno == EISDIR || errno == ENOTEMPTY) {
helper_path[0] = 0;
strncpy(helper_path, path, MAX_PATH_LENGTH-1);
add_path_component(helper_path, ".finf");
rmdir(helper_path);
helper_path[0] = 0;
strncpy(helper_path, path, MAX_PATH_LENGTH-1);
add_path_component(helper_path, ".rsrc");
rmdir(helper_path);
return rmdir(path) == 0; return rmdir(path) == 0;
else } else
return false; return false;
} }
return true; return true;
} }
/*
* Rename/move file/directory (and associated helper files),
* returns false on error (and sets errno)
*/
bool extfs_rename(const char *old_path, const char *new_path)
{
// Rename helpers first, don't complain if this fails
char old_helper_path[MAX_PATH_LENGTH], new_helper_path[MAX_PATH_LENGTH];
make_helper_path(old_path, old_helper_path, ".finf/", false);
make_helper_path(new_path, new_helper_path, ".finf/", false);
create_helper_dir(new_path, ".finf/");
rename(old_helper_path, new_helper_path);
make_helper_path(old_path, old_helper_path, ".rsrc/", false);
make_helper_path(new_path, new_helper_path, ".rsrc/", false);
create_helper_dir(new_path, ".rsrc/");
rename(old_helper_path, new_helper_path);
// Now rename file
return rename(old_path, new_path) == 0;
}

4
BasiliskII/src/extfs.cpp
View File

@ -1933,7 +1933,7 @@ static int16 fs_rename(uint32 pb, uint32 dirID)
// Rename item // Rename item
D(bug(" renaming %s -> %s\n", old_path, full_path)); D(bug(" renaming %s -> %s\n", old_path, full_path));
if (rename(old_path, full_path) < 0) if (!extfs_rename(old_path, full_path))
return errno2oserr(); return errno2oserr();
else { else {
// The ID of the old file/dir has to stay the same, so we swap the IDs of the FSItems // The ID of the old file/dir has to stay the same, so we swap the IDs of the FSItems
@ -1976,7 +1976,7 @@ static int16 fs_cat_move(uint32 pb)
// Move item // Move item
D(bug(" moving %s -> %s\n", old_path, full_path)); D(bug(" moving %s -> %s\n", old_path, full_path));
if (rename(old_path, full_path) < 0) if (!extfs_rename(old_path, full_path))
return errno2oserr(); return errno2oserr();
else { else {
// The ID of the old file/dir has to stay the same, so we swap the IDs of the FSItems // The ID of the old file/dir has to stay the same, so we swap the IDs of the FSItems

1
BasiliskII/src/include/extfs.h
View File

@ -43,6 +43,7 @@ extern void close_rfork(const char *path, int fd);
extern size_t extfs_read(int fd, void *buffer, size_t length); extern size_t extfs_read(int fd, void *buffer, size_t length);
extern size_t extfs_write(int fd, void *buffer, size_t length); extern size_t extfs_write(int fd, void *buffer, size_t length);
extern bool extfs_remove(const char *path); extern bool extfs_remove(const char *path);
extern bool extfs_rename(const char *old_path, const char *new_path);
// Maximum length of full path name // Maximum length of full path name
const int MAX_PATH_LENGTH = 1024; const int MAX_PATH_LENGTH = 1024;