X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fcanonicalize.h;h=8ca4fb42266885ec9891209a46615c7b83bc5000;hb=1a2869593e115e4a6c74aaa0b23ca612357403ce;hp=deaf27f130799edccd6fc328569a29a31f03444d;hpb=c437773f09dd9684683ae46730c1224e51509177;p=gnulib.git
diff --git a/lib/canonicalize.h b/lib/canonicalize.h
index deaf27f13..8ca4fb422 100644
--- a/lib/canonicalize.h
+++ b/lib/canonicalize.h
@@ -1,10 +1,10 @@
/* Return the canonical absolute name of a given file.
- Copyright (C) 1996-2006 Free Software Foundation, Inc.
+ Copyright (C) 1996-2007 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,14 +12,12 @@
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 . */
#ifndef CANONICALIZE_H_
# define CANONICALIZE_H_
-# ifdef PROVIDE_CANONICALIZE_FILENAME_MODE
+# if GNULIB_CANONICALIZE
enum canonicalize_mode_t
{
/* All components must exist. */
@@ -33,12 +31,21 @@ enum canonicalize_mode_t
};
typedef enum canonicalize_mode_t canonicalize_mode_t;
+/* Return a malloc'd string containing the canonical absolute name of
+ the named file. This acts like canonicalize_file_name, except that
+ whether components must exist depends on the canonicalize_mode_t
+ argument. */
char *canonicalize_filename_mode (const char *, canonicalize_mode_t);
# endif
# if HAVE_DECL_CANONICALIZE_FILE_NAME
# include
# else
+/* Return a malloc'd string containing the canonical absolute name of
+ the named file. If any file name component does not exist or is a
+ symlink to a nonexistent file, return NULL. A canonical name does
+ not contain any `.', `..' components nor any repeated file name
+ separators ('/') or symlinks. */
char *canonicalize_file_name (const char *);
# endif