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

rcfile tweaks: prompt only once for all rcfile errors instead of once

Browse Source 
for each separate error, make sure all the messages end in newlines,
etc.


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1876 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
David Lawrence Ramsey
2004-07-30 22:52:44 +00:00
parent 906257932f
commit a6d26d04fd
4 changed files with 40 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/files.c
View File

@@ -2955,7 +2955,7 @@ void load_history(void)
if (errno != ENOENT) {
/* Don't save history when we quit. */
UNSET(HISTORYLOG);
rcfile_error(N_("Unable to open ~/.nano_history file: %s"), strerror(errno));
rcfile_error(N_("Unable to open ~/.nano_history file: %s\n"), strerror(errno));
}
free(nanohist);
} else {
@@ -3005,7 +3005,7 @@ void save_history(void)
if (homenv != NULL || userage != NULL) {
hist = fopen(nanohist, "wb");
if (hist == NULL)
rcfile_error(N_("Unable to write ~/.nano_history file: %s"), strerror(errno));
rcfile_error(N_("Unable to write ~/.nano_history file: %s\n"), strerror(errno));
else {
/* set rw only by owner for security ?? */
chmod(nanohist, S_IRUSR | S_IWUSR);
@@ -3014,19 +3014,19 @@ void save_history(void)
h->data = charealloc(h->data, strlen(h->data) + 2);
strcat(h->data, "\n");
if (fputs(h->data, hist) == EOF) {
rcfile_error(N_("Unable to write ~/.nano_history file: %s"), strerror(errno));
rcfile_error(N_("Unable to write ~/.nano_history file: %s\n"), strerror(errno));
goto come_from;
}
}
if (fputs("\n", hist) == EOF) {
rcfile_error(N_("Unable to write ~/.nano_history file: %s"), strerror(errno));
rcfile_error(N_("Unable to write ~/.nano_history file: %s\n"), strerror(errno));
goto come_from;
}
for (h = replace_history.tail; h->prev; h = h->prev) {
h->data = charealloc(h->data, strlen(h->data) + 2);
strcat(h->data, "\n");
if (fputs(h->data, hist) == EOF) {
rcfile_error(N_("Unable to write ~/.nano_history file: %s"), strerror(errno));
rcfile_error(N_("Unable to write ~/.nano_history file: %s\n"), strerror(errno));
goto come_from;
}
}