LineageOS/android_external_nano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make write_marked() always call write_file() with nonamechange set to

Browse Source 
TRUE (and hence no longer take a namechange parameter itself) to fix a
bug where writing a selection would change the current filename, and
make die_save_file() do the same since we don't need to change the
current filename if we're writing emergency backup files


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1770 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
David Lawrence Ramsey
2004-05-28 00:15:28 +00:00
parent 228148b87a
commit 2f0d03b4a2
4 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/files.c
View File

@@ -1395,8 +1395,8 @@ int copy_file(FILE *inn, FILE *out)
* append == 1 means we are appending instead of overwriting.
* append == 2 means we are prepending instead of overwriting.
*
* nonamechange means don't change the current filename, it is ignored
* if tmp is nonzero or if we're appending/prepending.
* nonamechange means don't change the current filename. It is ignored
* if tmp is FALSE or if we're appending/prepending.
*
* Return -1 on error, 1 on success. */
int write_file(const char *name, int tmp, int append, int nonamechange)
@@ -1737,11 +1737,11 @@ int write_file(const char *name, int tmp, int append, int nonamechange)
#ifndef NANO_SMALL
/* Write a marked selection from a file out. First, set fileage and
* filebot as the top and bottom of the mark, respectively. Then call
* write_file() with the values of name, temp, append, and nonamechange.
* Finally, set fileage and filebot back to their old values and
* return. */
int write_marked(const char *name, int tmp, int append, int
nonamechange)
* write_file() with the values of name, temp, and append, and with
* nonamechange set to TRUE so that we don't change the current
* filename. Finally, set fileage and filebot back to their old values
* and return. */
int write_marked(const char *name, int tmp, int append)
{
int retval = -1;
filestruct *fileagebak = fileage;
@@ -1783,7 +1783,7 @@ int write_marked(const char *name, int tmp, int append, int
if (filebot->data[0] != '\0' && filebot->next != NULL)
filebot = filebot->next;
retval = write_file(name, tmp, append, nonamechange);
retval = write_file(name, tmp, append, TRUE);
/* Now restore everything. */
fileage->data -= topx;
@@ -1945,7 +1945,7 @@ int do_writeout(int exiting)
/* Here's where we allow the selected text to be written to
* a separate file. */
if (!ISSET(RESTRICTED) && !exiting && ISSET(MARK_ISSET))
i = write_marked(answer, FALSE, append, FALSE);
i = write_marked(answer, FALSE, append);
else
#endif /* !NANO_SMALL */
i = write_file(answer, FALSE, append, FALSE);