From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Katsumi Yamaoka Newsgroups: gmane.emacs.devel Subject: Re: tiny patch to ange-ftp Date: Sat, 01 Oct 2005 21:23:05 +0900 Message-ID: References: <877jdrnv2k.fsf-monnier+emacs@gnu.org> <878xxpxhvc.fsf-monnier+emacs@gnu.org> <87k6gyi7vo.fsf-monnier+emacs@gnu.org> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1128171501 1149 80.91.229.2 (1 Oct 2005 12:58:21 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Sat, 1 Oct 2005 12:58:21 +0000 (UTC) Cc: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Oct 01 14:58:19 2005 Return-path: Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1ELgwJ-00059u-2X for ged-emacs-devel@m.gmane.org; Sat, 01 Oct 2005 14:58:07 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ELgwI-000445-Bj for ged-emacs-devel@m.gmane.org; Sat, 01 Oct 2005 08:58:06 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1ELgnT-0002g3-Ol for emacs-devel@gnu.org; Sat, 01 Oct 2005 08:49:00 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1ELgnR-0002f5-Ix for emacs-devel@gnu.org; Sat, 01 Oct 2005 08:48:59 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ELgm5-0001ls-H1 for emacs-devel@gnu.org; Sat, 01 Oct 2005 08:47:33 -0400 Original-Received: from [66.225.201.13] (helo=washington.hostforweb.net) by monty-python.gnu.org with esmtp (TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA:24) (Exim 4.34) id 1ELgOY-0007Yp-VX for emacs-devel@gnu.org; Sat, 01 Oct 2005 08:23:15 -0400 Original-Received: from yahoobb218118002085.bbtec.net ([218.118.2.85]:64832 helo=) by washington.hostforweb.net with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.52) id 1ELgOW-0000Rr-Ps; Sat, 01 Oct 2005 07:23:13 -0500 Original-To: Stefan Monnier X-Face: #kKnN,xUnmKia.'[pp`; Omh}odZK)?7wQSl"4o04=EixTF+V[""w~iNbM9ZL+.b*_CxUmFk B#Fu[*?MZZH@IkN:!"\w%I_zt>[$nm7nQosZ<3eu; B:$Q_:p!',P.c0-_Cy[dz4oIpw0ESA^D*1Lw= L&i*6&( User-Agent: Gnus/5.110004 (No Gnus v0.4) Emacs/22.0.50 (gnu/linux) Cancel-Lock: sha1:N16blSXmhHn9DJy7XVtTB7IHhQo= X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - washington.hostforweb.net X-AntiAbuse: Original Domain - gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - jpl.org X-Source: X-Source-Args: X-Source-Dir: X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:43422 Archived-At: >>>>> In <87k6gyi7vo.fsf-monnier+emacs@gnu.org> >>>>> Stefan Monnier wrote: > I've installed my change. Sorry again for the delay. I rebuilt Emacs. However, I still could not upload files with another problem. `ange-ftp-insert-directory' passes a file name without directory components to `ange-ftp-get-file-entry' then. So, the following change seems to be required (I confirmed it did the trick): *** ange-ftp.el~ Sat Oct 1 10:46:12 2005 --- ange-ftp.el Sat Oct 1 12:21:20 2005 *************** *** 2972,2982 **** (file (ange-ftp-get-file-part name))) (if ent (gethash file ent) ! (or (and (ange-ftp-allow-child-lookup dir file) (setq ent (ange-ftp-get-files name t)) (gethash "." ent)) ;; i.e. it's a directory by child lookup ! (and (setq ent (ange-ftp-get-files dir t)) (gethash file ent)))))) (defun ange-ftp-internal-delete-file-entry (name &optional dir-p) --- 2972,2984 ---- (file (ange-ftp-get-file-part name))) (if ent (gethash file ent) ! (or (and dir ! (ange-ftp-allow-child-lookup dir file) (setq ent (ange-ftp-get-files name t)) (gethash "." ent)) ;; i.e. it's a directory by child lookup ! (and dir ! (setq ent (ange-ftp-get-files dir t)) (gethash file ent)))))) (defun ange-ftp-internal-delete-file-entry (name &optional dir-p)