projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New module 'uniwbrk/table'.
[gnulib.git]
/
lib
/
canonicalize.c
diff --git
a/lib/canonicalize.c
b/lib/canonicalize.c
index
af2703c
..
4f34839
100644
(file)
--- a/
lib/canonicalize.c
+++ b/
lib/canonicalize.c
@@
-1,10
+1,10
@@
/* Return the canonical absolute name of a given file.
/* Return the canonical absolute name of a given file.
- Copyright (C) 1996-200
7
Free Software Foundation, Inc.
+ Copyright (C) 1996-200
8
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
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
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
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>
#include <config.h>
@@
-50,7
+48,7
@@
#include "pathmax.h"
#include "areadlink.h"
#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.
/* 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,
*ht = hash_initialize (initial_capacity,
NULL,
triple_hash,
- triple_compare,
+ triple_compare
_ino_str
,
triple_free);
if (*ht == NULL)
xalloc_die ();
triple_free);
if (*ht == NULL)
xalloc_die ();