projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fchdir: Update comment.
[gnulib.git]
/
lib
/
canonicalize.h
diff --git
a/lib/canonicalize.h
b/lib/canonicalize.h
index
deaf27f
..
bcf84f6
100644
(file)
--- a/
lib/canonicalize.h
+++ b/
lib/canonicalize.h
@@
-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
6
Free Software Foundation, Inc.
+ Copyright (C) 1996-200
7, 2009
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,14
+12,13
@@
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/>. */
#ifndef CANONICALIZE_H_
# define CANONICALIZE_H_
#ifndef CANONICALIZE_H_
# define CANONICALIZE_H_
-# ifdef PROVIDE_CANONICALIZE_FILENAME_MODE
+#include <stdlib.h> /* for canonicalize_file_name */
+
enum canonicalize_mode_t
{
/* All components must exist. */
enum canonicalize_mode_t
{
/* All components must exist. */
@@
-33,13
+32,10
@@
enum canonicalize_mode_t
};
typedef enum canonicalize_mode_t 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);
char *canonicalize_filename_mode (const char *, canonicalize_mode_t);
-# endif
-
-# if HAVE_DECL_CANONICALIZE_FILE_NAME
-# include <stdlib.h>
-# else
-char *canonicalize_file_name (const char *);
-# endif
#endif /* !CANONICALIZE_H_ */
#endif /* !CANONICALIZE_H_ */