* net/tramp.el (tramp-remote-coding-commands): Add an alternative

using "base64 -d -i".  This is needed for older base64 versions
from GNU coreutils.  Reported by Klaus Reichl
<Klaus.Reichl@thalesgroup.com>.

This must not be merged with the trunk.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a86be12849941680863b19d135ec01ee955e063e..cb4dfb4651d674d9a88c310e299b5d7560cb0a20 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2010-11-13  Michael Albinus  <michael.albinus@gmx.de>
+
+       * net/tramp.el (tramp-remote-coding-commands): Add an alternative
+       using "base64 -d -i".  This is needed for older base64 versions
+       from GNU coreutils.  Reported by Klaus Reichl
+       <Klaus.Reichl@thalesgroup.com>.
+
 2010-11-13  Glenn Morris  <rgm@gnu.org>
 
        * novice.el (disabled-command-function):

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 17c8c074c464668c0912a299e78eb67b15a1f31f..e0f25ffd1f3d790cf0150c327062906503e93928 100644 (file)
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -7162,7 +7162,11 @@ and end of region, and are expected to replace the region contents
 with the encoded or decoded results, respectively.")
 
 (defconst tramp-remote-coding-commands
-  '((b64 "base64" "base64 -d")
+  '((b64 "base64" "base64 -d -i")
+    ;; "-i" is more robust with older base64 from GNU coreutils.
+    ;; However, I don't know whether all base64 versions do supports
+    ;; this option.
+    (b64 "base64" "base64 -d")
     (b64 "mimencode -b" "mimencode -u -b")
     (b64 "mmencode -b" "mmencode -u -b")
     (b64 "recode data..base64" "recode base64..data")