[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: ange-ftp-file-size
From: |
Toru TSUNEYOSHI |
Subject: |
Re: ange-ftp-file-size |
Date: |
Sat, 17 Oct 2009 11:21:36 +0900 |
Thank you for your checking.
>> BTW, about save-match-data, I used it because of inhibiting changing old
>> match data. Using it is wrong (as the style)?
>
> save-match-data should only be used where it is really needed, not
> defensively: 99% of the code may destroy the match-date (and could thus
> use save-match-data defensively), whereas less than 1% of the code needs
> the match-data to be saved.
>
I understand you. I will be carefull about using `save-match-data' from
now on.
>> - (and (eq cmd0 'quote) (string= cmd1 "mdtm")))
>> + (and (eq cmd0 'quote) (string-match-p "^\\(mdtm\\|size\\)$"
>> cmd1)))
>
> I used (member cmd1 '("mdtm" "size")) instead. The regexp equivalent
> would be "\\`\\(mdtm\\|size\\)\\'".
>
I also think it is better.
>> + (res (prog2
>> + (unless ascii-mode
>> + (ange-ftp-set-binary-mode host user))
>> + (ange-ftp-send-cmd host user (list 'quote "size" name))
>> + (unless ascii-mode
>> + (ange-ftp-set-ascii-mode host user))))
>
> Now that I look at it: isn't it problematic to set the mode to `ascii'
> here? If the mode was binary before and we call it with ascii-mode=nil,
> we end up switching to ascii mode unwittingly, don't we?
>
I read the code of `ange-ftp.el'.
The follows is written...
In comments:
By default ange-ftp transfers files in ASCII mode.
In code:
(defun ange-ftp-...
...
(unwind-protect
(progn
...
(if binary
(ange-ftp-set-binary-mode host user))
...)
(if binary
(ange-ftp-set-ascii-mode host user)))
...)
So, I understood that `ASCII mode' is basic mode.
I wrote after the style.
(In my former patch, I should have used `unwind-protect'.)
But, as you wrote, there is no guarantee that the mode is always ascii.
So, I wrote the mode changing clearly.
>
> Stefan
>
Would you like to check my patch again ?
--- ange-ftp.el.orig Sun Jun 21 13:37:58 2009
+++ ange-ftp.el Sat Oct 17 11:06:58 2009
@@ -2338,7 +2338,7 @@
;; Second argument is the remote name
((or (memq cmd0 '(append put chmod))
- (and (eq cmd0 'quote) (string= cmd1 "mdtm")))
+ (and (eq cmd0 'quote) (member cmd1 '("mdtm" "size"))))
(setq cmd2 (funcall fix-name-func cmd2)))
;; Both arguments are remote names
((eq cmd0 'rename)
@@ -3455,7 +3455,7 @@
'(0 0) ;4 atime
(ange-ftp-file-modtime file) ;5 mtime
'(0 0) ;6 ctime
- -1 ;7 size
+ (ange-ftp-file-size file) ;7 size
(concat (if (stringp dirp) "l" (if dirp "d" "-"))
"?????????") ;8 mode
nil ;9 gid weird
@@ -3557,6 +3557,35 @@
(or (zerop (car file-mdtm))
(<= (float-time file-mdtm) (float-time buf-mdtm))))
(ange-ftp-real-verify-visited-file-modtime buf))))
+
+(defun ange-ftp-file-size (file &optional ascii-mode)
+ "Return the size of remote file FILE. Return -1 if can't get it.
+If ascii-mode is non-nil, return the size with the extra octets that
+need to be inserted, one at the end of each line, to provide correct
+end-of-line semantics for a transfer using TYPE=A. The default is nil,
+so return the size on the remote host exactly. See RFC 3659."
+ (let* ((parsed (ange-ftp-ftp-name file))
+ (host (nth 0 parsed))
+ (user (nth 1 parsed))
+ (name (ange-ftp-quote-string (nth 2 parsed)))
+ ;; At least one FTP server (wu-ftpd) can return a "226
+ ;; Transfer complete" before the "213 SIZE". Let's skip
+ ;; that.
+ (ange-ftp-skip-msgs (concat ange-ftp-skip-msgs "\\|^226"))
+ res line)
+ (unwind-protect
+ (progn
+ (if ascii-mode
+ (ange-ftp-set-ascii-mode host user)
+ (ange-ftp-set-binary-mode host user))
+ (setq res (ange-ftp-send-cmd host user (list 'quote "size" name))
+ line (cdr res))
+ (if (string-match "^213 \\([0-9]+\\)$" line)
+ (string-to-number (match-string 1 line))
+ -1))
+ (unless ascii-mode
+ (ange-ftp-set-ascii-mode host user)))))
+
;;;; ------------------------------------------------------------
;;;; File copying support... totally re-written 6/24/92.