diff options
| -rw-r--r-- | src/calcurse.h | 1 | ||||
| -rw-r--r-- | src/ical.c | 15 | ||||
| -rw-r--r-- | src/note.c | 19 |
3 files changed, 23 insertions, 12 deletions
diff --git a/src/calcurse.h b/src/calcurse.h index 5b4bffe..5104d45 100644 --- a/src/calcurse.h +++ b/src/calcurse.h @@ -779,6 +779,7 @@ void mem_stats (void); #endif /* CALCURSE_MEMORY_DEBUG */ /* note.c */ +char *generate_note (const char *); void edit_note (char **, char *); void view_note (char *, char *); void erase_note (char **); @@ -37,7 +37,6 @@ #include <sys/types.h> #include "calcurse.h" -#include "sha1.h" #define ICALDATEFMT "%Y%m%d" #define ICALDATETIMEFMT "%Y%m%dT%H%M%S" @@ -866,9 +865,7 @@ static char * ical_read_note (char *line, unsigned *noskipped, ical_vevent_e item_type, const int itemline, FILE *log) { - char *sha1 = mem_malloc (SHA1_DIGESTLEN * 2 + 1); - char *p, *notestr, fullnotename[BUFSIZ]; - FILE *fdo; + char *p, *notestr, *note; if ((p = strchr (line, ':')) != NULL) { @@ -888,15 +885,9 @@ ical_read_note (char *line, unsigned *noskipped, ical_vevent_e item_type, } else { - sha1_digest (notestr, sha1); - snprintf (fullnotename, BUFSIZ, "%s%s", path_notes, sha1); - fdo = fopen (fullnotename, "w"); - EXIT_IF (fdo == NULL, _("Warning: could not open %s, Aborting..."), - fullnotename); - fprintf (fdo, "%s", notestr); - file_close (fdo, __FILE_POS__); + note = generate_note (notestr); mem_free (notestr); - return sha1; + return note; } } else @@ -46,6 +46,25 @@ struct note_gc_hash { HTABLE_ENTRY (note_gc_hash); }; +/* Create note file from a string and return a newly allocated string that + * contains its name. */ +char * +generate_note (const char *str) +{ + char *sha1 = mem_malloc (SHA1_DIGESTLEN * 2 + 1); + char notepath[BUFSIZ]; + FILE *fp; + + sha1_digest (str, sha1); + snprintf (notepath, BUFSIZ, "%s%s", path_notes, sha1); + fp = fopen (notepath, "w"); + EXIT_IF (fp == NULL, _("Warning: could not open %s, Aborting..."), notepath); + fputs (str, fp); + file_close (fp, __FILE_POS__); + + return sha1; +} + /* Edit a note with an external editor. */ void edit_note (char **note, char *editor) |