Merge branch '2761_editor_save_as_dir'

* 2761_editor_save_as_dir:
  Ticket #2761: save file on top of existing directory changes dir's permissions
This commit is contained in:
Slava Zanko 2012-03-27 11:05:39 +03:00
commit 835f72fcaf

View File

@ -1488,6 +1488,15 @@ edit_save_as_cmd (WEdit * edit)
if (vfs_path_cmp (edit->filename_vpath, exp_vpath) != 0) if (vfs_path_cmp (edit->filename_vpath, exp_vpath) != 0)
{ {
int file; int file;
struct stat sb;
if (mc_stat (exp_vpath, &sb) == 0 && !S_ISREG (sb.st_mode))
{
edit_error_dialog (_("Save as"),
get_sys_error (_
("Cannot save: destination is not a regular file")));
goto ret;
}
different_filename = 1; different_filename = 1;
file = mc_open (exp_vpath, O_RDONLY | O_BINARY); file = mc_open (exp_vpath, O_RDONLY | O_BINARY);