Add filename_base option.

Author: Peter McCluskey

Changelog

@@ -1,5 +1,8 @@
 Version Changes for Hypermail
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Peter McCluskey (Nov 28, 2004)
+  Add filename_base option.
+
  Peter McCluskey (Sep 29, 2004)
   Add support for JAVT timezone.
   Add mailbox_date_trimmer to contrib, faq.

configs/hmrc.example

@@ -879,3 +879,13 @@ show_index_links = 1
 # in the future.
 
 # use_sender_date = 0
+
+# filename_base = string
+#
+# This option overrides the normal rules for creating attachment
+# file names, and creates file names from the string that this
+# option is set to plus a file name extension if one can be found
+# in the name supplied by the message. This option is mainly for
+# languages that use different character sets from English.
+
+# filename_base = 

docs/hmrc.html

@@ -129,6 +129,7 @@ <h1 align=center><img src="hypermail.png" width="60" align="middle" height="60"
   <li><a href="#unsafe_chars">unsafe_chars</a> restrict filename chars
   <li><a href="#save_alts">save_alts</a> multipart/alternative handling
   <li><a href="#alts_text">alts_text</a> text for some save_alts choices
+  <li><a href="#filename_base">filename_base</a> attachment file name
   </ul>
 
 <li><a href="#sysadmin">System Administration</a>
@@ -157,6 +158,7 @@ <h1 align=center><img src="hypermail.png" width="60" align="middle" height="60"
     <li><a href="#htmlsuffix">htmlsuffix</a> .html, .htm, etc
     <li><a href="#dirmode">dirmode</a> chmod directories
     <li><a href="#filemode">filemode</a> chmod html files
+    <li><a href="#filename_base">filename_base</a> attachment file name
     </ul>
   <li><a href="#sysmisc">Miscellaneous</a>
     <ul>
@@ -1117,6 +1119,17 @@ <h3><a name="files">Filesystem output</a></h3>
 <br><i>filemode = 0644</i>
 </dd>
 
+<a name="filename_base"></a>
+<dt><strong>filename_base = [ string ]</strong></dt><dd>
+This option overrides the normal rules for creating attachment
+file names, and creates file names from the string that this
+option is set to plus a file name extension if one can be found
+in the name supplied by the message. This option is mainly for
+languages that use different character sets from English.
+<br>
+<br><i>filename_base = attachment</i> (disabled by default)
+</dd>
+
 <h3><a name="sysmisc">System miscellaneous</a></h3>
 
 <a name="usegdbm"></a>

src/parse.c

@@ -302,6 +302,26 @@ char *safe_filename(char *name)
     return name;
 }
 
+static void
+create_attachname(char *attachname, int max_len)
+{
+    int i, max_i;
+    char suffix[8];
+    max_i = strlen(attachname);
+    if(max_i >= max_len)
+	max_i = max_len - 1;
+    i = max_i;
+    while(i >= 0 && i > max_i - sizeof(suffix) && attachname[i] != '.')
+	--i;
+    if(i >= 0 && attachname[i] == '.')
+	strncpy(suffix, attachname + i, sizeof(suffix) - 1);
+    else
+	suffix[0] = 0;
+    strncpy(attachname, set_filename_base, max_len);
+    strncat(attachname, suffix, max_len - strlen(attachname) - 1);
+    safe_filename(attachname);
+}
+
 /*
 ** Cross-indexes - adds to a list of replies. If a message is a reply to
 ** another, the number of the message it's replying to is added to the list.
@@ -2395,6 +2415,8 @@ msgid);
 			    if (att_counter > 99)
 				binname = NULL;
 			    else {
+				if (set_filename_base)
+				    create_attachname(attachname, sizeof(attachname));
 				if (attachname[0])
 				    fname = attachname;
 				else

src/setup.c

@@ -130,6 +130,7 @@ char *set_mhtmlheader;
 char *set_mhtmlfooter;
 char *set_attachmentlink;
 char *set_unsafe_chars;
+char *set_filename_base;
 
 char *set_folder_by_date;
 char *set_latest_folder;
@@ -774,6 +775,13 @@ struct Config cfg[] = {
      "# message was received, for purposes such as putting in folders\n"
      "# or sorting. Details of which purposes this affects may change\n"
      "# in the future.\n", FALSE},
+
+    {"filename_base", &set_filename_base, NULL, CFG_STRING,
+     "# This option overrides the normal rules for creating attachment\n"
+     "# file names, and creates file names from the string that this\n"
+     "# option is set to plus a file name extension if one can be found\n"
+     "# in the name supplied by the message. This option is mainly for\n"
+     "# languages that use different character sets from English.\n", FALSE},
 };
 
 /* ---------------------------------------------------------------- */

src/setup.h

@@ -145,6 +145,7 @@ extern char *set_mhtmlfooter;
 
 extern char *set_attachmentlink;
 extern char *set_unsafe_chars;
+extern char *set_filename_base;
 extern bool set_linkquotes;
 
 extern char *set_antispamdomain;