Error handling of ungetlocalcopy was buggy. Fixed.
Этот коммит содержится в:
родитель
6ea4f905af
Коммит
7c997958f6
@ -1,3 +1,7 @@
|
|||||||
|
2001-02-28 Pavel Machek <pavel@bug.ucw.cz>
|
||||||
|
|
||||||
|
* vfs.c (mc_def_ungetlocalcopy): Cleanup of error handling.
|
||||||
|
|
||||||
2001-02-27 Pavel Machek <pavel@bug.ucw.cz>
|
2001-02-27 Pavel Machek <pavel@bug.ucw.cz>
|
||||||
|
|
||||||
* vfs.c (mc_ungetlocalcopy): Do not ignore errors. (Courtesy of
|
* vfs.c (mc_ungetlocalcopy): Do not ignore errors. (Courtesy of
|
||||||
|
@ -1120,8 +1120,11 @@ mc_def_ungetlocalcopy (vfs *vfs, char *filename, char *local, int has_changed)
|
|||||||
if (i == -1)
|
if (i == -1)
|
||||||
goto failed;
|
goto failed;
|
||||||
|
|
||||||
if (close (fdin)==-1)
|
if (close (fdin)==-1) {
|
||||||
|
fdin = -1;
|
||||||
goto failed;
|
goto failed;
|
||||||
|
}
|
||||||
|
fdin = -1;
|
||||||
if (mc_close (fdout)==-1) {
|
if (mc_close (fdout)==-1) {
|
||||||
fdout = -1;
|
fdout = -1;
|
||||||
goto failed;
|
goto failed;
|
||||||
@ -1133,8 +1136,8 @@ mc_def_ungetlocalcopy (vfs *vfs, char *filename, char *local, int has_changed)
|
|||||||
|
|
||||||
failed:
|
failed:
|
||||||
message_1s (1, _("Changes to file lost"), filename);
|
message_1s (1, _("Changes to file lost"), filename);
|
||||||
if (fdout) mc_close(fdout);
|
if (fdout!=-1) mc_close(fdout);
|
||||||
if (fdin) close(fdin);
|
if (fdin!=-1) close(fdin);
|
||||||
unlink (local);
|
unlink (local);
|
||||||
g_free (local);
|
g_free (local);
|
||||||
return -1;
|
return -1;
|
||||||
|
Загрузка…
Ссылка в новой задаче
Block a user