mirrors/ecl
1
Fork 0
mirror of https://gitlab.com/embeddable-common-lisp/ecl.git synced 2026-01-13 21:02:47 -08:00
Code Issues Projects Releases Packages Wiki Activity

Change RENAME-FILE so that it does not use link/unlink. This way it can move directories

Browse source
This commit is contained in:
Juan Jose Garcia Ripoll 2010-08-19 23:29:28 +02:00
parent 8440e9d0c4
commit ee5dcec824
2 changed files with 11 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/CHANGELOG
View file

@ -31,6 +31,8 @@ ECL 10.5.1:
(translate-logical-pathname #P"SYS:FOO.FAS")
=> "where/ecl/lives/foo.fas"
- RENAME-FILE was not able to rename directories.
* Visible changes:
- "fasb" is now a valid FASL file type, accepted by ECL even in absence of

42
src/c/unixfsys.d
View file

@ -443,56 +443,32 @@ ecl_file_len(int f)
* or if it does not exist. Notice that the filename to be renamed
* is not the truename, because we might be renaming a symbolic link.
*/
old_filename = si_coerce_to_filename(oldn);
old_filename = cl_string_right_trim(ecl_list1(CODE_CHAR('/')),
si_coerce_to_filename(oldn));
old_truename = cl_truename(oldn);
/* 2) Create the new file name. */
newn = ecl_merge_pathnames(newn, oldn, @':newest');
new_filename = si_coerce_to_filename(newn);
ecl_disable_interrupts();
while (if_exists == @':error' || if_exists == Cnil) {
#if defined(_MSC_VER) || defined(__MINGW32__)
error = SetErrorMode(0);
if (MoveFile((char*)old_filename->base_string.self,
(char*)new_filename->base_string.self)) {
SetErrorMode(error);
goto SUCCESS;
}
SetErrorMode(error);
switch (GetLastError()) {
case ERROR_ALREADY_EXISTS:
case ERROR_FILE_EXISTS:
break;
default:
goto FAILURE_CLOBBER;
};
#else
if (link((char*)old_filename->base_string.self,
(char*)new_filename->base_string.self) == 0) {
(void)unlink((char*)old_filename->base_string.self);
goto SUCCESS;
}
if (errno != EEXIST && errno != ENOTEMPTY) {
goto FAILURE_CLOBBER;
}
#endif
while (if_exists == @':error' || if_exists == Cnil)
{
if (cl_probe_file(new_filename) == Cnil) {
if_exists = Ct;
break;
}
/* if the file already exists */
if (if_exists != Cnil) {
ecl_enable_interrupts();
if (if_exists == @':error') {
if_exists = CEerror(@':supersede',
"When trying to rename ~S, ~S already exists", 2,
oldn, new_filename);
ecl_disable_interrupts();
if (if_exists == Ct) if_exists= @':error';
}
if (if_exists == Cnil) {
ecl_enable_interrupts();
@(return Cnil Cnil Cnil)
}
}
if (if_exists == @':supersede' || if_exists == Ct) {
#if defined(_MSC_VER) || defined(__MINGW32__)
error = SetErrorMode(0);