X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fdirname.h;h=4ad0312008c1ae5d666a814d4b74b32740ab7cae;hb=bbfcd2f1a92c9bdbb8d7d7d0a8a8c6665c316747;hp=62da37dc9ad8a9e723b30d86e222f0aca667b2ea;hpb=68af56be3e061b97cf97150094bc50b0aa364cbb;p=gnulib.git
diff --git a/lib/dirname.h b/lib/dirname.h
index 62da37dc9..4ad031200 100644
--- a/lib/dirname.h
+++ b/lib/dirname.h
@@ -1,11 +1,12 @@
/* Take file names apart into directory and base names.
- Copyright (C) 1998, 2001, 2003 Free Software Foundation, Inc.
+ Copyright (C) 1998, 2001, 2003-2006, 2009-2013 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
@@ -13,31 +14,33 @@
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 . */
#ifndef DIRNAME_H_
# define DIRNAME_H_ 1
+# include
# include
+# include "dosname.h"
# 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
-# 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
-char *base_name (char const *path);
-char *dir_name (char const *path);
-size_t base_len (char const *path);
-size_t dir_len (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 (char *path);
+bool strip_trailing_slashes (char *file);
#endif /* not DIRNAME_H_ */