projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
install-reloc: Support multi-binary installation.
[gnulib.git]
/
lib
/
dirname.h
diff --git
a/lib/dirname.h
b/lib/dirname.h
index
cea14c0
..
4ad0312
100644
(file)
--- a/
lib/dirname.h
+++ b/
lib/dirname.h
@@
-1,9
+1,12
@@
-/*
Copyright (C) 1998, 2001 Free Software Foundation, Inc
.
+/*
Take file names apart into directory and base names
.
- This program is free software; you can redistribute it and/or modify
+ Copyright (C) 1998, 2001, 2003-2006, 2009-2013 Free Software Foundation,
+ Inc.
+
+ 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
@@
-11,37
+14,33
@@
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; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#ifndef DIRNAME_H_
# define DIRNAME_H_ 1
#ifndef DIRNAME_H_
# define DIRNAME_H_ 1
-# ifndef PARAMS
-# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-# define PARAMS(Args) Args
-# else
-# define PARAMS(Args) ()
-# endif
-# endif
+# include <stdbool.h>
+# include <stddef.h>
+# include "dosname.h"
# ifndef DIRECTORY_SEPARATOR
# define DIRECTORY_SEPARATOR '/'
# endif
# ifndef DIRECTORY_SEPARATOR
# define DIRECTORY_SEPARATOR '/'
# endif
-# ifndef
ISSLASH
-# define
ISSLASH(C) ((C) == DIRECTORY_SEPARATOR)
+# ifndef
DOUBLE_SLASH_IS_DISTINCT_ROOT
+# define
DOUBLE_SLASH_IS_DISTINCT_ROOT 0
# endif
# endif
-# ifndef FILESYSTEM_PREFIX_LEN
-# define FILESYSTEM_PREFIX_LEN(Filename) 0
+# if GNULIB_DIRNAME
+char *base_name (char const *file);
+char *dir_name (char const *file);
# endif
# endif
-char *
base_name PARAMS ((char const *path)
);
-
char *dir_name PARAMS ((char const *path))
;
-size_t
base_len PARAMS ((char const *path))
;
-
size_t dir_len PARAMS ((char const *path))
;
+char *
mdir_name (char const *file
);
+
size_t base_len (char const *file) _GL_ATTRIBUTE_PURE
;
+size_t
dir_len (char const *file) _GL_ATTRIBUTE_PURE
;
+
char *last_component (char const *file) _GL_ATTRIBUTE_PURE
;
-
int strip_trailing_slashes PARAMS ((char *path)
);
+
bool strip_trailing_slashes (char *file
);
#endif /* not DIRNAME_H_ */
#endif /* not DIRNAME_H_ */