Some refactoring and adding Changelog entry to PR #73

Author: jkbzh

Changelog

@@ -12,6 +12,12 @@ HYPERMAIL VERSION 2.4.1:
 	-ltrio, where -lm had to be declared after -ltrio.
         (closes # 84)
 
+2021-11-17 David Hughes
+	* docs/hmrc.html src/parse.c
+	Added support for strftime (3) formatting in the append_filename configuration
+	option to allow for archived messages to be split over multiple directories
+	(monthly or yearly for example)
+
 2021-06-04 Baptiste Daroussin
 	* src/uudecode.c src/parse.c
 	Fixes for memory issues detected by libasan

docs/hmrc.html

@@ -1301,7 +1301,11 @@ <h3><a name="sysmisc" id="sysmisc">System miscellaneous</a></h3>
 <i>append = 1</i></dd>
 <dd><a name="append_filename" id="append_filename"></a></dd>
 <dt><strong>append_filename = [ string ]</strong></dt>
-<dd>Specifies the filename to be used by the append option. $DIR may be used to specify a name relative to the directory specified in the -d or dir option.  The string will be passed to strftime(3) to allow splitting the mailbox into yearly or monthy files, such as "%Y-%m.mbox". <br>
+<dd>Specifies the filename to be used by the append option. $DIR may
+be used to specify a name relative to the directory specified in the
+-d or dir option.  The string will be passed to strftime(3) to allow
+splitting the mailbox into yearly or monthy files, such as
+"%Y-%m.mbox". <br>
 <br>
 <i>append_filename = $DIR/INBOX</i></dd>
 <dd><a name="txtsuffix" id="txtsuffix"></a></dd>

src/parse.c

@@ -1536,7 +1536,6 @@ int parsemail(char *mbox,	/* file name */
     int num, isinheader, hassubject, hasdate;
     int num_added = 0;
     long exp_time = -1;
-    time_t curtime;
     time_t delete_older_than = (set_delete_older ? convtoyearsecs(set_delete_older) : 0);
     time_t delete_newer_than = (set_delete_newer ? convtoyearsecs(set_delete_newer) : 0);
     annotation_robot_t annotation_robot = ANNOTATION_ROBOT_NONE;
@@ -1667,14 +1666,19 @@ int parsemail(char *mbox,	/* file name */
 	*filename = 0;
 	*pathname = 0;
 	if (set_append_filename) {
+            time_t curtime;
+            const struct tm *local_curtime;
+            
 	    time(&curtime);
+            local_curtime = localtime(&curtime);
+            
 	    if(strncmp(set_append_filename, "$DIR/", 5) == 0) {
 	        strncpy(directory, dir, MAXFILELEN - 1);
                 strftime(filename, MAXFILELEN - 1, set_append_filename+5, 
-			    localtime(&curtime));
+                         local_curtime);
             } else {
                 strftime(filename, MAXFILELEN - 1, set_append_filename, 
-			    localtime(&curtime));
+                         local_curtime);
 	    }
 	} else {
 	    strncpy(directory, dir, MAXFILELEN - 1);