bug-gnu-emacs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

bug#44411: 28.0.50; uudecode-decode-region-internal is broken


From: Kazuhiro Ito
Subject: bug#44411: 28.0.50; uudecode-decode-region-internal is broken
Date: Thu, 05 Nov 2020 19:48:08 +0900
User-agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (Goj┼Ź) APEL-LB/10.8 Emacs/28.0.50 (x86_64-w64-mingw32) MULE/6.0 (HANACHIRUSATO)

> OK, I agree also to your other optimizations, but can we please go a
> step further and avoid consing a string here?  'insert' is perfectly
> capable of inserting characters, not only strings.  So in the
> unibyte-buffer case, just something like
> 
>   (apply #'insert (nreverse result))
> 
> with 'result' being a list of bytes, will produce what you want.  And
> in the multibyte-buffer case you just need to convert each byte to its
> Unicode-compatible codepoint, by using
> 
>   (decode-char 'eight-bit CH)
> 
> probably in 'mapcar' or somesuch, and then call 'insert'.
> 
> Can you augment your patch along these lines, please?

Here is a revised one.


diff --git a/lisp/mail/uudecode.el b/lisp/mail/uudecode.el
index bcbd571b53..0dce9b7b72 100644
--- a/lisp/mail/uudecode.el
+++ b/lisp/mail/uudecode.el
@@ -149,12 +149,10 @@ uudecode-decode-region-internal
              (setq counter (1+ counter)
                    inputpos (1+ inputpos))
              (cond ((= counter 4)
-                    (setq result (cons
-                                  (concat
-                                   (char-to-string (ash bits -16))
-                                   (char-to-string (logand (ash bits -8) 255))
-                                   (char-to-string (logand bits 255)))
-                                  result))
+                    (setq result (cons (logand bits 255)
+                                       (cons (logand (ash bits -8) 255)
+                                             (cons (ash bits -16)
+                                                   result))))
                     (setq bits 0 counter 0))
                    (t (setq bits (ash bits 6)))))))
          (cond
@@ -166,26 +164,26 @@ uudecode-decode-region-internal
            ;;(error "uucode ends unexpectedly")
            (setq done t))
           ((= counter 3)
-           (setq result (cons
-                         (concat
-                          (char-to-string (logand (ash bits -16) 255))
-                          (char-to-string (logand (ash bits -8) 255)))
-                         result)))
+           (setq result (cons (logand (ash bits -8) 255)
+                              (cons (logand (ash bits -16) 255)
+                                    result))))
           ((= counter 2)
-           (setq result (cons
-                         (char-to-string (logand (ash bits -10) 255))
-                         result))))
+           (setq result (cons (logand (ash bits -10) 255)
+                              result))))
          (skip-chars-forward non-data-chars end))
        (if file-name
             (with-temp-file file-name
               (set-buffer-multibyte nil)
-              (insert (apply #'concat (nreverse result))))
+              (apply #'insert (nreverse result)))
          (or (markerp end) (setq end (set-marker (make-marker) end)))
          (goto-char start)
-         (if enable-multibyte-characters
-             (dolist (x (nreverse result))
-                (insert (decode-coding-string x 'binary)))
-           (insert (apply #'concat (nreverse result))))
+          (apply #'insert
+                 (nreverse
+                  (if enable-multibyte-characters
+                      (mapcar (lambda (ch)
+                                (or (decode-char 'eight-bit ch) ch))
+                              result)
+                    result)))
          (delete-region (point) end))))))
 
 ;;;###autoload



-- 
Kazuhiro Ito





reply via email to

[Prev in Thread] Current Thread [Next in Thread]