mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-18 17:29:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

Ticket #1617: Fixed saving filepos file

Browse Source 
Restored old behaviour with some new improvements.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
This commit is contained in:
Slava Zanko 2009-10-19 23:40:28 +03:00
parent f3f975ec16
commit e3702891ae
2 changed files with 43 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/util.c
View File

@ -51,6 +51,7 @@
#include "mountlist.h" #include "mountlist.h"
#include "timefmt.h" #include "timefmt.h"
#include "strutil.h" #include "strutil.h"
#include "./src/mcconfig/mcconfig.h"
#include "fileopctx.h" #include "fileopctx.h"
#include "file.h" /* copy_file_file() */ #include "file.h" /* copy_file_file() */
#include "dir.h" #include "dir.h"
@ -1398,40 +1399,75 @@ load_file_position (const char *filename, long *line, long *column)
} }
/* Save position for the given file */ /* Save position for the given file */
#define TMP_SUFFIX ".tmp"
void void
save_file_position (const char *filename, long line, long column) save_file_position (const char *filename, long line, long column)
{ {
char *fn; static int filepos_max_saved_entries = 0;
FILE *f; char *fn, *tmp_fn;
FILE *f, *tmp_f;
char buf[MC_MAXPATHLEN + 20];
int i = 1;
gsize len;
if (filepos_max_saved_entries == 0)
filepos_max_saved_entries = mc_config_get_int(mc_main_config, CONFIG_APP_SECTION, "filepos_max_saved_entries", 1024);
fn = g_build_filename (home_dir, MC_USERCONF_DIR, MC_FILEPOS_FILE, NULL); fn = g_build_filename (home_dir, MC_USERCONF_DIR, MC_FILEPOS_FILE, NULL);
if (fn == NULL) if (fn == NULL)
return; return;
mc_util_make_backup_if_possible (fn, ".tmp"); len = strlen (filename);
mc_util_make_backup_if_possible (fn, TMP_SUFFIX);
/* open file */ /* open file */
f = fopen (fn, "a"); f = fopen (fn, "w");
if (f == NULL) { if (f == NULL) {
g_free (fn); g_free (fn);
return; return;
} }
tmp_fn = g_strdup_printf("%s" TMP_SUFFIX ,fn);
tmp_f = fopen (tmp_fn, "r");
if (tmp_f == NULL) {
g_free(tmp_fn);
mc_util_restore_from_backup_if_possible (fn, TMP_SUFFIX);
g_free (fn);
return;
}
/* put the new record */ /* put the new record */
if (line != 1 || column != 0) { if (line != 1 || column != 0) {
if (fprintf (f, "%s %ld;%ld\n", filename, line, column) < 0) { if (fprintf (f, "%s %ld;%ld\n", filename, line, column) < 0) {
g_free(tmp_fn);
fclose (tmp_f);
fclose (f); fclose (f);
mc_util_restore_from_backup_if_possible (fn, ".tmp"); mc_util_restore_from_backup_if_possible (fn, TMP_SUFFIX);
g_free (fn); g_free (fn);
return; return;
} }
} }
while (fgets (buf, sizeof (buf), tmp_f)) {
if (
buf[len] == ' ' &&
strncmp (buf, filename, len) == 0 &&
!strchr (&buf[len + 1], ' ')
)
continue;
fprintf (f, "%s", buf);
if (++i > filepos_max_saved_entries)
break;
}
fclose (tmp_f);
g_free(tmp_fn);
fclose (f); fclose (f);
mc_util_unlink_backup_if_possible (fn, ".tmp"); mc_util_unlink_backup_if_possible (fn, TMP_SUFFIX);
g_free (fn); g_free (fn);
} }
#undef TMP_SUFFIX
extern const char * extern const char *
cstrcasestr (const char *haystack, const char *needle) cstrcasestr (const char *haystack, const char *needle)
{ {

2
src/util.h
View File

@ -210,8 +210,6 @@ GList *list_append_unique (GList *list, char *text);
/* Position saving and restoring */ /* Position saving and restoring */
/* maximum entries in MC_FILEPOS */
#define MC_FILEPOS_ENTRIES 1024
/* Load position for the given filename */ /* Load position for the given filename */
void load_file_position (const char *filename, long *line, long *column); void load_file_position (const char *filename, long *line, long *column);
/* Save position for the given filename */ /* Save position for the given filename */