X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fcanonicalize.c;h=4f348398fd69ae516396313d18ac294a4ca3dde3;hb=38db1b35bf51a7a738f27d2660a9fdd3b46447be;hp=af2703cf7aa4c9ed7ad7b1c2ad628545a95aa72a;hpb=cbbc0892dc8607978ec55acdd8ef3a124df1ca1f;p=gnulib.git

diff --git a/lib/canonicalize.c b/lib/canonicalize.c
index af2703cf7..4f348398f 100644
--- a/lib/canonicalize.c
+++ b/lib/canonicalize.c
@@ -1,10 +1,10 @@
 /* Return the canonical absolute name of a given file.
-   Copyright (C) 1996-2007 Free Software Foundation, Inc.
+   Copyright (C) 1996-2008 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.
-   If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
@@ -50,7 +48,7 @@
 #include "pathmax.h"
 #include "areadlink.h"
 
-#if !HAVE_CANONICALIZE_FILE_NAME
+#if !(HAVE_CANONICALIZE_FILE_NAME || GNULIB_CANONICALIZE_LGPL)
 /* Return the canonical absolute name of file NAME.  A canonical name
    does not contain any `.', `..' components nor any repeated file name
    separators ('/') or symlinks.  All components must exist.
@@ -135,7 +133,7 @@ seen_triple (Hash_table **ht, char const *filename, struct stat const *st)
       *ht = hash_initialize (initial_capacity,
 			    NULL,
 			    triple_hash,
-			    triple_compare,
+			    triple_compare_ino_str,
 			    triple_free);
       if (*ht == NULL)
 	xalloc_die ();