Do not unlink() note files on note removal
Now that we use hash-based note file names, note files should never be unlinked as a note file might be shared. Also, remove the ERASE_FORCE_KEEP_NOTE flag that no longer makes any sense. Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
12
src/note.c
12
src/note.c
@@ -65,7 +65,7 @@ edit_note (char **note, char *editor)
|
||||
wins_launch_external (tmppath, editor);
|
||||
|
||||
if (io_file_is_empty (tmppath) > 0)
|
||||
erase_note (note, ERASE_FORCE_KEEP_NOTE);
|
||||
erase_note (note);
|
||||
else if ((fp = fopen (tmppath, "r")))
|
||||
{
|
||||
sha1_stream (fp, sha1);
|
||||
@@ -93,18 +93,10 @@ view_note (char *note, char *pager)
|
||||
|
||||
/* Erase a note previously attached to an item. */
|
||||
void
|
||||
erase_note (char **note, enum eraseflg flag)
|
||||
erase_note (char **note)
|
||||
{
|
||||
char fullname[BUFSIZ];
|
||||
|
||||
if (*note == NULL)
|
||||
return;
|
||||
if (flag != ERASE_FORCE_KEEP_NOTE)
|
||||
{
|
||||
(void)snprintf (fullname, BUFSIZ, "%s%s", path_notes, *note);
|
||||
if (unlink (fullname) != 0)
|
||||
EXIT (_("could not remove note"));
|
||||
}
|
||||
mem_free (*note);
|
||||
*note = NULL;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user