fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use hash-based file names in ical_read_note()

Browse Source 
Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2011-08-02 21:49:49 +02:00
parent 5c6a00ee93
commit c77d1a573f
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/io.c
View File

@ -45,6 +45,7 @@
#include <errno.h> #include <errno.h>
#include "calcurse.h" #include "calcurse.h"
#include "sha1.h"
#define ICALDATEFMT "%Y%m%d" #define ICALDATEFMT "%Y%m%d"
#define ICALDATETIMEFMT "%Y%m%dT%H%M%S" #define ICALDATETIMEFMT "%Y%m%dT%H%M%S"
@ -2308,43 +2309,37 @@ static char *
ical_read_note (char *line, unsigned *noskipped, ical_vevent_e item_type, ical_read_note (char *line, unsigned *noskipped, ical_vevent_e item_type,
const int itemline, FILE *log) const int itemline, FILE *log)
{ {
char *p, *notestr, *notename, fullnotename[BUFSIZ]; char *sha1 = mem_malloc (SHA1_DIGESTLEN * 2 + 1);
char *p, *notestr, fullnotename[BUFSIZ];
FILE *fdo; FILE *fdo;
if ((p = strchr (line, ':')) != NULL) if ((p = strchr (line, ':')) != NULL)
{ {
notename = new_tempfile (path_notes, TMPEXTSIZ);
EXIT_IF (notename == NULL,
_("Warning: could not create new note file to store "
"description. Aborting...\n"));
(void)snprintf (fullnotename, BUFSIZ, "%s%s", path_notes, notename);
fdo = fopen (fullnotename, "w");
EXIT_IF (fdo == NULL, _("Warning: could not open %s, Aborting..."),
fullnotename);
p++; p++;
notestr = ical_unformat_line (p); notestr = ical_unformat_line (p);
if (notestr == NULL) if (notestr == NULL)
{ {
ical_log (log, item_type, itemline, ical_log (log, item_type, itemline,
_("could not get entire item description.")); _("could not get entire item description."));
file_close (fdo, __FILE_POS__);
erase_note (&notename, ERASE_FORCE);
(*noskipped)++; (*noskipped)++;
return NULL; return NULL;
} }
else if (strlen (notestr) == 0) else if (strlen (notestr) == 0)
{ {
file_close (fdo, __FILE_POS__);
erase_note (&notename, ERASE_FORCE);
mem_free (notestr); mem_free (notestr);
return NULL; return NULL;
} }
else else
{ {
sha1_digest (notestr, sha1);
(void)snprintf (fullnotename, BUFSIZ, "%s%s", path_notes, sha1);
fdo = fopen (fullnotename, "w");
EXIT_IF (fdo == NULL, _("Warning: could not open %s, Aborting..."),
fullnotename);
(void)fprintf (fdo, "%s", notestr); (void)fprintf (fdo, "%s", notestr);
file_close (fdo, __FILE_POS__); file_close (fdo, __FILE_POS__);
mem_free (notestr); mem_free (notestr);
return notename; return sha1;
} }
} }
else else