From ff4dd1991d5f4cb0ffc0bf52e87072a5c01c98f8 Mon Sep 17 00:00:00 2001 From: Bill Wohler Date: Tue, 14 Nov 2006 06:30:50 +0000 Subject: [PATCH] (mh-x-image-url-cache-canonicalize): Add `*' to reserved Windows filename characters (closes SF #1396499). --- lisp/mh-e/ChangeLog | 5 +++++ lisp/mh-e/mh-xface.el | 16 +++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog index 594fb2e693..1aea0bed52 100644 --- a/lisp/mh-e/ChangeLog +++ b/lisp/mh-e/ChangeLog @@ -1,3 +1,8 @@ +2006-11-14 Bill Wohler + + * mh-xface.el (mh-x-image-url-cache-canonicalize): Add `*' to + reserved Windows filename characters (closes SF #1396499). + 2006-11-13 Bill Wohler Release MH-E version 8.0.3. diff --git a/lisp/mh-e/mh-xface.el b/lisp/mh-e/mh-xface.el index deb2cebad1..e6da73339c 100644 --- 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." -- 2.20.1