(mh-x-image-url-cache-canonicalize): Add `*' to reserved Windows

filename characters (closes SF #1396499).

diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 594fb2e6933e5fd030253d9acabf5e63e7524c2d..1aea0bed52ebc56c9e909c717c9f03c2350aef37 100644 (file)
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-14  Bill Wohler  <wohler@newt.com>
+
+       * mh-xface.el (mh-x-image-url-cache-canonicalize): Add `*' to
+       reserved Windows filename characters (closes SF #1396499).
+
 2006-11-13  Bill Wohler  <wohler@newt.com>
 
        Release MH-E version 8.0.3.

diff --git a/lisp/mh-e/mh-xface.el b/lisp/mh-e/mh-xface.el
index deb2cebad14d73846d63557755da504742490bf5..e6da73339c1d9c619c4d6e73d38d4269c653a95b 100644 (file)
--- a/lisp/mh-e/mh-xface.el
+++ b/lisp/mh-e/mh-xface.el
@@ -361,14 +361,16 @@ This is only done if `mh-x-image-cache-directory' is nil."
 Replace the ?/ character with a ?! character and append .png.
 Also replaces special characters with `mh-url-hexify-string'
 since not all characters, such as :, are legal within Windows
-filenames. See URL
-`http://msdn.microsoft.com/library/default.asp?url=/library/en-us/fileio/fs/naming_a_file.asp'."
+filenames. In addition, replaces * with %2a. See URL
+`http://msdn.microsoft.com/library/default.asp?url=/library/en-us/shellcc/platform/shell/reference/ifaces/iitemnamelimits/GetValidCharacters.asp'."
   (format "%s/%s.png" mh-x-image-cache-directory
-          (mh-url-hexify-string
-           (with-temp-buffer
-             (insert url)
-             (mh-replace-string "/" "!")
-             (buffer-string)))))
+          (mh-replace-regexp-in-string
+           "\*" "%2a"
+           (mh-url-hexify-string
+            (with-temp-buffer
+              (insert url)
+              (mh-replace-string "/" "!")
+              (buffer-string))))))
 
 (defun mh-x-image-get-download-state (file)
   "Check the state of FILE by following any symbolic links."