mirrors/nano
1
0
Fork 0
mirror of git://git.sv.gnu.org/nano.git synced 2024-11-26 06:39:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

locking: do not write a lock file when in view mode

Browse Source 
When in view mode, the file cannot be edited, so there is no need to
warn anyone (through a lock file) that the file might soon change.

This fixes https://savannah.gnu.org/bugs/?57694.
This commit is contained in:
Benno Schulenberg 2020-01-29 19:14:41 +01:00
parent 25b0bf0ae8
commit 4502295a34
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/files.c
View File

@ -54,8 +54,10 @@ bool has_valid_path(const char *filename)
statusline(ALERT, _("Path '%s' is not a directory"), parentdir); statusline(ALERT, _("Path '%s' is not a directory"), parentdir);
else if (access(parentdir, X_OK) == -1) else if (access(parentdir, X_OK) == -1)
statusline(ALERT, _("Path '%s' is not accessible"), parentdir); statusline(ALERT, _("Path '%s' is not accessible"), parentdir);
else if (ISSET(LOCKING) && access(parentdir, W_OK) == -1) #ifndef NANO_TINY
else if (ISSET(LOCKING) && !ISSET(VIEW_MODE) && access(parentdir, W_OK) < 0)
statusline(MILD, _("Directory '%s' is not writable"), parentdir); statusline(MILD, _("Directory '%s' is not writable"), parentdir);
#endif
else else
validity = TRUE; validity = TRUE;
@ -140,7 +142,7 @@ void set_modified(void)
titlebar(NULL); titlebar(NULL);
#ifndef NANO_TINY #ifndef NANO_TINY
if (!ISSET(LOCKING) || openfile->filename[0] == '\0') if (!ISSET(LOCKING) || ISSET(VIEW_MODE) || openfile->filename[0] == '\0')
return; return;
if (openfile->lock_filename != NULL) { if (openfile->lock_filename != NULL) {
@ -461,7 +463,7 @@ bool open_buffer(const char *filename, bool new_buffer)
if (has_valid_path(realname)) { if (has_valid_path(realname)) {
#ifndef NANO_TINY #ifndef NANO_TINY
if (ISSET(LOCKING) && filename[0] != '\0') { if (ISSET(LOCKING) && !ISSET(VIEW_MODE) && filename[0] != '\0') {
/* When not overriding an existing lock, discard the buffer. */ /* When not overriding an existing lock, discard the buffer. */
if (do_lockfile(realname, TRUE) < 0) { if (do_lockfile(realname, TRUE) < 0) {
#ifdef ENABLE_MULTIBUFFER #ifdef ENABLE_MULTIBUFFER