ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

files: create a new buffer earlier, so that error messages can be stored 

This improves the fix for https://savannah.gnu.org/bugs/?60269,
by not dropping error messages that happen before a buffer is opened.

This basically reverts commit b63c90bf from a year ago, except that
it now always deletes the created buffer when the user does not want
to override the lock file, also when it is the only buffer.
master
Benno Schulenberg 2021-03-23 16:29:03 +01:00
parent 77da54c6c6
commit 2f718e11a7
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/files.c
View File

@ -373,9 +373,6 @@ bool open_buffer(const char *filename, bool new_one)
{ {
char *realname; char *realname;
/* The filename after tilde expansion. */ /* The filename after tilde expansion. */
#ifndef NANO_TINY
char *thelocksname = NULL;
#endif
struct stat fileinfo; struct stat fileinfo;
int descriptor = 0; int descriptor = 0;
/* Code 0 means new file, -1 means failure, and else it's the fd. */ /* Code 0 means new file, -1 means failure, and else it's the fd. */
@ -420,22 +417,27 @@ bool open_buffer(const char *filename, bool new_one)
/* When loading into a new buffer, first check the file's path is valid, /* When loading into a new buffer, first check the file's path is valid,
* and then (if requested and possible) create a lock file for it. */ * and then (if requested and possible) create a lock file for it. */
if (new_one && has_valid_path(realname)) { if (new_one) {
make_new_buffer();
if (has_valid_path(realname)) {
#ifndef NANO_TINY #ifndef NANO_TINY
if (ISSET(LOCKING) && !ISSET(VIEW_MODE) && filename[0] != '\0') { if (ISSET(LOCKING) && !ISSET(VIEW_MODE) && filename[0] != '\0') {
thelocksname = do_lockfile(realname, TRUE); char *thelocksname = do_lockfile(realname, TRUE);
/* When not overriding an existing lock, don't open a buffer. */ /* When not overriding an existing lock, discard the buffer. */
if (thelocksname == SKIPTHISFILE) { if (thelocksname == SKIPTHISFILE) {
#ifdef ENABLE_MULTIBUFFER
close_buffer();
#endif
free(realname); free(realname);
return FALSE; return FALSE;
} else
openfile->lock_filename = thelocksname;
}
#endif /* NANO_TINY */
} }
} }
#endif
}
if (new_one)
make_new_buffer();
/* If we have a filename and are not in NOREAD mode, open the file. */ /* If we have a filename and are not in NOREAD mode, open the file. */
if (filename[0] != '\0' && !ISSET(NOREAD_MODE)) if (filename[0] != '\0' && !ISSET(NOREAD_MODE))
@ -459,9 +461,6 @@ bool open_buffer(const char *filename, bool new_one)
* and put the cursor at the start of the buffer. */ * and put the cursor at the start of the buffer. */
if (descriptor >= 0 && new_one) { if (descriptor >= 0 && new_one) {
openfile->filename = mallocstrcpy(openfile->filename, realname); openfile->filename = mallocstrcpy(openfile->filename, realname);
#ifndef NANO_TINY
openfile->lock_filename = thelocksname;
#endif
openfile->current = openfile->filetop; openfile->current = openfile->filetop;
openfile->current_x = 0; openfile->current_x = 0;
openfile->placewewant = 0; openfile->placewewant = 0;
@ -610,6 +609,9 @@ void close_buffer(void)
/* When just one buffer remains open, show "Exit" in the help lines. */ /* When just one buffer remains open, show "Exit" in the help lines. */
if (openfile == openfile->next) if (openfile == openfile->next)
exitfunc->desc = exit_tag; exitfunc->desc = exit_tag;
if (openfile == orphan)
openfile = NULL;
} }
#endif /* ENABLE_MULTIBUFFER */ #endif /* ENABLE_MULTIBUFFER */