From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) Newsgroups: gmane.lisp.guile.bugs Subject: bug#19540: repeated ./././ in compiled modules Date: Thu, 23 Jun 2016 15:06:27 +0200 Message-ID: <87k2hgoy0c.fsf@gnu.org> References: <188846A3-246A-49DB-95F0-37FEE6903C85@alumni.caltech.edu> <877fwiy0q2.fsf@gnu.org> <093940B7-4480-4FD4-A0AD-0B19B6FEECDB@alumni.caltech.edu> <87iog117is.fsf@gnu.org> <871t3oqp2e.fsf@pobox.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1466687255 22772 80.91.229.3 (23 Jun 2016 13:07:35 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 23 Jun 2016 13:07:35 +0000 (UTC) Cc: 19540-done@debbugs.gnu.org, Matt Wette To: Andy Wingo Original-X-From: bug-guile-bounces+guile-bugs=m.gmane.org@gnu.org Thu Jun 23 15:07:22 2016 Return-path: Envelope-to: guile-bugs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1bG4Lo-0002Tw-S1 for guile-bugs@m.gmane.org; Thu, 23 Jun 2016 15:07:21 +0200 Original-Received: from localhost ([::1]:36691 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bG4Lf-00084W-QK for guile-bugs@m.gmane.org; Thu, 23 Jun 2016 09:07:11 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36233) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bG4LZ-00084G-Lh for bug-guile@gnu.org; Thu, 23 Jun 2016 09:07:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bG4LW-0003dk-H0 for bug-guile@gnu.org; Thu, 23 Jun 2016 09:07:05 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:39585) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bG4LW-0003df-DL for bug-guile@gnu.org; Thu, 23 Jun 2016 09:07:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1bG4LW-00013E-75 for bug-guile@gnu.org; Thu, 23 Jun 2016 09:07:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) Original-Sender: "Debbugs-submit" Resent-CC: bug-guile@gnu.org Resent-Date: Thu, 23 Jun 2016 13:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19540 X-GNU-PR-Package: guile X-GNU-PR-Keywords: Original-Received: via spool by 19540-done@debbugs.gnu.org id=D19540.14666872014003 (code D ref 19540); Thu, 23 Jun 2016 13:07:02 +0000 Original-Received: (at 19540-done) by debbugs.gnu.org; 23 Jun 2016 13:06:41 +0000 Original-Received: from localhost ([127.0.0.1]:51922 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bG4LA-00012V-VG for submit@debbugs.gnu.org; Thu, 23 Jun 2016 09:06:41 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:45136) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bG4L9-00012I-Gm for 19540-done@debbugs.gnu.org; Thu, 23 Jun 2016 09:06:39 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bG4L1-0003Yf-DS for 19540-done@debbugs.gnu.org; Thu, 23 Jun 2016 09:06:34 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:35130) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bG4L1-0003YN-A7; Thu, 23 Jun 2016 09:06:31 -0400 Original-Received: from pluto.bordeaux.inria.fr ([193.50.110.57]:52116 helo=pluto) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1bG4Kz-0002OJ-CC; Thu, 23 Jun 2016 09:06:29 -0400 X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 6 Messidor an 224 de la =?UTF-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-unknown-linux-gnu In-Reply-To: <871t3oqp2e.fsf@pobox.com> (Andy Wingo's message of "Thu, 23 Jun 2016 10:36:41 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-guile@gnu.org List-Id: "Bug reports for GUILE, GNU's Ubiquitous Extension Language" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guile-bounces+guile-bugs=m.gmane.org@gnu.org Original-Sender: "bug-guile" Xref: news.gmane.org gmane.lisp.guile.bugs:8156 Archived-At: Andy Wingo skribis: > commit 9a951678713557b548415d32eae6d63d039bf652 > Author: Andy Wingo > Date: Thu Jun 23 10:03:10 2016 +0200 > > Fix relative file name canonicalization on paths with "." >=20=20=20=20=20 > * libguile/filesys.c (scm_i_relativize_path): Canonicalize the file > names elements that we will be using as prefixes. Fixes the case > where a load path contains a relative file name: #19540. > * test-suite/tests/ports.test ("%file-port-name-canonicalization"): A= dd > tests that elements of the load path are canonicalized. > > diff --git a/libguile/filesys.c b/libguile/filesys.c > index 7674498..25501ef 100644 > --- a/libguile/filesys.c > +++ b/libguile/filesys.c > @@ -1614,22 +1614,40 @@ SCM_DEFINE (scm_canonicalize_path, "canonicalize-= path", 1, 0, 0, > SCM > scm_i_relativize_path (SCM path, SCM in_path) [...] > for (; scm_is_pair (in_path); in_path =3D scm_cdr (in_path)) > { > SCM dir =3D scm_car (in_path); > - size_t len =3D scm_c_string_length (dir); > + size_t len; > + > + /* Try to canonicalize DIR, since we have canonicalized PATH. */ > + { > + char *str, *canon; > + > + str =3D scm_to_locale_string (dir); > + canon =3D canonicalize_file_name (str); > + free (str); > +=20=20 > + if (canon) > + dir =3D scm_from_locale_string (canon); > + free (canon); > + } > + > + len =3D scm_c_string_length (dir); >=20=20 > /* When DIR is empty, it means "current working directory". We > could set DIR to (getcwd) in that case, but then the =E2=80=98canonicalize_file_name=E2=80=99 is costly: roughly one syscall per= file name component. IIUC, =E2=80=98canonicalize_file_name=E2=80=99 is now called once for each = =E2=80=98%load-path=E2=80=99 entry and file name that we canonicalize. Is this correct? Ludo=E2=80=99.