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

history: remove the migration service for the old searches file 

The code has been there for the last thirty releases -- for six
whole years -- more than enough time to have served its purpose.
master
Benno Schulenberg 2017-10-03 21:15:17 +02:00
parent ede44e16ff
commit 15738c6b39
1 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/history.c
View File

@ -234,13 +234,6 @@ char *histfilename(void)
return construct_filename("/.nano/search_history"); return construct_filename("/.nano/search_history");
} }
/* Construct the legacy history filename. */
/* (To be removed in 2018.) */
char *legacyhistfilename(void)
{
return construct_filename("/.nano_history");
}
char *poshistfilename(void) char *poshistfilename(void)
{ {
return construct_filename("/.nano/filepos_history"); return construct_filename("/.nano/filepos_history");
@ -291,24 +284,7 @@ bool have_dotnano(void)
void load_history(void) void load_history(void)
{ {
char *histname = histfilename(); char *histname = histfilename();
char *legacyhist = legacyhistfilename(); FILE *hisfile = fopen(histname, "rb");
struct stat hstat;
FILE *hisfile;
/* If there is an old history file, migrate it. */
/* (To be removed in 2018.) */
if (stat(legacyhist, &hstat) != -1 && stat(histname, &hstat) == -1) {
if (rename(legacyhist, histname) == -1)
history_error(N_("Detected a legacy nano history file (%s) which I tried to move\n"
"to the preferred location (%s) but encountered an error: %s"),
legacyhist, histname, strerror(errno));
else
history_error(N_("Detected a legacy nano history file (%s) which I moved\n"
"to the preferred location (%s)\n(see the nano FAQ about this change)"),
legacyhist, histname);
}
hisfile = fopen(histname, "rb");
if (hisfile == NULL) { if (hisfile == NULL) {
if (errno != ENOENT) { if (errno != ENOENT) {
@ -347,7 +323,6 @@ void load_history(void)
history_changed = FALSE; history_changed = FALSE;
free(histname); free(histname);
free(legacyhist);
} }
/* Write the lines of a history list, starting at head, from oldest to newest, /* Write the lines of a history list, starting at head, from oldest to newest,