--- mutt-1.5.6/PATCHES~	never
+++ mutt-1.5.6/PATCHES	Thu Jul  8 01:06:12 CDT 2004
@@ -1,0 +1 @@
+patch-1.5.6.gj-dgc.save_attach_map.1
diff -Pur mutt-1.5.6-base/doc/manual.sgml mutt-1.5.6-attach_sanitize/doc/manual.sgml
--- mutt-1.5.6-base/doc/manual.sgml	Sun Feb  1 12:22:19 2004
+++ mutt-1.5.6-attach_sanitize/doc/manual.sgml	Thu Jul  8 00:32:50 2004
@@ -1356,6 +1356,39 @@
 
 Also see the <ref id="fcc-save-hook" name="fcc-save-hook"> command.
 
+<sect1>Filename translation map<label id="save-attach-map">
+<p>
+Usage: <tt/save-attach-map/ <em/from-set/ <em/to-set/
+
+Some operating environments permit the use of file names that might
+be uncomfortable to you or difficult to use. (For example, they might
+contain spaces, or even forward slashes.) These awkward file names can
+be sent in MIME attachments. When saving such attachments, your default
+save file name will match the awkward file name from the sender's system.
+
+The <tt/save-attach-map/ lets you specify automatic character
+translations for attachment operations. It works much like Unix's
+<tt/tr/ command, or perl's <tt/tr/ or <tt/y/ operators. The <em/from-set/
+and <em/to-set/ parameters specify an ordered set of characters. If
+any character in <em/from-set/ is found in an attachment's file name,
+it will automatically be converted to the corresponding character in
+<em/to-set/ before your file name prompt is presented.
+
+<em/from-set/ and <em/to-set/ may contain character ranges. So, for
+example, you could force all file names to lowercase and translate
+spaces and slashes to underscores with:
+
+<tscreen><verb>
+save-attach-map "A-Z /" "a-z_"\n
+</verb></tscreen>
+
+Note that in this example, the <em/to-set/ contains fewer characters
+than the <em/from-set/. This is permissible: the last character of a
+"short set" becomes the default translation for an unmatched member of
+the other set. In this example, a space character explicitly maps to
+an underscore, and a forward slash implicitly maps to the underscore,
+because the underscore becomes a default mapping.
+
 <sect1>Specify default Fcc: mailbox when composing<label id="fcc-hook">
 <p>
 Usage: <tt/fcc-hook/ &lsqb;!&rsqb;<em/pattern/ <em/mailbox/
@@ -2458,6 +2491,16 @@
 <ref id="resend-message" name="resend-message">, and the reply
 and forward functions) to attachments of type <tt>message/rfc822</tt>.
 
+When attachments are saved, you will be prompted for a file name to save
+under. The default file name is stored in the actual e-mail message,
+as a MIME property for the attachment. You have the option of changing
+this name at the prompt. Note that some operating environments permit
+the use of file names that might be uncomfortable to you or difficult
+to use. You can establish a
+<ref id="save-attach-map" name="character translation map">
+to automatically adapt the default file name to suit
+your preference.
+
 See the help on the attachment menu for more information.
 
 <sect2>The Compose Menu<label id="compose_menu">
@@ -3039,6 +3082,8 @@
 <tt><ref id="push" name="push"></tt> <em/string/
 <item>
 <tt><ref id="set" name="reset"></tt> <em/variable/ &lsqb;<em/variable/ ... &rsqb;
+<item>
+<tt><ref id="save-attach-map" name="save-attach-map"></tt> <em/from-map/ <em/to-map/
 <item>
 <tt><ref id="save-hook" name="save-hook"></tt> <em/regexp/ <em/filename/
 <item>
diff -Pur mutt-1.5.6-base/doc/manual.sgml.head mutt-1.5.6-attach_sanitize/doc/manual.sgml.head
--- mutt-1.5.6-base/doc/manual.sgml.head	Sun Feb  1 11:49:53 2004
+++ mutt-1.5.6-attach_sanitize/doc/manual.sgml.head	Thu Jul  8 00:33:02 2004
@@ -1356,6 +1356,39 @@
 
 Also see the <ref id="fcc-save-hook" name="fcc-save-hook"> command.
 
+<sect1>Filename translation map<label id="save-attach-map">
+<p>
+Usage: <tt/save-attach-map/ <em/from-set/ <em/to-set/
+
+Some operating environments permit the use of file names that might
+be uncomfortable to you or difficult to use. (For example, they might
+contain spaces, or even forward slashes.) These awkward file names can
+be sent in MIME attachments. When saving such attachments, your default
+save file name will match the awkward file name from the sender's system.
+
+The <tt/save-attach-map/ lets you specify automatic character
+translations for attachment operations. It works much like Unix's
+<tt/tr/ command, or perl's <tt/tr/ or <tt/y/ operators. The <em/from-set/
+and <em/to-set/ parameters specify an ordered set of characters. If
+any character in <em/from-set/ is found in an attachment's file name,
+it will automatically be converted to the corresponding character in
+<em/to-set/ before your file name prompt is presented.
+
+<em/from-set/ and <em/to-set/ may contain character ranges. So, for
+example, you could force all file names to lowercase and translate
+spaces and slashes to underscores with:
+
+<tscreen><verb>
+save-attach-map "A-Z /" "a-z_"\n
+</verb></tscreen>
+
+Note that in this example, the <em/to-set/ contains fewer characters
+than the <em/from-set/. This is permissible: the last character of a
+"short set" becomes the default translation for an unmatched member of
+the other set. In this example, a space character explicitly maps to
+an underscore, and a forward slash implicitly maps to the underscore,
+because the underscore becomes a default mapping.
+
 <sect1>Specify default Fcc: mailbox when composing<label id="fcc-hook">
 <p>
 Usage: <tt/fcc-hook/ &lsqb;!&rsqb;<em/pattern/ <em/mailbox/
@@ -2458,6 +2491,16 @@
 <ref id="resend-message" name="resend-message">, and the reply
 and forward functions) to attachments of type <tt>message/rfc822</tt>.
 
+When attachments are saved, you will be prompted for a file name to save
+under. The default file name is stored in the actual e-mail message,
+as a MIME property for the attachment. You have the option of changing
+this name at the prompt. Note that some operating environments permit
+the use of file names that might be uncomfortable to you or difficult
+to use. You can establish a
+<ref id="save-attach-map" name="character translation map">
+to automatically adapt the default file name to suit
+your preference.
+
 See the help on the attachment menu for more information.
 
 <sect2>The Compose Menu<label id="compose_menu">
@@ -3039,6 +3082,8 @@
 <tt><ref id="push" name="push"></tt> <em/string/
 <item>
 <tt><ref id="set" name="reset"></tt> <em/variable/ &lsqb;<em/variable/ ... &rsqb;
+<item>
+<tt><ref id="save-attach-map" name="save-attach-map"></tt> <em/from-map/ <em/to-map/
 <item>
 <tt><ref id="save-hook" name="save-hook"></tt> <em/regexp/ <em/filename/
 <item>
diff -Pur mutt-1.5.6-base/globals.h mutt-1.5.6-attach_sanitize/globals.h
--- mutt-1.5.6-base/globals.h	Sun Feb  1 11:15:17 2004
+++ mutt-1.5.6-attach_sanitize/globals.h	Wed Jul  7 21:20:47 2004
@@ -171,6 +171,8 @@
 WHERE ALIAS *Aliases INITVAL (0);
 WHERE LIST *UserHeader INITVAL (0);
 
+WHERE struct cmap *SanitizeMap INITVAL (0);
+
 /*-- formerly in pgp.h --*/
 WHERE REGEXP PgpGoodSign;
 WHERE char *PgpSignAs;
diff -Pur mutt-1.5.6-base/init.c mutt-1.5.6-attach_sanitize/init.c
--- mutt-1.5.6-base/init.c	Sun Feb  1 12:21:00 2004
+++ mutt-1.5.6-attach_sanitize/init.c	Thu Jul  8 00:07:08 2004
@@ -2149,3 +2149,141 @@
       return c->data;
   return 0;
 }
+
+static int cmap_len (char *set)
+{
+  int len = 0;
+  char *p;
+
+  for (p = set; *p; ++p)
+  {
+    if ((*p == '-') && (p != set) && (*(p+1) != '\0'))
+    {
+      /* range */
+      len += *(p+1) - *(p-1);
+      p++; /* skip range end */
+    }
+    else
+      ++len;
+  }
+
+  return len;
+}
+
+static int cmap_copy(char *dst, char *src, int len)
+{
+  int si, di;
+
+  si = di = 0;
+  while ((si < len) && (di < len))
+  {
+    /* null is end of set -- will pad later */
+    if (src[si] == '\0')
+      break;
+
+    /* '-' denotes a range, if not at start or end of set */
+    if ((src[si] == '-') && (si != 0) && (si != len))
+    {
+      /* skip ahead in source past '-' and range end */
+      si += 2;
+
+      /* expand range */
+      for (; di < len; di++)
+      {
+	dst[di] = dst[di-1] + 1;
+	if (dst[di] == src[si-1])
+	  break;
+      }
+      di++;
+      continue;
+    }
+
+    /* in general, just copy bytes */
+    dst[di++] = src[si++];
+  }
+
+  /* if we've not completed the specified length, pad with last member of set */
+  if (di < len)
+  {
+    memset(&dst[di], dst[di-1], len-di);
+  }
+
+  return len;
+}
+
+static int parse_cmap (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err)
+{
+  struct cmap *map = NULL, **pmap = NULL;
+  char *from, *to, *mapname;
+  int flen, tlen, len;
+
+  dprint (1, (debugfile, "parse_cmap: map %ld\n", data));
+
+  if ((data & M_MAP_SAVEATTACH) == M_MAP_SAVEATTACH)
+  {
+    pmap = &SanitizeMap;
+    mapname = "save-attach-map";
+  }
+  else
+  {
+    snprintf (err->data, err->dsize, _("parse_cmap: unknown cmap"));
+    return -1;
+  }
+
+  if (!MoreArgs (s))
+  {
+    snprintf (err->data, err->dsize, _("%s: no source set"), mapname);
+    return (-1);
+  }
+  mutt_extract_token(buf, s, 0);
+  from = safe_strdup(buf->data);
+
+  if (!MoreArgs (s))
+  {
+    snprintf (err->data, err->dsize, _("%s: no translation set"), mapname);
+    return (-1);
+  }
+  mutt_extract_token(buf, s, 0);
+  to = safe_strdup(buf->data);
+
+  if (MoreArgs (s))
+  {
+    snprintf (err->data, err->dsize, _("%s: too many arguments"), mapname);
+    return (-1);
+  }
+
+
+  if (!(*pmap))
+  {
+    (*pmap) = safe_malloc(sizeof(struct cmap));
+    (*pmap)->from = (*pmap)->to = NULL;
+  }
+  map = *pmap;
+
+  FREE(&map->from);
+  FREE(&map->to);
+  map->len = 0;
+
+  flen = cmap_len(from);
+  tlen = cmap_len(to);
+
+  if (flen > tlen)
+    len = flen;
+  else
+    len = tlen;
+
+  map->from = safe_malloc(len+1);
+  map->to   = safe_malloc(len+1);
+  map->from[len] = '\0';
+  map->to[len]   = '\0';
+
+  /* copy from sets to maps */
+  cmap_copy(map->from, from, len);
+  cmap_copy(map->to,   to,   len);
+  map->len = len;
+
+  dprint (1, (debugfile, "parse_cmap: map from = \"%s\"\n", map->from));
+  dprint (1, (debugfile, "parse_cmap: map to   = \"%s\"\n", map->to));
+
+  return 0;
+}
diff -Pur mutt-1.5.6-base/init.h mutt-1.5.6-attach_sanitize/init.h
--- mutt-1.5.6-base/init.h	Sun Feb  1 11:15:17 2004
+++ mutt-1.5.6-attach_sanitize/init.h	Thu Jul  8 00:06:54 2004
@@ -51,6 +51,9 @@
 #define M_SET_UNSET	(1<<1)	/* default is to unset all vars */
 #define M_SET_RESET	(1<<2)	/* default is to reset all vars to default */
 
+/* flags to parse_cmap */
+#define M_MAP_SAVEATTACH	(1<<0)	/* for sanitizing filenames */
+
 /* forced redraw/resort types */
 #define R_NONE		0
 #define R_INDEX		(1<<0)
@@ -2741,6 +2744,7 @@
 static int parse_my_hdr (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 static int parse_unmy_hdr (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 static int parse_subscribe (BUFFER *, BUFFER *, unsigned long, BUFFER *);
+static int parse_cmap (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 
 struct command_t
 {
@@ -2789,6 +2793,7 @@
   { "reply-hook",	mutt_parse_hook,	M_REPLYHOOK },
   { "reset",		parse_set,		M_SET_RESET },
   { "save-hook",	mutt_parse_hook,	M_SAVEHOOK },
+  { "save-attach-map",	parse_cmap,		M_MAP_SAVEATTACH },
   { "score",		mutt_parse_score,	0 },
   { "send-hook",	mutt_parse_hook,	M_SENDHOOK },
   { "set",		parse_set,		0 },
diff -Pur mutt-1.5.6-base/mutt.h mutt-1.5.6-attach_sanitize/mutt.h
--- mutt-1.5.6-base/mutt.h	Sun Feb  1 11:15:17 2004
+++ mutt-1.5.6-attach_sanitize/mutt.h	Wed Jul  7 23:39:21 2004
@@ -838,6 +838,14 @@
 void state_prefix_putc (char, STATE *);
 int  state_printf(STATE *, const char *, ...);
 
+/* type for cmaps (sanitize_map, etc) - like a /usr/bin/tr translation map */
+struct cmap
+{
+  char *from;
+  char *to;
+  int   len;
+};
+
 #include "ascii.h"
 #include "protos.h"
 #include "lib.h"
diff -Pur mutt-1.5.6-base/muttlib.c mutt-1.5.6-attach_sanitize/muttlib.c
--- mutt-1.5.6-base/muttlib.c	Sun Feb  1 11:15:17 2004
+++ mutt-1.5.6-attach_sanitize/muttlib.c	Wed Jul  7 23:38:10 2004
@@ -1394,3 +1394,24 @@
 
   return 0;
 }
+
+/* apply a character translation map to a string */
+int mutt_apply_cmap (char *str, struct cmap *cmap)
+{
+  char *p, *q;
+  int ntrans = 0;
+
+  if (!cmap || !cmap->from || !cmap->to || cmap->len == 0)
+    return -1;
+
+  for (p = str; *p; p++)
+  {
+    if (q = strchr(cmap->from, *p))
+    {
+      *p = cmap->to[q - cmap->from];
+      ++ntrans;
+    }
+  }
+
+  return ntrans;
+}
diff -Pur mutt-1.5.6-base/protos.h mutt-1.5.6-attach_sanitize/protos.h
--- mutt-1.5.6-base/protos.h	Sun Feb  1 11:15:17 2004
+++ mutt-1.5.6-attach_sanitize/protos.h	Wed Jul  7 23:39:09 2004
@@ -336,6 +336,7 @@
 void mutt_set_header_color(CONTEXT *, HEADER *);
 void mutt_sleep (short);
 int mutt_save_confirm (const char  *, struct stat *);
+int mutt_apply_cmap (char *, struct cmap *);
 
 int mh_valid_message (const char *);
 
diff -Pur mutt-1.5.6-base/recvattach.c mutt-1.5.6-attach_sanitize/recvattach.c
--- mutt-1.5.6-base/recvattach.c	Wed Nov  5 03:41:33 2003
+++ mutt-1.5.6-attach_sanitize/recvattach.c	Wed Jul  7 23:41:42 2004
@@ -374,10 +374,12 @@
   
   if (body->filename) 
   {
+    strfcpy (tfile, body->filename, sizeof (tfile));
+    mutt_apply_cmap (tfile, SanitizeMap);
     if (directory && *directory)
-      mutt_concat_path (buf, *directory, mutt_basename (body->filename), sizeof (buf));
+      mutt_concat_path (buf, *directory, mutt_basename (tfile), sizeof (buf));
     else
-      strfcpy (buf, body->filename, sizeof (buf));
+      strfcpy (buf, tfile, sizeof (buf));
   }
   else if(body->hdr &&
 	  body->encoding != ENCBASE64 &&
@@ -464,6 +466,7 @@
 	  int append = 0;
 
 	  strfcpy (buf, NONULL (top->filename), sizeof (buf));
+	  mutt_apply_cmap (buf, SanitizeMap);
 	  if (mutt_get_field (_("Save to file: "), buf, sizeof (buf),
 				    M_FILE | M_CLEAR) != 0 || !buf[0])
 	    return;